| Message ID | 1433139798-23450-11-git-send-email-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: > AM57xx Beagle X15 has a HDMI output. This patch adds the device tree > nodes required for HDMI. This one does not seem to apply to linux next, did not look further where it conflicts. Regards, Tony
On 02/06/15 00:51, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: >> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree >> nodes required for HDMI. > > This one does not seem to apply to linux next, did not look > further where it conflicts. Looks like a trivial one line conflict, about adding an alias to .dts. Tomi
On 02/06/15 00:51, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: >> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree >> nodes required for HDMI. > > This one does not seem to apply to linux next, did not look > further where it conflicts. Looks like the change was also in -rc6. I've rebased my patches on -rc6, and added the acks: git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git dra7-dss-arch Tomi
* Tomi Valkeinen <tomi.valkeinen@ti.com> [150603 04:28]: > > > On 02/06/15 00:51, Tony Lindgren wrote: > > * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: > >> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree > >> nodes required for HDMI. > > > > This one does not seem to apply to linux next, did not look > > further where it conflicts. > > Looks like the change was also in -rc6. I've rebased my patches on -rc6, > and added the acks: > > git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git dra7-dss-arch OK, since there are no other merge conflicts that I'm aware of, it's best that you merge the whole branch. I've acked the patches, so for this one too: Acked-by: Tony Lindgren <tonY@atomide.com>
On 03/06/15 18:44, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [150603 04:28]: >> >> >> On 02/06/15 00:51, Tony Lindgren wrote: >>> * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: >>>> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree >>>> nodes required for HDMI. >>> >>> This one does not seem to apply to linux next, did not look >>> further where it conflicts. >> >> Looks like the change was also in -rc6. I've rebased my patches on -rc6, >> and added the acks: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git dra7-dss-arch > > OK, since there are no other merge conflicts that I'm aware of, > it's best that you merge the whole branch. I've acked the patches, > so for this one too: Ok, I can do that, but isn't this more linux-arm stuff? All the driver side code is already in the mainline. Tomi
* Tomi Valkeinen <tomi.valkeinen@ti.com> [150603 09:03]: > > > On 03/06/15 18:44, Tony Lindgren wrote: > > * Tomi Valkeinen <tomi.valkeinen@ti.com> [150603 04:28]: > >> > >> > >> On 02/06/15 00:51, Tony Lindgren wrote: > >>> * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: > >>>> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree > >>>> nodes required for HDMI. > >>> > >>> This one does not seem to apply to linux next, did not look > >>> further where it conflicts. > >> > >> Looks like the change was also in -rc6. I've rebased my patches on -rc6, > >> and added the acks: > >> > >> git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git dra7-dss-arch > > > > OK, since there are no other merge conflicts that I'm aware of, > > it's best that you merge the whole branch. I've acked the patches, > > so for this one too: > > Ok, I can do that, but isn't this more linux-arm stuff? All the driver > side code is already in the mainline. Yes but we're getting so late into merge window that I'd rather not take it for v4.2 at this point. And it's all DSS related. Please make sure you get an ack for the drivers/clk/omap change from Mike or Stephen though. Regards, Tony
* Tony Lindgren <tony@atomide.com> [150603 09:11]: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [150603 09:03]: > > > > > > On 03/06/15 18:44, Tony Lindgren wrote: > > > * Tomi Valkeinen <tomi.valkeinen@ti.com> [150603 04:28]: > > >> > > >> > > >> On 02/06/15 00:51, Tony Lindgren wrote: > > >>> * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: > > >>>> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree > > >>>> nodes required for HDMI. > > >>> > > >>> This one does not seem to apply to linux next, did not look > > >>> further where it conflicts. > > >> > > >> Looks like the change was also in -rc6. I've rebased my patches on -rc6, > > >> and added the acks: > > >> > > >> git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git dra7-dss-arch > > > > > > OK, since there are no other merge conflicts that I'm aware of, > > > it's best that you merge the whole branch. I've acked the patches, > > > so for this one too: > > > > Ok, I can do that, but isn't this more linux-arm stuff? All the driver > > side code is already in the mainline. > > Yes but we're getting so late into merge window that I'd rather not > take it for v4.2 at this point. And it's all DSS related. > > Please make sure you get an ack for the drivers/clk/omap change from > Mike or Stephen though. Naturally I mean "getting so close to the merge window" above :) Regards, Tony
On 03/06/15 20:16, Tony Lindgren wrote: >>>> OK, since there are no other merge conflicts that I'm aware of, >>>> it's best that you merge the whole branch. I've acked the patches, >>>> so for this one too: >>> >>> Ok, I can do that, but isn't this more linux-arm stuff? All the driver >>> side code is already in the mainline. >> >> Yes but we're getting so late into merge window that I'd rather not >> take it for v4.2 at this point. And it's all DSS related. >> >> Please make sure you get an ack for the drivers/clk/omap change from >> Mike or Stephen though. > > Naturally I mean "getting so close to the merge window" above :) Thanks everyone. I've pushed this to fbdev for-next. Tomi
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts index 15f198e4864d..f1e430507e4f 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts @@ -18,6 +18,7 @@ aliases { rtc0 = &mcp_rtc; rtc1 = &tps659038_rtc; + display0 = &hdmi0; }; memory { @@ -102,6 +103,51 @@ pinctrl-names = "default"; pinctrl-0 = <&extcon_usb2_pins>; }; + + hdmi0: connector { + compatible = "hdmi-connector"; + label = "hdmi"; + + type = "a"; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <&tpd12s015_out>; + }; + }; + }; + + tpd12s015: encoder { + compatible = "ti,tpd12s015"; + + pinctrl-names = "default"; + pinctrl-0 = <&tpd12s015_pins>; + + gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>, /* gpio7_10, CT CP HPD */ + <&gpio6 28 GPIO_ACTIVE_HIGH>, /* gpio6_28, LS OE */ + <&gpio7 12 GPIO_ACTIVE_HIGH>; /* gpio7_12/sp1_cs2, HPD */ + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + tpd12s015_in: endpoint { + remote-endpoint = <&hdmi_out>; + }; + }; + + port@1 { + reg = <1>; + + tpd12s015_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; + }; + }; + }; }; &dra7_pmx_core { @@ -121,6 +167,13 @@ >; }; + hdmi_pins: pinmux_hdmi_pins { + pinctrl-single,pins = < + 0x408 (PIN_INPUT | MUX_MODE1) /* i2c2_sda.hdmi1_ddc_scl */ + 0x40c (PIN_INPUT | MUX_MODE1) /* i2c2_scl.hdmi1_ddc_sda */ + >; + }; + i2c3_pins_default: i2c3_pins_default { pinctrl-single,pins = < 0x2a4 (PIN_INPUT| MUX_MODE10) /* mcasp1_aclkx.i2c3_sda */ @@ -277,6 +330,14 @@ 0x3e8 (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_ctsn.gpio7_24 */ >; }; + + tpd12s015_pins: pinmux_tpd12s015_pins { + pinctrl-single,pins = < + 0x3b0 (PIN_OUTPUT | MUX_MODE14) /* gpio7_10 CT_CP_HPD */ + 0x3b8 (PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpio7_12 HPD */ + 0x370 (PIN_OUTPUT | MUX_MODE14) /* gpio6_28 LS_OE */ + >; + }; }; &i2c1 { @@ -607,3 +668,23 @@ }; }; }; + +&dss { + status = "ok"; + + vdda_video-supply = <&ldoln_reg>; +}; + +&hdmi { + status = "ok"; + vdda-supply = <&ldo3_reg>; + + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_pins>; + + port { + hdmi_out: endpoint { + remote-endpoint = <&tpd12s015_in>; + }; + }; +};
AM57xx Beagle X15 has a HDMI output. This patch adds the device tree nodes required for HDMI. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: devicetree@vger.kernel.org --- arch/arm/boot/dts/am57xx-beagle-x15.dts | 81 +++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+)