Greg,
Please incorporate the latest imx-drm changes, which can be found at:
git://ftp.arm.linux.org.uk/~rmk/linux-arm.git imx-drm-staging
with SHA1 6a6317113391b482a6715d1c826b2d78bfdf9366.
This set of changes reorganises imx-drm's DT bindings by re-using the OF
graph parsing code which was located in drivers/media, removing the
temporary bindings.
The result is that more TODO entries are now removed. While we're not
quite done with this yet as there's a few straggling updates to imx-ldb
to come, but leaving these out is not detrimental at this point in time
- they are more an enhancement.
However, this pull has the additional complication that we're sharing
seven commits with Mauro's V4L git tree, which move the OF graph parsing
code out of drivers/media into drivers/of. Philipp's imx-drm changes
depend on these and my previously committed round of imx-drm commits.
Hence, the diffstat below is from a test merge with your tree head
(17b02809cfa7).
Mauro merged those seven commits earlier today as a git pull, so both
trees will be sharing exactly the same commit IDs.
I've given these changes a spin here on both my Hummingboard and Cubox-i4
(one is iMX6Solo, the other is iMX6Quad based), which includes Xorg using
the DRM device directly, and I find nothing wrong.
The diffstat does look a little scarey - this is because we're having to
update the ARM DT files along with this change, and obviously the
dependency on the OF graph parsing code.
This will update the following files:
Documentation/devicetree/bindings/graph.txt | 129 ++++++++++++++++++++++++++++++
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt | 48 ++++++++++--
Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt | 58 ++++++++++++++
Documentation/devicetree/bindings/staging/imx-drm/ldb.txt | 20 ++++-
arch/arm/boot/dts/imx51-apf51dev.dts | 11 ++-
arch/arm/boot/dts/imx51-babbage.dts | 28 +++++--
arch/arm/boot/dts/imx51.dtsi | 22 +++++-
arch/arm/boot/dts/imx53-m53evk.dts | 17 ++--
arch/arm/boot/dts/imx53-mba53.dts | 17 ++--
arch/arm/boot/dts/imx53-qsb.dts | 17 ++--
arch/arm/boot/dts/imx53.dtsi | 64 ++++++++++++++-
arch/arm/boot/dts/imx6dl.dtsi | 22 +++---
arch/arm/boot/dts/imx6q-sabresd.dts | 4 -
arch/arm/boot/dts/imx6q.dtsi | 124 +++++++++++++++++++++++++++--
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 6 --
arch/arm/boot/dts/imx6qdl.dtsi | 128 +++++++++++++++++++++++++++++-
drivers/media/i2c/adv7343.c | 4 +-
drivers/media/i2c/mt9p031.c | 4 +-
drivers/media/i2c/s5k5baf.c | 3 +-
drivers/media/i2c/tvp514x.c | 3 +-
drivers/media/i2c/tvp7002.c | 3 +-
drivers/media/platform/exynos4-is/fimc-is.c | 6 +-
drivers/media/platform/exynos4-is/media-dev.c | 13 +--
drivers/media/platform/exynos4-is/mipi-csis.c | 5 +-
drivers/media/v4l2-core/v4l2-of.c | 133 +------------------------------
drivers/of/base.c | 151 +++++++++++++++++++++++++++++++++++
drivers/staging/imx-drm/TODO | 5 --
drivers/staging/imx-drm/imx-drm-core.c | 217 ++++++++++++++++++++++++++++++++++++---------------
drivers/staging/imx-drm/imx-drm.h | 5 +-
drivers/staging/imx-drm/imx-hdmi.c | 4 +-
drivers/staging/imx-drm/imx-ldb.c | 4 +-
drivers/staging/imx-drm/imx-tve.c | 2 +-
drivers/staging/imx-drm/ipuv3-crtc.c | 47 +++++++++--
include/linux/of_graph.h | 66 ++++++++++++++++
include/media/v4l2-of.h | 33 +-------
35 files changed, 1087 insertions(+), 336 deletions(-)
create mode 100644 Documentation/devicetree/bindings/graph.txt
create mode 100644 Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt
create mode 100644 include/linux/of_graph.h
through these changes:
Philipp Zabel (18):
[media] of: move graph helpers from drivers/media/v4l2-core to drivers/of
Documentation: of: Document graph bindings
of: Warn if of_graph_get_next_endpoint is called with the root node
of: Reduce indentation in of_graph_get_next_endpoint
[media] of: move common endpoint parsing to drivers/of
of: Warn if of_graph_parse_endpoint is called with the root node
of: Fix of_graph_parse_endpoint stub for !CONFIG_OF builds
staging: imx-drm-core: Use OF graph to find components and connections between encoder and crtcs
staging: imx-drm-core: use of_graph_parse_endpoint
staging: imx-drm: Document updated imx-drm device tree bindings
staging: imx-drm: Document imx-hdmi device tree bindings
imx-drm: imx-hdmi: Fix DDC I2C bus property
imx-drm: imx-tve: Fix DDC I2C bus property
ARM: dts: imx53-mba53: Fix TVE DDC I2C bus property
ARM: dts: imx51: Add IPU ports and endpoints, move imx-drm node to dtsi
ARM: dts: imx53: Add IPU DI ports and endpoints, move imx-drm node to dtsi
ARM: dts: imx6qdl: Add IPU DI ports and endpoints, move imx-drm node to dtsi
staging: imx-drm: Update TODO
Russell King (1):
Merge branch 'topic/of-graph' of git://git.pengutronix.de/git/pza/linux into imx-drm-staging
Many thanks.
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
