[PATCH v2 26/37] ARM: tegra: colibri_t20: annotate/move sd card detect

Marcel Ziswiler
2018-09-02T10:11:32Z

Annotate the SD card, its detect pin and move the SD card detect GPIO
definition from the module to the carrier board more in-line with our
other device trees.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v2: None

arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 ++
arch/arm/boot/dts/tegra20-colibri.dtsi | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index 7a7530820188..1583d5118302 100644
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -163,9 +163,11 @@
vbus-supply = <&reg_usbh_vbus>;
};

+ /* SD/MMC */
sdhci@c8000600 {
status = "okay";
bus-width = <4>;
+ cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
no-1-8-v;
};

diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index aba56b447bcd..6b82485ff58e 100644
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -698,10 +698,6 @@
vbus-supply = <&reg_lan_v_bus>;
};

- sdhci@c8000600 {
- cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
- };
-
clocks {
compatible = "simple-bus";
#address-cells = <1>;
--
2.14.4