diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-10-08 15:35:41 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-10-08 15:35:41 +0400 |
| commit | 9a4d1c31feffa4c11974c46dc9882475d4266457 (patch) | |
| tree | 0322f225ca1641305560fca1dc0353750be789fd | |
| parent | b556c3a3c72f126dbbacf02ecf237e88542a6bd7 (diff) | |
| parent | 582005e19e55303a71a4c02337b90e9c1ef0d30f (diff) | |
Merge branch 'tracking-omap-fixes-13.10' into merge-linux-linaroll-20131008.0ll_20131008.0
| -rw-r--r-- | arch/arm/boot/dts/omap4-panda-common.dtsi | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 814ab67c8c29..712ddbf85c77 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -239,15 +239,6 @@ 0xf0 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */ >; }; -}; - -&omap4_pmx_wkup { - led_wkgpio_pins: pinmux_leds_wkpins { - pinctrl-single,pins = < - 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */ - 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ - >; - }; /* * wl12xx GPIO outputs for WLAN_EN, BT_EN, FM_EN, BT_WAKEUP @@ -277,6 +268,16 @@ }; }; +&omap4_pmx_wkup { + led_wkgpio_pins: pinmux_leds_wkpins { + pinctrl-single,pins = < + 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */ + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ + >; + }; + +}; + &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; |