* [PATCH RFC v2 6/6] ARM: AM33XX: dts: Change the tda998x description
2014-03-21 10:27 [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Jean-Francois Moine
@ 2014-03-21 8:52 ` Jean-Francois Moine
2014-03-21 9:31 ` [PATCH RFC v2 3/6] drm/tilcd: dts: Add the video output port Jean-Francois Moine
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jean-Francois Moine @ 2014-03-21 8:52 UTC (permalink / raw)
To: Russell King, Rob Clark, dri-devel
Cc: devicetree, linux-arm-kernel, linux-media
The tda998x being moved from a 'slave encoder' to a normal DRM
encoder/connector and the tilcdc_slave glue being removed, the
declaration of the HDMI transmitter description must be changed in
the associated DTs.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
---
arch/arm/boot/dts/am335x-base0033.dts | 28 +++++++++++++++++++---------
arch/arm/boot/dts/am335x-boneblack.dts | 21 ++++++++++++++++-----
2 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-base0033.dts b/arch/arm/boot/dts/am335x-base0033.dts
index 72a9b3f..05f2b8f 100644
--- a/arch/arm/boot/dts/am335x-base0033.dts
+++ b/arch/arm/boot/dts/am335x-base0033.dts
@@ -14,15 +14,6 @@
model = "IGEP COM AM335x on AQUILA Expansion";
compatible = "isee,am335x-base0033", "isee,am335x-igep0033", "ti,am33xx";
- hdmi {
- compatible = "ti,tilcdc,slave";
- i2c = <&i2c0>;
- pinctrl-names = "default", "off";
- pinctrl-0 = <&nxp_hdmi_pins>;
- pinctrl-1 = <&nxp_hdmi_off_pins>;
- status = "okay";
- };
-
leds_base {
pinctrl-names = "default";
pinctrl-0 = <&leds_base_pins>;
@@ -85,6 +76,11 @@
&lcdc {
status = "okay";
+ port {
+ lcd_0: endpoint@0 {
+ remote-endpoint = <&hdmi_0>;
+ };
+ };
};
&i2c0 {
@@ -92,4 +88,18 @@
compatible = "at,24c256";
reg = <0x50>;
};
+ hdmi: hdmi-encoder {
+ compatible = "nxp,tda19988";
+ reg = <0x70>;
+
+ pinctrl-names = "default", "off";
+ pinctrl-0 = <&nxp_hdmi_pins>;
+ pinctrl-1 = <&nxp_hdmi_off_pins>;
+
+ port {
+ hdmi_0: endpoint@0 {
+ remote-endpoint = <&lcd_0>;
+ };
+ };
+ };
};
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 6b71ad9..b94d8bd 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -64,15 +64,26 @@
&lcdc {
status = "okay";
+ port {
+ lcd_0: endpoint@0 {
+ remote-endpoint = <&hdmi_0>;
+ };
+ };
};
-/ {
- hdmi {
- compatible = "ti,tilcdc,slave";
- i2c = <&i2c0>;
+&i2c0 {
+ hdmi: hdmi-encoder {
+ compatible = "nxp,tda19988";
+ reg = <0x70>;
+
pinctrl-names = "default", "off";
pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
- status = "okay";
+
+ port {
+ hdmi_0: endpoint@0 {
+ remote-endpoint = <&lcd_0>;
+ };
+ };
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RFC v2 3/6] drm/tilcd: dts: Add the video output port
2014-03-21 10:27 [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Jean-Francois Moine
2014-03-21 8:52 ` [PATCH RFC v2 6/6] ARM: AM33XX: dts: Change the tda998x description Jean-Francois Moine
@ 2014-03-21 9:31 ` Jean-Francois Moine
2014-03-21 9:31 ` [PATCH RFC v2 5/6] drm/tilcd: dts: Remove unused slave description Jean-Francois Moine
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jean-Francois Moine @ 2014-03-21 9:31 UTC (permalink / raw)
To: Russell King, Rob Clark, dri-devel
Cc: devicetree, linux-arm-kernel, linux-media
The connection between the video source and sink must follow
the media video interface.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
---
Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt b/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt
index fff10da..d0de848 100644
--- a/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt
+++ b/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt
@@ -18,6 +18,12 @@ Optional properties:
- max-pixelclock: The maximum pixel clock that can be supported
by the lcd controller in KHz.
+Optional nodes:
+
+ - port: reference of the video sink as described in media/video-interfaces.
+ This reference is required when the video sink is the TDA19988 HDMI
+ transmitter.
+
Example:
fb: fb@4830e000 {
@@ -27,3 +33,11 @@ Example:
interrupts = <36>;
ti,hwmods = "lcdc";
};
+
+ &fb {
+ port {
+ lcd_0: endpoint@0 {
+ remote-endpoint = <&hdmi_0>;
+ };
+ };
+ };
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RFC v2 5/6] drm/tilcd: dts: Remove unused slave description
2014-03-21 10:27 [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Jean-Francois Moine
2014-03-21 8:52 ` [PATCH RFC v2 6/6] ARM: AM33XX: dts: Change the tda998x description Jean-Francois Moine
2014-03-21 9:31 ` [PATCH RFC v2 3/6] drm/tilcd: dts: Add the video output port Jean-Francois Moine
@ 2014-03-21 9:31 ` Jean-Francois Moine
2014-03-21 9:48 ` [PATCH RFC v2 1/6] drm/i2c: tda998x: Add the required port property Jean-Francois Moine
2014-03-21 11:21 ` [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Russell King - ARM Linux
4 siblings, 0 replies; 6+ messages in thread
From: Jean-Francois Moine @ 2014-03-21 9:31 UTC (permalink / raw)
To: Russell King, Rob Clark, dri-devel
Cc: devicetree, linux-arm-kernel, linux-media
The tda998x being converted to a normal DRM encoder/connector,
there is no slave notion anymore.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
---
Documentation/devicetree/bindings/drm/tilcdc/slave.txt | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/drm/tilcdc/slave.txt
diff --git a/Documentation/devicetree/bindings/drm/tilcdc/slave.txt b/Documentation/devicetree/bindings/drm/tilcdc/slave.txt
deleted file mode 100644
index 3d2c524..0000000
--- a/Documentation/devicetree/bindings/drm/tilcdc/slave.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Device-Tree bindings for tilcdc DRM encoder slave output driver
-
-Required properties:
- - compatible: value should be "ti,tilcdc,slave".
- - i2c: the phandle for the i2c device the encoder slave is connected to
-
-Recommended properties:
- - pinctrl-names, pinctrl-0: the pincontrol settings to configure
- muxing properly for pins that connect to TFP410 device
-
-Example:
-
- hdmi {
- compatible = "ti,tilcdc,slave";
- i2c = <&i2c0>;
- pinctrl-names = "default";
- pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
- };
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RFC v2 1/6] drm/i2c: tda998x: Add the required port property
2014-03-21 10:27 [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Jean-Francois Moine
` (2 preceding siblings ...)
2014-03-21 9:31 ` [PATCH RFC v2 5/6] drm/tilcd: dts: Remove unused slave description Jean-Francois Moine
@ 2014-03-21 9:48 ` Jean-Francois Moine
2014-03-21 11:21 ` [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Russell King - ARM Linux
4 siblings, 0 replies; 6+ messages in thread
From: Jean-Francois Moine @ 2014-03-21 9:48 UTC (permalink / raw)
To: Russell King, Rob Clark, dri-devel
Cc: devicetree, linux-arm-kernel, linux-media
According to the media video interface, the video source and sink
ports must be identified by mutual phandles.
This patch adds the 'port' property of the tda998x (sink side).
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
---
Documentation/devicetree/bindings/drm/i2c/tda998x.txt | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/drm/i2c/tda998x.txt b/Documentation/devicetree/bindings/drm/i2c/tda998x.txt
index e3f3d65..10c5b5e 100644
--- a/Documentation/devicetree/bindings/drm/i2c/tda998x.txt
+++ b/Documentation/devicetree/bindings/drm/i2c/tda998x.txt
@@ -17,13 +17,22 @@ Optional properties:
- video-ports: 24 bits value which defines how the video controller
output is wired to the TDA998x input - default: <0x230145>
+Required nodes:
+ - port: reference of the video source as described in media/video-interfaces
+
Example:
- tda998x: hdmi-encoder {
+ hdmi: hdmi-encoder {
compatible = "nxp,tda19988";
reg = <0x70>;
interrupt-parent = <&gpio0>;
interrupts = <27 2>; /* falling edge */
pinctrl-0 = <&pmx_camera>;
pinctrl-names = "default";
+
+ port {
+ hdmi_0: endpoint@0 {
+ remote-endpoint = <&lcd0_0>;
+ };
+ };
};
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector
@ 2014-03-21 10:27 Jean-Francois Moine
2014-03-21 8:52 ` [PATCH RFC v2 6/6] ARM: AM33XX: dts: Change the tda998x description Jean-Francois Moine
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Jean-Francois Moine @ 2014-03-21 10:27 UTC (permalink / raw)
To: Russell King, Rob Clark, dri-devel
Cc: devicetree, linux-arm-kernel, linux-media
The 'slave encoder' structure of the tda998x driver asks for glue
between the DRM driver and the encoder/connector structures.
Changing the tda998x driver to a simple encoder/connector simplifies
the code of the tilcdc driver. This change is permitted by
Russell's infrastructure for componentised subsystems.
The proposed patch set does not include changes to the Armada DRM driver.
These changes should already have been prepared by Russell King, as
told in the message
https://www.mail-archive.com/linux-media@vger.kernel.org/msg71202.html
The tilcdc part of this patch set has not been tested.
This patch set applies after the patchs:
drm/i2c: tda998x: Fix lack of required reg in DT documentation
drm/i2c: tda998x: Change the compatible strings
- v2
- fix lack of call to component_bind_all() in tilcdc_drv.c
- add tda998x configuration for non-DT systems
Jean-Francois Moine (6):
drm/i2c: tda998x: Add the required port property
drm/i2c: tda998x: Move tda998x to a couple encoder/connector
drm/tilcd: dts: Add the video output port
drm/tilcdc: Change the interface with the tda998x driver
drm/tilcd: dts: Remove unused slave description
ARM: AM33XX: dts: Change the tda998x description
.../devicetree/bindings/drm/i2c/tda998x.txt | 11 +-
.../devicetree/bindings/drm/tilcdc/slave.txt | 18 -
.../devicetree/bindings/drm/tilcdc/tilcdc.txt | 14 +
arch/arm/boot/dts/am335x-base0033.dts | 28 +-
arch/arm/boot/dts/am335x-boneblack.dts | 21 +-
drivers/gpu/drm/i2c/tda998x_drv.c | 323 +++++++++-------
drivers/gpu/drm/tilcdc/Makefile | 1 -
drivers/gpu/drm/tilcdc/tilcdc_drv.c | 85 ++++-
drivers/gpu/drm/tilcdc/tilcdc_slave.c | 406 ---------------------
drivers/gpu/drm/tilcdc/tilcdc_slave.h | 26 --
10 files changed, 315 insertions(+), 618 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/drm/tilcdc/slave.txt
delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave.c
delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave.h
--
1.9.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector
2014-03-21 10:27 [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Jean-Francois Moine
` (3 preceding siblings ...)
2014-03-21 9:48 ` [PATCH RFC v2 1/6] drm/i2c: tda998x: Add the required port property Jean-Francois Moine
@ 2014-03-21 11:21 ` Russell King - ARM Linux
4 siblings, 0 replies; 6+ messages in thread
From: Russell King - ARM Linux @ 2014-03-21 11:21 UTC (permalink / raw)
To: Jean-Francois Moine; +Cc: devicetree, linux-arm-kernel, dri-devel, linux-media
On Fri, Mar 21, 2014 at 11:27:45AM +0100, Jean-Francois Moine wrote:
> The 'slave encoder' structure of the tda998x driver asks for glue
> between the DRM driver and the encoder/connector structures.
Given how close we are to the coming merge window, that the discussion
about the of-graph bindings is still going on without concensus being
reached, and that this driver is not in staging, this needs to be
delayed until the following merge window when hopefully we have a
clearer picture about the DT side of this.
--
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-21 11:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-21 10:27 [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Jean-Francois Moine
2014-03-21 8:52 ` [PATCH RFC v2 6/6] ARM: AM33XX: dts: Change the tda998x description Jean-Francois Moine
2014-03-21 9:31 ` [PATCH RFC v2 3/6] drm/tilcd: dts: Add the video output port Jean-Francois Moine
2014-03-21 9:31 ` [PATCH RFC v2 5/6] drm/tilcd: dts: Remove unused slave description Jean-Francois Moine
2014-03-21 9:48 ` [PATCH RFC v2 1/6] drm/i2c: tda998x: Add the required port property Jean-Francois Moine
2014-03-21 11:21 ` [PATCH RFC v2 0/6] drm/i2c: Move tda998x to a couple encoder/connector Russell King - ARM Linux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).