Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd5e870 authored Sep 11, 2014 by Linus Walleij

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>

parent f114040e

arch/arm/boot/dts/ste-nomadik-s8815.dts

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 */		/* Custom board node with GPIO pins to active etc */
	usb-s8815 {		usb-s8815 {
	/* This will bias the MMC/SD card detect line */		/* This will bias the MMC/SD card detect line */

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+0 −1

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