Commit f9559f02 authored by Pali Rohár's avatar Pali Rohár Committed by Gregory CLEMENT
Browse files

arm64: dts: marvell: espressobin: De-duplicate eMMC definitions 



eMMC definitions in files armada-3720-espressobin-emmc.dts and
armada-3720-espressobin-v7-emmc.dts is same. So move it into common
armada-3720-espressobin.dtsi file with status "disabled".

This change simplifies eMMC variants of DTS files for Espressobin.

Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Reviewed-by: default avatarAndre Heider <a.heider@gmail.com>
Tested-by: default avatarAndre Heider <a.heider@gmail.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent d7799849

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts

+0 −18
Original line number Diff line number Diff line
@@ -21,24 +21,6 @@ 
		     "marvell,armada3720", "marvell,armada3710";

};



/* U11 */

&sdhci0 {

	non-removable;

	bus-width = <8>;

	mmc-ddr-1_8v;

	mmc-hs400-1_8v;

	marvell,xenon-emmc;

	marvell,xenon-tun-count = <9>;

	marvell,pad-type = "fixed-1-8v";



	pinctrl-names = "default";

	pinctrl-0 = <&mmc_pins>;

	status = "okay";



	#address-cells = <1>;

	#size-cells = <0>;

	mmccard: mmccard@0 {

		compatible = "mmc-card";

		reg = <0>;

	};

};

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts

+0 −18
Original line number Diff line number Diff line
@@ -36,24 +36,6 @@ 
	label = "wan";

};



/* U11 */

&sdhci0 {

	non-removable;

	bus-width = <8>;

	mmc-ddr-1_8v;

	mmc-hs400-1_8v;

	marvell,xenon-emmc;

	marvell,xenon-tun-count = <9>;

	marvell,pad-type = "fixed-1-8v";



	pinctrl-names = "default";

	pinctrl-0 = <&mmc_pins>;

	status = "okay";



	#address-cells = <1>;

	#size-cells = <0>;

	mmccard: mmccard@0 {

		compatible = "mmc-card";

		reg = <0>;

	};

};

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -58,6 +58,30 @@ 
	phy-names = "sata-phy";

};



/* U11 */

&sdhci0 {

	/* Main DTS file for Espressobin is without eMMC */

	status = "disabled";



	non-removable;

	bus-width = <8>;

	mmc-ddr-1_8v;

	mmc-hs400-1_8v;

	marvell,xenon-emmc;

	marvell,xenon-tun-count = <9>;

	marvell,pad-type = "fixed-1-8v";



	pinctrl-names = "default";

	pinctrl-0 = <&mmc_pins>;



	#address-cells = <1>;

	#size-cells = <0>;

	mmccard: mmccard@0 {

		compatible = "mmc-card";

		reg = <0>;

	};

};



/* J1 */

&sdhci1 {

	wp-inverted;