diff options
-rw-r--r-- | arch/arm/boot/dts/ste-nomadik-s8815.dts | 7 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 90d8b6c7a205..c795ee8a356a 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts | |||
@@ -65,6 +65,13 @@ | |||
65 | }; | 65 | }; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | /* Configure card detect for the uSD slot */ | ||
69 | amba { | ||
70 | mmcsd: sdi@101f6000 { | ||
71 | cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; | ||
72 | }; | ||
73 | }; | ||
74 | |||
68 | /* Custom board node with GPIO pins to active etc */ | 75 | /* Custom board node with GPIO pins to active etc */ |
69 | usb-s8815 { | 76 | usb-s8815 { |
70 | /* This will bias the MMC/SD card detect line */ | 77 | /* This will bias the MMC/SD card detect line */ |
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index dbcf521b017f..35c79eb24f93 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | |||
@@ -844,7 +844,6 @@ | |||
844 | bus-width = <4>; | 844 | bus-width = <4>; |
845 | cap-mmc-highspeed; | 845 | cap-mmc-highspeed; |
846 | cap-sd-highspeed; | 846 | cap-sd-highspeed; |
847 | cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; | ||
848 | pinctrl-names = "default"; | 847 | pinctrl-names = "default"; |
849 | pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>; | 848 | pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>; |
850 | vmmc-supply = <&vmmc_regulator>; | 849 | vmmc-supply = <&vmmc_regulator>; |