[PULL] Move IPUv3 core out of staging, add CSI support
Philipp Zabel
p.zabel at pengutronix.de
Wed Jun 4 02:48:53 PDT 2014
Hi Dave,
The following changes since commit d1db0eea852497762cab43b905b879dfcd3b8987:
Linux 3.15-rc3 (2014-04-27 19:29:27 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/pza/linux.git topic/ipu-destaging
for you to fetch changes up to d6ca8ca7ec555bdd3372687d0d775c837a09ff6e:
gpu: ipu-v3: Register the CSI modules (2014-06-04 11:07:12 +0200)
These move the core i.MX IPU code out of staging into drivers/gpu and add
the foundation for CSI capture support. In the following round we can then
fix remaining issues with imx-drm in staging and start adding V4L2 support
in parallel.
I have rebased the series back to v3.15-rc3, the tag closest to the common
ancestor of drm-next and staging-next, and verified that merging the two
produces the correct result.
regards
Philipp
----------------------------------------------------------------
Philipp Zabel (5):
gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging
gpu: ipu-v3: Add SMFC code
gpu: ipu-v3: Add ipu_idmac_get_current_buffer function
gpu: ipu-v3: Add CSI and SMFC module enable wrappers
gpu: ipu-v3: Register the CSI modules
drivers/gpu/Makefile | 1 +
drivers/gpu/ipu-v3/Kconfig | 7 ++
drivers/{staging/imx-drm => gpu}/ipu-v3/Makefile | 4 +-
.../{staging/imx-drm => gpu}/ipu-v3/ipu-common.c | 82 ++++++++++++++++--
drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-dc.c | 3 +-
drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-di.c | 2 +-
drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-dmfc.c | 2 +-
drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-dp.c | 2 +-
drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-prv.h | 8 +-
drivers/gpu/ipu-v3/ipu-smfc.c | 97 ++++++++++++++++++++++
drivers/staging/imx-drm/Kconfig | 11 +--
drivers/staging/imx-drm/Makefile | 1 -
drivers/staging/imx-drm/imx-hdmi.c | 2 +-
drivers/staging/imx-drm/imx-tve.c | 2 +-
drivers/staging/imx-drm/ipuv3-crtc.c | 2 +-
drivers/staging/imx-drm/ipuv3-plane.c | 2 +-
drivers/video/Kconfig | 1 +
.../imx-drm/ipu-v3 => include/video}/imx-ipu-v3.h | 16 ++++
18 files changed, 216 insertions(+), 29 deletions(-)
create mode 100644 drivers/gpu/ipu-v3/Kconfig
rename drivers/{staging/imx-drm => gpu}/ipu-v3/Makefile (51%)
rename drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-common.c (94%)
rename drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-dc.c (99%)
rename drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-di.c (99%)
rename drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-dmfc.c (99%)
rename drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-dp.c (99%)
rename drivers/{staging/imx-drm => gpu}/ipu-v3/ipu-prv.h (96%)
create mode 100644 drivers/gpu/ipu-v3/ipu-smfc.c
rename {drivers/staging/imx-drm/ipu-v3 => include/video}/imx-ipu-v3.h (95%)
More information about the dri-devel
mailing list