Commit 28734f87 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: Fix up MMC host node names 



The standard mandates that these nodes be named
mmc@... not sdi_foo@...

Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7ac92661

arch/arm/boot/dts/ste-dbx5x0.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ serial2: uart@80007000 { 
			status = "disabled";

		};



		sdi0_per1@80126000 {

		mmc@80126000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80126000 0x1000>;

			interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@@ -899,7 +899,7 @@ sdi0_per1@80126000 { 
			status = "disabled";

		};



		sdi1_per2@80118000 {

		mmc@80118000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80118000 0x1000>;

			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@@ -915,7 +915,7 @@ sdi1_per2@80118000 { 
			status = "disabled";

		};



		sdi2_per3@80005000 {

		mmc@80005000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80005000 0x1000>;

			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
@@ -931,7 +931,7 @@ sdi2_per3@80005000 { 
			status = "disabled";

		};



		sdi3_per2@80119000 {

		mmc@80119000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80119000 0x1000>;

			interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -947,7 +947,7 @@ sdi3_per2@80119000 { 
			status = "disabled";

		};



		sdi4_per2@80114000 {

		mmc@80114000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80114000 0x1000>;

			interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
@@ -963,7 +963,7 @@ sdi4_per2@80114000 { 
			status = "disabled";

		};



		sdi5_per3@80008000 {

		mmc@80008000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80008000 0x1000>;

			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/ste-href.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ i2c@80110000 { 
		};



		// External Micro SD slot

		sdi0_per1@80126000 {

		mmc@80126000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <4>;
@@ -137,7 +137,7 @@ sdi0_per1@80126000 { 
		};



		// WLAN SDIO channel

		sdi1_per2@80118000 {

		mmc@80118000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <4>;
@@ -150,7 +150,7 @@ sdi1_per2@80118000 { 
		};



		// PoP:ed eMMC

		sdi2_per3@80005000 {

		mmc@80005000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <8>;
@@ -165,7 +165,7 @@ sdi2_per3@80005000 { 
		};



		// On-board eMMC

		sdi4_per2@80114000 {

		mmc@80114000 {

			arm,primecell-periphid = <0x10480180>;

		        max-frequency = <100000000>;

			bus-width = <8>;

arch/arm/boot/dts/ste-hrefprev60.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ spi@80002000 { 
		};



		// External Micro SD slot

		sdi0_per1@80126000 {

		mmc@80126000 {

			cd-gpios  = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;

		};

arch/arm/boot/dts/ste-hrefv60plus.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ gpio@8011e080 { 
		};



		// External Micro SD slot

		sdi0_per1@80126000 {

		mmc@80126000 {

			cd-gpios  = <&gpio2 31 GPIO_ACTIVE_HIGH>; // 95

		};

arch/arm/boot/dts/ste-snowball.dts

+4 −4
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ vmmci: regulator-gpio { 
		};



		// External Micro SD slot

		sdi0_per1@80126000 {

		mmc@80126000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <4>;
@@ -241,7 +241,7 @@ sdi0_per1@80126000 { 
		};



		// WLAN SDIO channel

		sdi1_per2@80118000 {

		mmc@80118000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <4>;
@@ -253,7 +253,7 @@ sdi1_per2@80118000 { 
		};



		// Unused PoP eMMC - register and put it to sleep by default */

		sdi2_per3@80005000 {

		mmc@80005000 {

			arm,primecell-periphid = <0x10480180>;

			pinctrl-names = "default";

			pinctrl-0 = <&mc2_a_1_sleep>;
@@ -262,7 +262,7 @@ sdi2_per3@80005000 { 
		};



		// On-board eMMC

		sdi4_per2@80114000 {

		mmc@80114000 {

			arm,primecell-periphid = <0x10480180>;

		        max-frequency = <100000000>;

			bus-width = <8>;