Hi Tomi, On 11/05/2012 02:14 PM, Tomi Valkeinen wrote: > From: Ricardo Neri <ricardo.n...@ti.com> > > Add the pinmux configuration for HDMI and TPD12S015A. Configure the > gpios for the TPD12S015A and SDA, SCL and CEC for HDMI. > > Signed-off-by: Ricardo Neri <ricardo.n...@ti.com> > Signed-off-by: Tomi Valkeinen <tomi.valkei...@ti.com> > --- > arch/arm/boot/dts/omap4-panda-a4.dts | 17 +++++++++++++++++ > arch/arm/boot/dts/omap4-panda.dts | 18 ++++++++++++++++++ > arch/arm/boot/dts/omap4-pandaES.dts | 9 +++++++++
I've just renamed that file omap4-panda-es.dts for consistency, so you'd better rebase this series on top on my for_3.8/dts branch that I've just sent to Tony. Otherwise, this looks good to me. Regards, Benoit > 3 files changed, 44 insertions(+) > create mode 100644 arch/arm/boot/dts/omap4-panda-a4.dts > > diff --git a/arch/arm/boot/dts/omap4-panda-a4.dts > b/arch/arm/boot/dts/omap4-panda-a4.dts > new file mode 100644 > index 0000000..75466d2 > --- /dev/null > +++ b/arch/arm/boot/dts/omap4-panda-a4.dts > @@ -0,0 +1,17 @@ > +/* > + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > +/include/ "omap4-panda.dts" > + > +/* Pandaboard Rev A4+ have external pullups on SCL & SDA */ > +&dss_hdmi_pins { > + pinctrl-single,pins = < > + 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ > + 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ > + 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ > + >; > +}; > diff --git a/arch/arm/boot/dts/omap4-panda.dts > b/arch/arm/boot/dts/omap4-panda.dts > index e8f927c..8060f5b 100644 > --- a/arch/arm/boot/dts/omap4-panda.dts > +++ b/arch/arm/boot/dts/omap4-panda.dts > @@ -65,6 +65,8 @@ > &twl6040_pins > &mcpdm_pins > &mcbsp1_pins > + &dss_hdmi_pins > + &tpd12s015_pins > >; > > twl6040_pins: pinmux_twl6040_pins { > @@ -92,6 +94,22 @@ > 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT > | MODE0 */ > >; > }; > + > + dss_hdmi_pins: pinmux_dss_hdmi_pins { > + pinctrl-single,pins = < > + 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | > MODE 0 */ > + 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | > MODE 0 */ > + 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | > MODE 0 */ > + >; > + }; > + > + tpd12s015_pins: pinmux_tpd12s015_pins { > + pinctrl-single,pins = < > + 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ > + 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ > + 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | > MODE3 */ > + >; > + }; > }; > > &i2c1 { > diff --git a/arch/arm/boot/dts/omap4-pandaES.dts > b/arch/arm/boot/dts/omap4-pandaES.dts > index d4ba43a..73bc1a6 100644 > --- a/arch/arm/boot/dts/omap4-pandaES.dts > +++ b/arch/arm/boot/dts/omap4-pandaES.dts > @@ -22,3 +22,12 @@ > "AFML", "Line In", > "AFMR", "Line In"; > }; > + > +/* PandaboardES has external pullups on SCL & SDA */ > +&dss_hdmi_pins { > + pinctrl-single,pins = < > + 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ > + 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ > + 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ > + >; > +}; > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
