arm64: dts: marvell: espressobin: De-duplicate eMMC definitions
Subsystems (2)
PATCH 1/1 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.
---
Compiled DTB files armada-3720-espressobin-emmc.dtb and armada-3720-espressobin-v7-emmc.dtb are identical as without applying this patch.
Files armada-3720-espressobin.dtb and armada-3720-espressobin-v7.dtb are slightly different compared to version without this patch.
Main change is that numering in all "phandle" nodes is shifted and "sdhci0" node contains more attributes, but node is disabled.
Andre, could you test this change on Espressobin (without eMMC) if everything is OK and there is no issue?
--- .../marvell/armada-3720-espressobin-emmc.dts | 18 -------------- .../armada-3720-espressobin-v7-emmc.dts | 18 -------------- .../dts/marvell/armada-3720-espressobin.dtsi | 24 +++++++++++++++++++ 3 files changed, 24 insertions(+), 36 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +0 -18
@@ -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
@@ -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
@@ -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;
Signature · 1 line
2.20.1
Quoted 7 lines · Pali Rohár
eMMC definitions in files
armada-3720-espressobin-emmc.dtsandarmada-3720-espressobin-v7-emmc.dtsis same. So move it into commonarmada-3720-espressobin.dtsifile with status "disabled".This change simplifies eMMC variants of DTS files for Espressobin.
Signed-off-by Pali Rohár <[email protected]>
Quoted 8 lines
---
Compiled DTB files armada-3720-espressobin-emmc.dtb and armada-3720-espressobin-v7-emmc.dtb are identical as without applying this patch.Files armada-3720-espressobin.dtb and armada-3720-espressobin-v7.dtb are slightly different compared to version without this patch.
Quoted 6 lines
Main change is that numering in all "phandle" nodes is shifted and "sdhci0" node contains more attributes, but node is disabled.
Andre, could you test this change on Espressobin (without eMMC) if everything is OK and there is no issue?
Look good to me, the node appears with status=disabled and everything seems to work as before.
Quoted 101 lines
--- .../marvell/armada-3720-espressobin-emmc.dts | 18 -------------- .../armada-3720-espressobin-v7-emmc.dts | 18 -------------- .../dts/marvell/armada-3720-espressobin.dtsi | 24 +++++++++++++++++++ 3 files changed, 24 insertions(+), 36 deletions(-)arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +0
-18@@ -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@@ -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@@ -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;
Quoted 24 lines · On Sunday 27 September 2020 08:40:41 Andre Heider wrote:
Quoted 7 lines · Pali Rohár
eMMC definitions in files
armada-3720-espressobin-emmc.dtsandarmada-3720-espressobin-v7-emmc.dtsis same. So move it into commonarmada-3720-espressobin.dtsifile with status "disabled".This change simplifies eMMC variants of DTS files for Espressobin.
Signed-off-by Pali Rohár <[email protected]>Reviewed-by Andre Heider <[email protected]>Tested-by Andre Heider <[email protected]>Quoted 12 lines
---
Compiled DTB files armada-3720-espressobin-emmc.dtb and armada-3720-espressobin-v7-emmc.dtb are identical as without applying this patch.Files armada-3720-espressobin.dtb and armada-3720-espressobin-v7.dtb are slightly different compared to version without this patch.
Main change is that numering in all "phandle" nodes is shifted and "sdhci0" node contains more attributes, but node is disabled.
Quoted 5 lines
Quoted 2 lines
Andre, could you test this change on Espressobin (without eMMC) if everything is OK and there is no issue?
Look good to me, the node appears with status=disabled and everything seems to work as before.
Great!
Gregory, would do you think about including this patch into next queue too?
Quoted 99 lines
Quoted 98 lines
--- .../marvell/armada-3720-espressobin-emmc.dts | 18 -------------- .../armada-3720-espressobin-v7-emmc.dts | 18 -------------- .../dts/marvell/armada-3720-espressobin.dtsi | 24 +++++++++++++++++++ 3 files changed, 24 insertions(+), 36 deletions(-)arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +0
-18@@ -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@@ -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@@ -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;
Hi Pali,
Quoted 28 lines · On Sunday 27 September 2020 08:40:41 Andre Heider wrote:
Quoted 27 lines · Pali Rohár
Quoted 7 lines
eMMC definitions in files
armada-3720-espressobin-emmc.dtsandarmada-3720-espressobin-v7-emmc.dtsis same. So move it into commonarmada-3720-espressobin.dtsifile with status "disabled".This change simplifies eMMC variants of DTS files for Espressobin.
Signed-off-by Pali Rohár <[email protected]>Reviewed-by Andre Heider <[email protected]>Tested-by Andre Heider <[email protected]>Quoted 14 lines
---
Compiled DTB files armada-3720-espressobin-emmc.dtb and armada-3720-espressobin-v7-emmc.dtb are identical as without applying this patch.Files armada-3720-espressobin.dtb and armada-3720-espressobin-v7.dtb are slightly different compared to version without this patch.
Main change is that numering in all "phandle" nodes is shifted and "sdhci0" node contains more attributes, but node is disabled.
Andre, could you test this change on Espressobin (without eMMC) if everything is OK and there is no issue?
Quoted 7 lines
Quoted 2 lines
Look good to me, the node appears with status=disabled and everything seems to work as before.
Great!
Gregory, would do you think about including this patch into next queue too?
I've applied on mvebu/dt64, however I am not sure I will be able to make it merged for 5.10, but I will try.
Thanks,
Gregory
Quoted 100 lines
Quoted 100 lines
Quoted 99 lines
--- .../marvell/armada-3720-espressobin-emmc.dts | 18 -------------- .../armada-3720-espressobin-v7-emmc.dts | 18 -------------- .../dts/marvell/armada-3720-espressobin.dtsi | 24 +++++++++++++++++++ 3 files changed, 24 insertions(+), 36 deletions(-)arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +0
-18@@ -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@@ -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@@ -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;
Signature · 3 lines
Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com