diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/am335x-bone-common.dtsi | 14 | ||||
-rw-r--r-- | arch/arm/boot/dts/am335x-bone.dts | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index 2f66deda9f5c..0d95d54b6ae9 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi | |||
@@ -107,6 +107,12 @@ | |||
107 | 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) | 107 | 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) |
108 | >; | 108 | >; |
109 | }; | 109 | }; |
110 | |||
111 | mmc1_pins: pinmux_mmc1_pins { | ||
112 | pinctrl-single,pins = < | ||
113 | 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */ | ||
114 | >; | ||
115 | }; | ||
110 | }; | 116 | }; |
111 | 117 | ||
112 | ocp { | 118 | ocp { |
@@ -260,3 +266,11 @@ | |||
260 | pinctrl-0 = <&davinci_mdio_default>; | 266 | pinctrl-0 = <&davinci_mdio_default>; |
261 | pinctrl-1 = <&davinci_mdio_sleep>; | 267 | pinctrl-1 = <&davinci_mdio_sleep>; |
262 | }; | 268 | }; |
269 | |||
270 | &mmc1 { | ||
271 | status = "okay"; | ||
272 | pinctrl-names = "default"; | ||
273 | pinctrl-0 = <&mmc1_pins>; | ||
274 | cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; | ||
275 | cd-inverted; | ||
276 | }; | ||
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index d5f43fe2bfe1..0d6334875df8 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts | |||
@@ -17,6 +17,5 @@ | |||
17 | }; | 17 | }; |
18 | 18 | ||
19 | &mmc1 { | 19 | &mmc1 { |
20 | status = "okay"; | ||
21 | vmmc-supply = <&ldo3_reg>; | 20 | vmmc-supply = <&ldo3_reg>; |
22 | }; | 21 | }; |