Merge branch 'pm-runtime'

[~andy/linux] / arch / arm / boot / dts / omap4-panda-common.dtsi

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 3e6801cecd04378616018927275532b297500818..298e85020e1b20bec89b8ecc52b38886e4656467 100644 (file)
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -112,6 +112,8 @@
                        &twl6040_pins
                        &mcpdm_pins
                        &mcbsp1_pins
+                       &dss_dpi_pins
+                       &tfp410_pins
                        &dss_hdmi_pins
                        &tpd12s015_pins
                        &hsusbb1_pins
@@ -143,6 +145,47 @@
                >;
        };
 
+       dss_dpi_pins: pinmux_dss_dpi_pins {
+               pinctrl-single,pins = <
+                       0x122 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data23 */
+                       0x124 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data22 */
+                       0x126 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data21 */
+                       0x128 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data20 */
+                       0x12a (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data19 */
+                       0x12c (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data18 */
+                       0x12e (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data15 */
+                       0x130 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data14 */
+                       0x132 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data13 */
+                       0x134 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data12 */
+                       0x136 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data11 */
+
+                       0x174 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data10 */
+                       0x176 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data9 */
+                       0x178 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data16 */
+                       0x17a (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data17 */
+                       0x17c (PIN_OUTPUT | MUX_MODE5)  /* dispc2_hsync */
+                       0x17e (PIN_OUTPUT | MUX_MODE5)  /* dispc2_pclk */
+                       0x180 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_vsync */
+                       0x182 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_de */
+                       0x184 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data8 */
+                       0x186 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data7 */
+                       0x188 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data6 */
+                       0x18a (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data5 */
+                       0x18c (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data4 */
+                       0x18e (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data3 */
+
+                       0x190 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data2 */
+                       0x192 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data1 */
+                       0x194 (PIN_OUTPUT | MUX_MODE5)  /* dispc2_data0 */
+               >;
+       };
+
+       tfp410_pins: pinmux_tfp410_pins {
+               pinctrl-single,pins = <
+                       0x144 (PIN_OUTPUT | MUX_MODE3)  /* gpio_0 */
+               >;
+       };
+
        dss_hdmi_pins: pinmux_dss_hdmi_pins {
                pinctrl-single,pins = <
                        0x5a (PIN_INPUT_PULLUP | MUX_MODE0)     /* hdmi_cec.hdmi_cec */