* [PATCH] arm64: dts: marvell: espressobin: De-duplicate eMMC definitions
@ 2020-09-25 8:50 Pali Rohár
2020-09-27 6:40 ` Andre Heider
0 siblings, 1 reply; 4+ messages in thread
From: Pali Rohár @ 2020-09-25 8:50 UTC (permalink / raw)
To: Gregory Clement, Jason Cooper, Andrew Lunn,
Sebastian Hesselbarth, Rob Herring, Andre Heider
Cc: devicetree, linux-kernel
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: Pali Rohár <pali@kernel.org>
---
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(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
index ec72a11ed80f..5c4d8f379704 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
@@ -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>;
- };
};
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
index 6062a7df7342..4775a7eda481 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
@@ -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>;
- };
};
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index 3169a820558f..8a1c678bea5f 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -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;
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64: dts: marvell: espressobin: De-duplicate eMMC definitions
2020-09-25 8:50 [PATCH] arm64: dts: marvell: espressobin: De-duplicate eMMC definitions Pali Rohár
@ 2020-09-27 6:40 ` Andre Heider
2020-10-02 12:13 ` Pali Rohár
0 siblings, 1 reply; 4+ messages in thread
From: Andre Heider @ 2020-09-27 6:40 UTC (permalink / raw)
To: Pali Rohár, Gregory Clement, Jason Cooper, Andrew Lunn,
Sebastian Hesselbarth, Rob Herring
Cc: devicetree, linux-kernel
On 25/09/2020 10:50, Pali Rohár wrote:
> 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: Pali Rohár <pali@kernel.org>
Reviewed-by: Andre Heider <a.heider@gmail.com>
Tested-by: Andre Heider <a.heider@gmail.com>
> ---
> 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?
Look good to me, the node appears with status=disabled and everything
seems to work as before.
>
> ---
> .../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(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> index ec72a11ed80f..5c4d8f379704 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> @@ -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>;
> - };
> };
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> index 6062a7df7342..4775a7eda481 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> @@ -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>;
> - };
> };
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> index 3169a820558f..8a1c678bea5f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> @@ -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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64: dts: marvell: espressobin: De-duplicate eMMC definitions
2020-09-27 6:40 ` Andre Heider
@ 2020-10-02 12:13 ` Pali Rohár
2020-10-05 13:14 ` Gregory CLEMENT
0 siblings, 1 reply; 4+ messages in thread
From: Pali Rohár @ 2020-10-02 12:13 UTC (permalink / raw)
To: Andre Heider, Gregory Clement
Cc: Jason Cooper, Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
devicetree, linux-kernel
On Sunday 27 September 2020 08:40:41 Andre Heider wrote:
> On 25/09/2020 10:50, Pali Rohár wrote:
> > 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: Pali Rohár <pali@kernel.org>
>
> Reviewed-by: Andre Heider <a.heider@gmail.com>
> Tested-by: Andre Heider <a.heider@gmail.com>
>
> > ---
> > 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?
>
> 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?
> >
> > ---
> > .../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(-)
> >
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > index ec72a11ed80f..5c4d8f379704 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > @@ -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>;
> > - };
> > };
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > index 6062a7df7342..4775a7eda481 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > @@ -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>;
> > - };
> > };
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> > index 3169a820558f..8a1c678bea5f 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> > @@ -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;
> >
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64: dts: marvell: espressobin: De-duplicate eMMC definitions
2020-10-02 12:13 ` Pali Rohár
@ 2020-10-05 13:14 ` Gregory CLEMENT
0 siblings, 0 replies; 4+ messages in thread
From: Gregory CLEMENT @ 2020-10-05 13:14 UTC (permalink / raw)
To: Pali Rohár, Andre Heider
Cc: Jason Cooper, Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
devicetree, linux-kernel
Hi Pali,
> On Sunday 27 September 2020 08:40:41 Andre Heider wrote:
>> On 25/09/2020 10:50, Pali Rohár wrote:
>> > 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: Pali Rohár <pali@kernel.org>
>>
>> Reviewed-by: Andre Heider <a.heider@gmail.com>
>> Tested-by: Andre Heider <a.heider@gmail.com>
>>
>> > ---
>> > 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?
>>
>> 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
>
>> >
>> > ---
>> > .../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(-)
>> >
>> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
>> > index ec72a11ed80f..5c4d8f379704 100644
>> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
>> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
>> > @@ -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>;
>> > - };
>> > };
>> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
>> > index 6062a7df7342..4775a7eda481 100644
>> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
>> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
>> > @@ -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>;
>> > - };
>> > };
>> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
>> > index 3169a820558f..8a1c678bea5f 100644
>> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
>> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
>> > @@ -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;
>> >
>>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-05 13:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-25 8:50 [PATCH] arm64: dts: marvell: espressobin: De-duplicate eMMC definitions Pali Rohár
2020-09-27 6:40 ` Andre Heider
2020-10-02 12:13 ` Pali Rohár
2020-10-05 13:14 ` Gregory CLEMENT
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.