diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep.dtsi | 29 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep0020.dts | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep0030.dts | 39 |
3 files changed, 78 insertions, 29 deletions
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi index 04a58ab32b33..6118e7fd71b2 100644 --- a/arch/arm/boot/dts/omap3-igep.dtsi +++ b/arch/arm/boot/dts/omap3-igep.dtsi | |||
| @@ -31,18 +31,6 @@ | |||
| 31 | regulator-always-on; | 31 | regulator-always-on; |
| 32 | }; | 32 | }; |
| 33 | 33 | ||
| 34 | lbee1usjyc_vmmc: lbee1usjyc_vmmc { | ||
| 35 | pinctrl-names = "default"; | ||
| 36 | pinctrl-0 = <&lbee1usjyc_pins>; | ||
| 37 | compatible = "regulator-fixed"; | ||
| 38 | regulator-name = "regulator-lbee1usjyc"; | ||
| 39 | regulator-min-microvolt = <3300000>; | ||
| 40 | regulator-max-microvolt = <3300000>; | ||
| 41 | gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>; /* gpio_138 WIFI_PDN */ | ||
| 42 | startup-delay-us = <10000>; | ||
| 43 | enable-active-high; | ||
| 44 | vin-supply = <&vdd33>; | ||
| 45 | }; | ||
| 46 | }; | 34 | }; |
| 47 | 35 | ||
| 48 | &omap3_pmx_core { | 36 | &omap3_pmx_core { |
| @@ -60,15 +48,6 @@ | |||
| 60 | >; | 48 | >; |
| 61 | }; | 49 | }; |
| 62 | 50 | ||
| 63 | /* WiFi/BT combo */ | ||
| 64 | lbee1usjyc_pins: pinmux_lbee1usjyc_pins { | ||
| 65 | pinctrl-single,pins = < | ||
| 66 | 0x136 (PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat5.gpio_137 */ | ||
| 67 | 0x138 (PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat6.gpio_138 */ | ||
| 68 | 0x13a (PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat7.gpio_139 */ | ||
| 69 | >; | ||
| 70 | }; | ||
| 71 | |||
| 72 | mcbsp2_pins: pinmux_mcbsp2_pins { | 51 | mcbsp2_pins: pinmux_mcbsp2_pins { |
| 73 | pinctrl-single,pins = < | 52 | pinctrl-single,pins = < |
| 74 | 0x10c (PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx.mcbsp2_fsx */ | 53 | 0x10c (PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx.mcbsp2_fsx */ |
| @@ -223,14 +202,6 @@ | |||
| 223 | bus-width = <4>; | 202 | bus-width = <4>; |
| 224 | }; | 203 | }; |
| 225 | 204 | ||
| 226 | &mmc2 { | ||
| 227 | pinctrl-names = "default"; | ||
| 228 | pinctrl-0 = <&mmc2_pins>; | ||
| 229 | vmmc-supply = <&lbee1usjyc_vmmc>; | ||
| 230 | bus-width = <4>; | ||
| 231 | non-removable; | ||
| 232 | }; | ||
| 233 | |||
| 234 | &mmc3 { | 205 | &mmc3 { |
| 235 | status = "disabled"; | 206 | status = "disabled"; |
| 236 | }; | 207 | }; |
diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts index 75a3ac3ef169..0d82f0993214 100644 --- a/arch/arm/boot/dts/omap3-igep0020.dts +++ b/arch/arm/boot/dts/omap3-igep0020.dts | |||
| @@ -45,6 +45,27 @@ | |||
| 45 | }; | 45 | }; |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | /* Regulator to trigger the WIFI_PDN signal of the Wifi module */ | ||
| 49 | lbee1usjyc_pdn: lbee1usjyc_pdn { | ||
| 50 | compatible = "regulator-fixed"; | ||
| 51 | regulator-name = "regulator-lbee1usjyc-pdn"; | ||
| 52 | regulator-min-microvolt = <3300000>; | ||
| 53 | regulator-max-microvolt = <3300000>; | ||
| 54 | gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>; /* gpio_138 - WIFI_PDN */ | ||
| 55 | startup-delay-us = <10000>; | ||
| 56 | enable-active-high; | ||
| 57 | }; | ||
| 58 | |||
| 59 | /* Regulator to trigger the RESET_N_W signal of the Wifi module */ | ||
| 60 | lbee1usjyc_reset_n_w: lbee1usjyc_reset_n_w { | ||
| 61 | compatible = "regulator-fixed"; | ||
| 62 | regulator-name = "regulator-lbee1usjyc-reset-n-w"; | ||
| 63 | regulator-min-microvolt = <3300000>; | ||
| 64 | regulator-max-microvolt = <3300000>; | ||
| 65 | gpio = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* gpio_139 - RESET_N_W */ | ||
| 66 | enable-active-high; | ||
| 67 | }; | ||
| 68 | |||
| 48 | /* HS USB Port 1 Power */ | 69 | /* HS USB Port 1 Power */ |
| 49 | hsusb1_power: hsusb1_power_reg { | 70 | hsusb1_power: hsusb1_power_reg { |
| 50 | compatible = "regulator-fixed"; | 71 | compatible = "regulator-fixed"; |
| @@ -150,6 +171,14 @@ | |||
| 150 | >; | 171 | >; |
| 151 | }; | 172 | }; |
| 152 | 173 | ||
| 174 | lbee1usjyc_pins: pinmux_lbee1usjyc_pins { | ||
| 175 | pinctrl-single,pins = < | ||
| 176 | OMAP3_CORE1_IOPAD(0x2166, PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat5.gpio_137 - RESET_N_W */ | ||
| 177 | OMAP3_CORE1_IOPAD(0x2168, PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat6.gpio_138 - WIFI_PDN */ | ||
| 178 | OMAP3_CORE1_IOPAD(0x216a, PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat7.gpio_139 - RST_N_B */ | ||
| 179 | >; | ||
| 180 | }; | ||
| 181 | |||
| 153 | uart2_pins: pinmux_uart2_pins { | 182 | uart2_pins: pinmux_uart2_pins { |
| 154 | pinctrl-single,pins = < | 183 | pinctrl-single,pins = < |
| 155 | OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT | MUX_MODE0) /* uart2_cts.uart2_cts */ | 184 | OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT | MUX_MODE0) /* uart2_cts.uart2_cts */ |
| @@ -218,6 +247,16 @@ | |||
| 218 | }; | 247 | }; |
| 219 | }; | 248 | }; |
| 220 | 249 | ||
| 250 | /* On board Wifi module */ | ||
| 251 | &mmc2 { | ||
| 252 | pinctrl-names = "default"; | ||
| 253 | pinctrl-0 = <&mmc2_pins &lbee1usjyc_pins>; | ||
| 254 | vmmc-supply = <&lbee1usjyc_pdn>; | ||
| 255 | vmmc_aux-supply = <&lbee1usjyc_reset_n_w>; | ||
| 256 | bus-width = <4>; | ||
| 257 | non-removable; | ||
| 258 | }; | ||
| 259 | |||
| 221 | &uart2 { | 260 | &uart2 { |
| 222 | pinctrl-names = "default"; | 261 | pinctrl-names = "default"; |
| 223 | pinctrl-0 = <&uart2_pins>; | 262 | pinctrl-0 = <&uart2_pins>; |
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts index d7527b63b8d3..cc2a37437196 100644 --- a/arch/arm/boot/dts/omap3-igep0030.dts +++ b/arch/arm/boot/dts/omap3-igep0030.dts | |||
| @@ -44,9 +44,38 @@ | |||
| 44 | default-state = "off"; | 44 | default-state = "off"; |
| 45 | }; | 45 | }; |
| 46 | }; | 46 | }; |
| 47 | |||
| 48 | /* Regulator to trigger the WIFI_PDN signal of the Wifi module */ | ||
| 49 | lbee1usjyc_pdn: lbee1usjyc_pdn { | ||
| 50 | compatible = "regulator-fixed"; | ||
| 51 | regulator-name = "regulator-lbee1usjyc-pdn"; | ||
| 52 | regulator-min-microvolt = <3300000>; | ||
| 53 | regulator-max-microvolt = <3300000>; | ||
| 54 | gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>; /* gpio_138 - WIFI_PDN */ | ||
| 55 | startup-delay-us = <10000>; | ||
| 56 | enable-active-high; | ||
| 57 | }; | ||
| 58 | |||
| 59 | /* Regulator to trigger the RESET_N_W signal of the Wifi module */ | ||
| 60 | lbee1usjyc_reset_n_w: lbee1usjyc_reset_n_w { | ||
| 61 | compatible = "regulator-fixed"; | ||
| 62 | regulator-name = "regulator-lbee1usjyc-reset-n-w"; | ||
| 63 | regulator-min-microvolt = <3300000>; | ||
| 64 | regulator-max-microvolt = <3300000>; | ||
| 65 | gpio = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* gpio_139 - RESET_N_W */ | ||
| 66 | enable-active-high; | ||
| 67 | }; | ||
| 47 | }; | 68 | }; |
| 48 | 69 | ||
| 49 | &omap3_pmx_core { | 70 | &omap3_pmx_core { |
| 71 | lbee1usjyc_pins: pinmux_lbee1usjyc_pins { | ||
| 72 | pinctrl-single,pins = < | ||
| 73 | OMAP3_CORE1_IOPAD(0x2166, PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat5.gpio_137 - RESET_N_W */ | ||
| 74 | OMAP3_CORE1_IOPAD(0x2168, PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat6.gpio_138 - WIFI_PDN */ | ||
| 75 | OMAP3_CORE1_IOPAD(0x216a, PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat7.gpio_139 - RST_N_B */ | ||
| 76 | >; | ||
| 77 | }; | ||
| 78 | |||
| 50 | uart2_pins: pinmux_uart2_pins { | 79 | uart2_pins: pinmux_uart2_pins { |
| 51 | pinctrl-single,pins = < | 80 | pinctrl-single,pins = < |
| 52 | OMAP3_CORE1_IOPAD(0x216c, PIN_INPUT | MUX_MODE1) /* mcbsp3_dx.uart2_cts */ | 81 | OMAP3_CORE1_IOPAD(0x216c, PIN_INPUT | MUX_MODE1) /* mcbsp3_dx.uart2_cts */ |
| @@ -65,6 +94,16 @@ | |||
| 65 | }; | 94 | }; |
| 66 | }; | 95 | }; |
| 67 | 96 | ||
| 97 | /* On board Wifi module */ | ||
| 98 | &mmc2 { | ||
| 99 | pinctrl-names = "default"; | ||
| 100 | pinctrl-0 = <&mmc2_pins &lbee1usjyc_pins>; | ||
| 101 | vmmc-supply = <&lbee1usjyc_pdn>; | ||
| 102 | vmmc_aux-supply = <&lbee1usjyc_reset_n_w>; | ||
| 103 | bus-width = <4>; | ||
| 104 | non-removable; | ||
| 105 | }; | ||
| 106 | |||
| 68 | &uart2 { | 107 | &uart2 { |
| 69 | pinctrl-names = "default"; | 108 | pinctrl-names = "default"; |
| 70 | pinctrl-0 = <&uart2_pins>; | 109 | pinctrl-0 = <&uart2_pins>; |
