diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3-minnow-p0.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3-minnow.dtsi | 22 |
2 files changed, 23 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/omap3-minnow-p0.dts b/arch/arm/boot/dts/omap3-minnow-p0.dts index 8a588a43372..67337a345e6 100644 --- a/arch/arm/boot/dts/omap3-minnow-p0.dts +++ b/arch/arm/boot/dts/omap3-minnow-p0.dts @@ -51,7 +51,11 @@ gpios = <&gpio3 12 1>, /* IRQ gpio_ap_int gpio-076 */ <&gpio3 16 0>, /* gpio_reset gpio-80*/ <&gpio3 17 2>; /* gpio_c55_int gpio-81*/ - c55-ctrl-supply = <&ldo9_reg>; + vddc-supply = <&ldo9_reg>; + vddldo-supply = <&ldo3_reg>; + pinctrl-names = "off", "on"; + pinctrl-0 = <&c55_pins_off>; + pinctrl-1 = <&c55_pins_on>; }; vib-gpio { diff --git a/arch/arm/boot/dts/omap3-minnow.dtsi b/arch/arm/boot/dts/omap3-minnow.dtsi index f29c0a91840..4d13219a559 100644 --- a/arch/arm/boot/dts/omap3-minnow.dtsi +++ b/arch/arm/boot/dts/omap3-minnow.dtsi @@ -194,10 +194,6 @@ 0x19c 0x100 /* MCSPI1_SOMI, MODE0 | INPUT */ 0x19e 0x000 /* MCSPI1_CS0, MODE0 | OUTPUT */ 0x1a0 0x000 /* MCSPI1_CS1, MODE0 | OUTPUT */ - 0x1a6 0x100 /* MCSPI2_CLK, MODE0 | INPUT */ - 0x1a8 0x000 /* MCSPI2_SIMO, MODE0 | OUTPUT */ - 0x1aa 0x100 /* MCSPI2_SOMI, MODE0 | INPUT */ - 0x1ac 0x000 /* MCSPI2_CS0, MODE0 | OUTPUT */ 0x1ae 0x004 /* MCSPI2_CS1, MODE4 | OUTPUT */ 0x1b0 0x104 /* SYS_NIRQ, MODE4 | INPUT */ 0x1b2 0x004 /* SYS_CLKOUT2, MODE4 | OUTPUT */ @@ -230,6 +226,24 @@ 0x142 0x10F /* MCBSP_FSX | INPUT | PULLDOWN */ >; }; + + c55_pins_off: pinmux_c55_pins_off { + pinctrl-single,pins = < + 0x1a6 0x100 /* MCSPI2_CLK, MODE0 | INPUT */ + 0x1a8 0x000 /* MCSPI2_SIMO, MODE0 | OUTPUT */ + 0x1aa 0x100 /* MCSPI2_SOMI, MODE0 | INPUT */ + 0x1ac 0x000 /* MCSPI2_CS0, MODE0 | OUTPUT */ + >; + }; + + c55_pins_on: pinmux_c55_pins_on { + pinctrl-single,pins = < + 0x1a6 0x107 /* MCSPI2_CLK, MODE7 (SAFE) | INPUT */ + 0x1a8 0x107 /* MCSPI2_SIMO, MODE7 (SAFE) | INPUT */ + 0x1aa 0x107 /* MCSPI2_SOMI, MODE7 (SAFE) | INPUT */ + 0x1ac 0x107 /* MCSPI2_CS0, MODE7 (SAFE) | INPUT */ + >; + }; }; &omap3_pmx_wkup{ |