浏览代码

ARM: nomadik: move MMC/SD card detect GPIO to board DTS

This pushes the setting of the card detect GPIO pin down into
the top-level file for the board, since it is not a property of
the ASIC (which this DTSI is about) but a property of the board
design.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij 11 年之前
父节点
当前提交
6bd5e87017
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 7 0
      arch/arm/boot/dts/ste-nomadik-s8815.dts
  2. 0 1
      arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+ 7 - 0
arch/arm/boot/dts/ste-nomadik-s8815.dts

@@ -65,6 +65,13 @@
 		};
 	};
 
+	/* Configure card detect for the uSD slot */
+	amba {
+		mmcsd: sdi@101f6000 {
+			cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
+		};
+	};
+
 	/* Custom board node with GPIO pins to active etc */
 	usb-s8815 {
 		/* This will bias the MMC/SD card detect line */

+ 0 - 1
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

@@ -844,7 +844,6 @@
 			bus-width = <4>;
 			cap-mmc-highspeed;
 			cap-sd-highspeed;
-			cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>;
 			vmmc-supply = <&vmmc_regulator>;