Commit 67bb17f6 authored by Thierry Reding's avatar Thierry Reding
Browse files

arm64: tegra: Rename sdhci nodes to mmc 



The new json-schema based validation tools require SD/MMC controller
nodes to be named mmc. Rename all references to them.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 772a6a7b

arch/arm64/boot/dts/nvidia/tegra132-norrin.dts

+3 −3
Original line number Diff line number Diff line
@@ -894,12 +894,12 @@ 
	};



	/* WIFI/BT module */

	sdhci@700b0000 {

	mmc@700b0000 {

		status = "disabled";

	};



	/* external SD/MMC */

	sdhci@700b0400 {

	mmc@700b0400 {

		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;

		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
@@ -909,7 +909,7 @@ 
	};



	/* EMMC 4.51 */

	sdhci@700b0600 {

	mmc@700b0600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

arch/arm64/boot/dts/nvidia/tegra132.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ 
		};

	};



	sdhci@700b0000 {

	mmc@700b0000 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0000 0x0 0x200>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -702,7 +702,7 @@ 
		status = "disabled";

	};



	sdhci@700b0200 {

	mmc@700b0200 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0200 0x0 0x200>;

		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -713,7 +713,7 @@ 
		status = "disabled";

	};



	sdhci@700b0400 {

	mmc@700b0400 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0400 0x0 0x200>;

		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -724,7 +724,7 @@ 
		status = "disabled";

	};



	sdhci@700b0600 {

	mmc@700b0600 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0600 0x0 0x200>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
	};



	/* SDMMC1 (SD/MMC) */

	sdhci@3400000 {

	mmc@3400000 {

		status = "okay";



		vmmc-supply = <&vdd_sd>;

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 


	aliases {

		ethernet0 = "/ethernet@2490000";

		sdhci0 = "/sdhci@3460000";

		sdhci1 = "/sdhci@3400000";

		mmc0 = "/mmc@3460000";

		mmc1 = "/mmc@3400000";

		serial0 = &uarta;

		i2c0 = "/bpmp/i2c";

		i2c1 = "/i2c@3160000";
@@ -135,7 +135,7 @@ 
	};



	/* SDMMC1 (SD/MMC) */

	sdhci@3400000 {

	mmc@3400000 {

		cd-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
@@ -143,12 +143,12 @@ 
	};



	/* SDMMC3 (SDIO) */

	sdhci@3440000 {

	mmc@3440000 {

		status = "okay";

	};



	/* SDMMC4 (eMMC) */

	sdhci@3460000 {

	mmc@3460000 {

		status = "okay";

		bus-width = <8>;

		non-removable;

arch/arm64/boot/dts/nvidia/tegra186.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ 
		status = "disabled";

	};



	sdmmc1: sdhci@3400000 {

	sdmmc1: mmc@3400000 {

		compatible = "nvidia,tegra186-sdhci";

		reg = <0x0 0x03400000 0x0 0x10000>;

		interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -362,7 +362,7 @@ 
		status = "disabled";

	};



	sdmmc2: sdhci@3420000 {

	sdmmc2: mmc@3420000 {

		compatible = "nvidia,tegra186-sdhci";

		reg = <0x0 0x03420000 0x0 0x10000>;

		interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
@@ -386,7 +386,7 @@ 
		status = "disabled";

	};



	sdmmc3: sdhci@3440000 {

	sdmmc3: mmc@3440000 {

		compatible = "nvidia,tegra186-sdhci";

		reg = <0x0 0x03440000 0x0 0x10000>;

		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
@@ -412,7 +412,7 @@ 
		status = "disabled";

	};



	sdmmc4: sdhci@3460000 {

	sdmmc4: mmc@3460000 {

		compatible = "nvidia,tegra186-sdhci";

		reg = <0x0 0x03460000 0x0 0x10000>;

		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE