diff options
| -rw-r--r-- | arch/arm/boot/dts/omap4-panda-common.dtsi | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-sdp.dts | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 03bd60deb52b..eeb734e25709 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi | |||
| @@ -56,9 +56,23 @@ | |||
| 56 | }; | 56 | }; |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | &omap4_pmx_wkup { | ||
| 60 | pinctrl-names = "default"; | ||
| 61 | pinctrl-0 = < | ||
| 62 | &twl6030_wkup_pins | ||
| 63 | >; | ||
| 64 | |||
| 65 | twl6030_wkup_pins: pinmux_twl6030_wkup_pins { | ||
| 66 | pinctrl-single,pins = < | ||
| 67 | 0x14 0x2 /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */ | ||
| 68 | >; | ||
| 69 | }; | ||
| 70 | }; | ||
| 71 | |||
| 59 | &omap4_pmx_core { | 72 | &omap4_pmx_core { |
| 60 | pinctrl-names = "default"; | 73 | pinctrl-names = "default"; |
| 61 | pinctrl-0 = < | 74 | pinctrl-0 = < |
| 75 | &twl6030_pins | ||
| 62 | &twl6040_pins | 76 | &twl6040_pins |
| 63 | &mcpdm_pins | 77 | &mcpdm_pins |
| 64 | &mcbsp1_pins | 78 | &mcbsp1_pins |
| @@ -66,6 +80,12 @@ | |||
| 66 | &tpd12s015_pins | 80 | &tpd12s015_pins |
| 67 | >; | 81 | >; |
| 68 | 82 | ||
| 83 | twl6030_pins: pinmux_twl6030_pins { | ||
| 84 | pinctrl-single,pins = < | ||
| 85 | 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ | ||
| 86 | >; | ||
| 87 | }; | ||
| 88 | |||
| 69 | twl6040_pins: pinmux_twl6040_pins { | 89 | twl6040_pins: pinmux_twl6040_pins { |
| 70 | pinctrl-single,pins = < | 90 | pinctrl-single,pins = < |
| 71 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ | 91 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ |
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index a35d9cd58063..98505a2ef162 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts | |||
| @@ -142,9 +142,23 @@ | |||
| 142 | }; | 142 | }; |
| 143 | }; | 143 | }; |
| 144 | 144 | ||
| 145 | &omap4_pmx_wkup { | ||
| 146 | pinctrl-names = "default"; | ||
| 147 | pinctrl-0 = < | ||
| 148 | &twl6030_wkup_pins | ||
| 149 | >; | ||
| 150 | |||
| 151 | twl6030_wkup_pins: pinmux_twl6030_wkup_pins { | ||
| 152 | pinctrl-single,pins = < | ||
| 153 | 0x14 0x2 /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */ | ||
| 154 | >; | ||
| 155 | }; | ||
| 156 | }; | ||
| 157 | |||
| 145 | &omap4_pmx_core { | 158 | &omap4_pmx_core { |
| 146 | pinctrl-names = "default"; | 159 | pinctrl-names = "default"; |
| 147 | pinctrl-0 = < | 160 | pinctrl-0 = < |
| 161 | &twl6030_pins | ||
| 148 | &twl6040_pins | 162 | &twl6040_pins |
| 149 | &mcpdm_pins | 163 | &mcpdm_pins |
| 150 | &dmic_pins | 164 | &dmic_pins |
| @@ -179,6 +193,12 @@ | |||
| 179 | >; | 193 | >; |
| 180 | }; | 194 | }; |
| 181 | 195 | ||
| 196 | twl6030_pins: pinmux_twl6030_pins { | ||
| 197 | pinctrl-single,pins = < | ||
| 198 | 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ | ||
| 199 | >; | ||
| 200 | }; | ||
| 201 | |||
| 182 | twl6040_pins: pinmux_twl6040_pins { | 202 | twl6040_pins: pinmux_twl6040_pins { |
| 183 | pinctrl-single,pins = < | 203 | pinctrl-single,pins = < |
| 184 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ | 204 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ |