Commit de0f42be authored by Doug Anderson's avatar Doug Anderson Committed by Kukjin Kim
Browse files

ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos 



The aliases for dwmmc were placed in the SMDK5250 dts file but really
should be common for all exynos5250 boards.  Move it to the common CPU
file.

Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent c47d244a

arch/arm/boot/dts/exynos5250-smdk5250.dts

+4 −8
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
	compatible = "samsung,smdk5250", "samsung,exynos5250";



	aliases {

		mshc0 = &dwmmc_0;

		mshc1 = &dwmmc_1;

		mshc2 = &dwmmc_2;

		mshc3 = &dwmmc_3;

	};



	memory {
@@ -94,7 +90,7 @@ 
		status = "disabled";

	};



	dwmmc_0: dwmmc0@12200000 {

	dwmmc0@12200000 {

		num-slots = <1>;

		supports-highspeed;

		broken-cd;
@@ -115,11 +111,11 @@ 
		};

	};



	dwmmc_1: dwmmc1@12210000 {

	dwmmc1@12210000 {

		status = "disabled";

	};



	dwmmc_2: dwmmc2@12220000 {

	dwmmc2@12220000 {

		num-slots = <1>;

		supports-highspeed;

		fifo-depth = <0x80>;
@@ -140,7 +136,7 @@ 
		};

	};



	dwmmc_3: dwmmc3@12230000 {

	dwmmc3@12230000 {

		status = "disabled";

	};

arch/arm/boot/dts/exynos5250.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
		gsc1 = &gsc_1;

		gsc2 = &gsc_2;

		gsc3 = &gsc_3;

		mshc0 = &dwmmc_0;

		mshc1 = &dwmmc_1;

		mshc2 = &dwmmc_2;

		mshc3 = &dwmmc_3;

	};



	gic:interrupt-controller@10481000 {
@@ -216,7 +220,7 @@ 
		#size-cells = <0>;

	};



	dwmmc0@12200000 {

	dwmmc_0: dwmmc0@12200000 {

		compatible = "samsung,exynos5250-dw-mshc";

		reg = <0x12200000 0x1000>;

		interrupts = <0 75 0>;
@@ -224,7 +228,7 @@ 
		#size-cells = <0>;

	};



	dwmmc1@12210000 {

	dwmmc_1: dwmmc1@12210000 {

		compatible = "samsung,exynos5250-dw-mshc";

		reg = <0x12210000 0x1000>;

		interrupts = <0 76 0>;
@@ -232,7 +236,7 @@ 
		#size-cells = <0>;

	};



	dwmmc2@12220000 {

	dwmmc_2: dwmmc2@12220000 {

		compatible = "samsung,exynos5250-dw-mshc";

		reg = <0x12220000 0x1000>;

		interrupts = <0 77 0>;
@@ -240,7 +244,7 @@ 
		#size-cells = <0>;

	};



	dwmmc3@12230000 {

	dwmmc_3: dwmmc3@12230000 {

		compatible = "samsung,exynos5250-dw-mshc";

		reg = <0x12230000 0x1000>;

		interrupts = <0 78 0>;