[PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa

[PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa

[Yangbo Lu]

This patch is to add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa.
Because eSDHC is not a standard SD controller, the specific speed mode support
depends on board's peripheral circuit for eSDHC. So, we have to add these speed
modes support on board dts file.

In additon, these dts patches depends on esdhc driver patches which just had been merged
on mmc.git. Otherwise, the UHS-I SD card and eMMC HS200 card would fail to be initialized,
but other cards still could work fine.
https://patchwork.kernel.org/patch/9689875/
https://patchwork.kernel.org/patch/9689877/
https://patchwork.kernel.org/patch/9689879/
https://patchwork.kernel.org/patch/9689887/
https://patchwork.kernel.org/patch/9689885/

Yangbo Lu (3):
  arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB
  arm64: dts: ls208xa: support SD UHS-I on RDB and eMMC HS200 on QDS
  arm64: dts: ls1012a: add eSDHC nodes

 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts  |  8 +++++++
 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts  | 13 +++++++++++
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     | 25 ++++++++++++++++++++++
 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts  |  8 +++++++
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |  4 ++--
 arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi |  1 +
 arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi |  4 ++++
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |  2 +-
 8 files changed, 62 insertions(+), 3 deletions(-)

-- 
2.1.0.27.g96db324

[PATCH 1/3] arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB

[Yangbo Lu]

This patch is to enable SD UHS-I mode and eMMC HS200 mode on
LS1046ARDB in dts. Also, the eSDHC peripheral clock must be used
instead of platform clock to support these modes.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 8 ++++++++
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi    | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
index d1ccc00..08528c2 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
@@ -64,6 +64,14 @@
 	};
 };
 
+&esdhc {
+	mmc-hs200-1_8v;
+	sd-uhs-sdr104;
+	sd-uhs-sdr50;
+	sd-uhs-sdr25;
+	sd-uhs-sdr12;
+};
+
 &duart0 {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index f4b8b7e..f06f329 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -209,10 +209,10 @@
 		};
 
 		esdhc: esdhc at 1560000 {
-			compatible = "fsl,esdhc";
+			compatible = "fsl,ls1046a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x1560000 0x0 0x10000>;
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
-			clock-frequency = <0>;
+			clocks = <&clockgen 2 1>;
 			voltage-ranges = <1800 1800 3300 3300>;
 			sdhci,auto-cmd12;
 			big-endian;
-- 
2.1.0.27.g96db324

[PATCH 2/3] arm64: dts: ls208xa: support SD UHS-I on RDB and eMMC HS200 on QDS

[Yangbo Lu]

This patch is to enable SD UHS-I mode on LS208xRDB and eMMC HS200
mode on LS208xQDS in dts. Also, the eSDHC peripheral clock must be
used instead of platform clock to support these modes.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 1 +
 arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 4 ++++
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
index 8b62048..fc8b787 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
@@ -45,6 +45,7 @@
  */
 
 &esdhc {
+	mmc-hs200-1_8v;
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
index 3737587..45b45d3 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
@@ -45,6 +45,10 @@
  */
 
 &esdhc {
+	sd-uhs-sdr104;
+	sd-uhs-sdr50;
+	sd-uhs-sdr25;
+	sd-uhs-sdr12;
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index abb2fff..92f7c55 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -471,7 +471,7 @@
 			compatible = "fsl,ls2080a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x2140000 0x0 0x10000>;
 			interrupts = <0 28 0x4>; /* Level high type */
-			clock-frequency = <0>;	/* Updated by bootloader */
+			clocks = <&clockgen 4 1>;
 			voltage-ranges = <1800 1800 3300 3300>;
 			sdhci,auto-cmd12;
 			little-endian;
-- 
2.1.0.27.g96db324

[PATCH 3/3] arm64: dts: ls1012a: add eSDHC nodes

[Yangbo Lu]

There are two eSDHC controllers in LS1012A. This patch is to add
eSDHC nodes for ls1012a dts. Also enable eSDHC for RDB/QDS boards.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts |  8 ++++++++
 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 13 ++++++++++++
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi    | 25 +++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
index e2a93d5..a21a587 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
@@ -130,3 +130,11 @@
 &sata {
 	status = "okay";
 };
+
+&esdhc0 {
+	status = "okay";
+};
+
+&esdhc1 {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
index ed77f6b..57669b0 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
@@ -61,3 +61,16 @@
 &sata {
 	status = "okay";
 };
+
+&esdhc0 {
+	sd-uhs-sdr104;
+	sd-uhs-sdr50;
+	sd-uhs-sdr25;
+	sd-uhs-sdr12;
+	status = "okay";
+};
+
+&esdhc1 {
+	mmc-hs200-1_8v;
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index b497ac1..e3a1943 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -302,6 +302,31 @@
 			};
 		};
 
+		esdhc0: esdhc at 1560000 {
+			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
+			reg = <0x0 0x1560000 0x0 0x10000>;
+			interrupts = <0 62 0x4>;
+			clocks = <&clockgen 4 0>;
+			voltage-ranges = <1800 1800 3300 3300>;
+			sdhci,auto-cmd12;
+			big-endian;
+			bus-width = <4>;
+			status = "disabled";
+		};
+
+		esdhc1: esdhc at 1580000 {
+			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
+			reg = <0x0 0x1580000 0x0 0x10000>;
+			interrupts = <0 65 0x4>;
+			clocks = <&clockgen 4 0>;
+			voltage-ranges = <1800 1800 3300 3300>;
+			sdhci,auto-cmd12;
+			big-endian;
+			broken-cd;
+			bus-width = <4>;
+			status = "disabled";
+		};
+
 		i2c0: i2c at 2180000 {
 			compatible = "fsl,vf610-i2c";
 			#address-cells = <1>;
-- 
2.1.0.27.g96db324

[PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa

[Ulf Hansson]

On 21 April 2017 at 05:52, Yangbo Lu <yangbo.lu@nxp.com> wrote:
> This patch is to add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa.
> Because eSDHC is not a standard SD controller, the specific speed mode support
> depends on board's peripheral circuit for eSDHC. So, we have to add these speed
> modes support on board dts file.
>
> In additon, these dts patches depends on esdhc driver patches which just had been merged
> on mmc.git. Otherwise, the UHS-I SD card and eMMC HS200 card would fail to be initialized,
> but other cards still could work fine.
> https://patchwork.kernel.org/patch/9689875/
> https://patchwork.kernel.org/patch/9689877/
> https://patchwork.kernel.org/patch/9689879/
> https://patchwork.kernel.org/patch/9689887/
> https://patchwork.kernel.org/patch/9689885/
>
> Yangbo Lu (3):
>   arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB
>   arm64: dts: ls208xa: support SD UHS-I on RDB and eMMC HS200 on QDS
>   arm64: dts: ls1012a: add eSDHC nodes
>
>  arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts  |  8 +++++++
>  arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts  | 13 +++++++++++
>  arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     | 25 ++++++++++++++++++++++
>  arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts  |  8 +++++++
>  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |  4 ++--
>  arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi |  1 +
>  arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi |  4 ++++
>  arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |  2 +-
>  8 files changed, 62 insertions(+), 3 deletions(-)
>
> --
> 2.1.0.27.g96db324
>

By curiosity I tried applying these to my mmc tree, but they don't
apply. So I can pick them, even with acks.
Also it's too difficult for me to host an immutable branch with the
relevant sdhci-esdc changes, because of additional sdhci dependencies.

Perhaps just easier to pick this for 4.13 or 4.12 rc2.

Kind regards
Uffe

[PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa

[Y.B. Lu]

> -----Original Message-----
> From: Ulf Hansson [mailto:ulf.hansson at linaro.org]
> Sent: Tuesday, April 25, 2017 4:17 AM
> To: Y.B. Lu
> Cc: linux-arm-kernel at lists.infradead.org; Shawn Guo; Catalin Marinas;
> Xiaobo Xie
> Subject: Re: [PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for
> ls1012a/ls1046a/ls208xa
> 
> On 21 April 2017 at 05:52, Yangbo Lu <yangbo.lu@nxp.com> wrote:
> > This patch is to add eSDHC UHS-I/HS200 mode support for
> ls1012a/ls1046a/ls208xa.
> > Because eSDHC is not a standard SD controller, the specific speed mode
> > support depends on board's peripheral circuit for eSDHC. So, we have
> > to add these speed modes support on board dts file.
> >
> > In additon, these dts patches depends on esdhc driver patches which
> > just had been merged on mmc.git. Otherwise, the UHS-I SD card and eMMC
> > HS200 card would fail to be initialized, but other cards still could
> work fine.
> > https://patchwork.kernel.org/patch/9689875/
> > https://patchwork.kernel.org/patch/9689877/
> > https://patchwork.kernel.org/patch/9689879/
> > https://patchwork.kernel.org/patch/9689887/
> > https://patchwork.kernel.org/patch/9689885/
> >
> > Yangbo Lu (3):
> >   arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB
> >   arm64: dts: ls208xa: support SD UHS-I on RDB and eMMC HS200 on QDS
> >   arm64: dts: ls1012a: add eSDHC nodes
> >
> >  arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts  |  8 +++++++
> > arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts  | 13 +++++++++++
> >  arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     | 25
> ++++++++++++++++++++++
> >  arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts  |  8 +++++++
> >  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |  4 ++--
> >  arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi |  1 +
> > arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi |  4 ++++
> >  arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |  2 +-
> >  8 files changed, 62 insertions(+), 3 deletions(-)
> >
> > --
> > 2.1.0.27.g96db324
> >
> 
> By curiosity I tried applying these to my mmc tree, but they don't apply.
> So I can pick them, even with acks.
> Also it's too difficult for me to host an immutable branch with the
> relevant sdhci-esdc changes, because of additional sdhci dependencies.
> 
> Perhaps just easier to pick this for 4.13 or 4.12 rc2.

[Lu Yangbo-B47093] Hi Uffe, I agree.
These patches are based on Shawn's tree which has the latest layerscape board dts.
Actually I'm not sure which git tree I should send these patches to according to MAINTAINERS, but I saw Shawn had merged some layerscape board dts before.

Hi Shawn,
Am I right to send these patches to you for reviewing? Which git tree do you recommend I should send these patches to?

Thanks.

> 
> Kind regards
> Uffe

[PATCH 1/3] arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB

[Shawn Guo]

On Fri, Apr 21, 2017 at 11:52:34AM +0800, Yangbo Lu wrote:
> This patch is to enable SD UHS-I mode and eMMC HS200 mode on
> LS1046ARDB in dts. Also, the eSDHC peripheral clock must be used
> instead of platform clock to support these modes.
> 
> Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
> ---
>  arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 8 ++++++++
>  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi    | 4 ++--
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> index d1ccc00..08528c2 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> @@ -64,6 +64,14 @@
>  	};
>  };
>  
> +&esdhc {
> +	mmc-hs200-1_8v;
> +	sd-uhs-sdr104;
> +	sd-uhs-sdr50;
> +	sd-uhs-sdr25;
> +	sd-uhs-sdr12;
> +};
> +

Please sort the node alphabetically.

>  &duart0 {
>  	status = "okay";
>  };
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> index f4b8b7e..f06f329 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> @@ -209,10 +209,10 @@
>  		};
>  
>  		esdhc: esdhc at 1560000 {
> -			compatible = "fsl,esdhc";
> +			compatible = "fsl,ls1046a-esdhc", "fsl,esdhc";

I do not see "fsl,ls1046a-esdhc" is a documented compatible.

Shawn

>  			reg = <0x0 0x1560000 0x0 0x10000>;
>  			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
> -			clock-frequency = <0>;
> +			clocks = <&clockgen 2 1>;
>  			voltage-ranges = <1800 1800 3300 3300>;
>  			sdhci,auto-cmd12;
>  			big-endian;
> -- 
> 2.1.0.27.g96db324
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 3/3] arm64: dts: ls1012a: add eSDHC nodes

[Shawn Guo]

On Fri, Apr 21, 2017 at 11:52:36AM +0800, Yangbo Lu wrote:
> There are two eSDHC controllers in LS1012A. This patch is to add
> eSDHC nodes for ls1012a dts. Also enable eSDHC for RDB/QDS boards.
> 
> Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
> ---
>  arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts |  8 ++++++++
>  arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 13 ++++++++++++
>  arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi    | 25 +++++++++++++++++++++++
>  3 files changed, 46 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
> index e2a93d5..a21a587 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
> @@ -130,3 +130,11 @@
>  &sata {
>  	status = "okay";
>  };
> +
> +&esdhc0 {
> +	status = "okay";
> +};
> +
> +&esdhc1 {
> +	status = "okay";
> +};

Sort these labeled nodes alphabetically.

> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
> index ed77f6b..57669b0 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
> @@ -61,3 +61,16 @@
>  &sata {
>  	status = "okay";
>  };
> +
> +&esdhc0 {
> +	sd-uhs-sdr104;
> +	sd-uhs-sdr50;
> +	sd-uhs-sdr25;
> +	sd-uhs-sdr12;
> +	status = "okay";
> +};
> +
> +&esdhc1 {
> +	mmc-hs200-1_8v;
> +	status = "okay";
> +};

Ditto

> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> index b497ac1..e3a1943 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> @@ -302,6 +302,31 @@
>  			};
>  		};
>  
> +		esdhc0: esdhc at 1560000 {

Sort the nodes in order of unit-address.

> +			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";

Please document the compatible.

Shawn

> +			reg = <0x0 0x1560000 0x0 0x10000>;
> +			interrupts = <0 62 0x4>;
> +			clocks = <&clockgen 4 0>;
> +			voltage-ranges = <1800 1800 3300 3300>;
> +			sdhci,auto-cmd12;
> +			big-endian;
> +			bus-width = <4>;
> +			status = "disabled";
> +		};
> +
> +		esdhc1: esdhc at 1580000 {
> +			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
> +			reg = <0x0 0x1580000 0x0 0x10000>;
> +			interrupts = <0 65 0x4>;
> +			clocks = <&clockgen 4 0>;
> +			voltage-ranges = <1800 1800 3300 3300>;
> +			sdhci,auto-cmd12;
> +			big-endian;
> +			broken-cd;
> +			bus-width = <4>;
> +			status = "disabled";
> +		};
> +
>  		i2c0: i2c at 2180000 {
>  			compatible = "fsl,vf610-i2c";
>  			#address-cells = <1>;
> -- 
> 2.1.0.27.g96db324
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa

[Shawn Guo]

On Fri, Apr 21, 2017 at 11:52:33AM +0800, Yangbo Lu wrote:
> This patch is to add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa.
> Because eSDHC is not a standard SD controller, the specific speed mode support
> depends on board's peripheral circuit for eSDHC. So, we have to add these speed
> modes support on board dts file.
> 
> In additon, these dts patches depends on esdhc driver patches which just had been merged
> on mmc.git. Otherwise, the UHS-I SD card and eMMC HS200 card would fail to be initialized,
> but other cards still could work fine.

So it sounds like just a new feature development which doesn't cause any
regression, even if driver and dts changes are merged independently.
For such case, we can just merge patches in their natural path
separately.

Shawn

[PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa

[Shawn Guo]

On Tue, Apr 25, 2017 at 09:01:28AM +0000, Y.B. Lu wrote:
> > By curiosity I tried applying these to my mmc tree, but they don't apply.
> > So I can pick them, even with acks.
> > Also it's too difficult for me to host an immutable branch with the
> > relevant sdhci-esdc changes, because of additional sdhci dependencies.
> > 
> > Perhaps just easier to pick this for 4.13 or 4.12 rc2.
> 
> [Lu Yangbo-B47093] Hi Uffe, I agree.
> These patches are based on Shawn's tree which has the latest layerscape board dts.
> Actually I'm not sure which git tree I should send these patches to according to MAINTAINERS, but I saw Shawn had merged some layerscape board dts before.
> 
> Hi Shawn,
> Am I right to send these patches to you for reviewing? Which git tree do you recommend I should send these patches to?

Yes, currently arm64 freescale dts patches flows to mainline as below.

  my imx/dt64 branch --> arm-soc tree --> mainline

Shawn

[PATCH 1/3] arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB

[Y.B. Lu]

Hi Shawn,

> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo at kernel.org]
> Sent: Wednesday, May 03, 2017 8:57 PM
> To: Y.B. Lu
> Cc: linux-arm-kernel at lists.infradead.org; ulf.hansson at linaro.org; Catalin
> Marinas; Xiaobo Xie
> Subject: Re: [PATCH 1/3] arm64: dts: ls1046a: support SD UHS-I and eMMC
> HS200 on RDB
> 
> On Fri, Apr 21, 2017 at 11:52:34AM +0800, Yangbo Lu wrote:
> > This patch is to enable SD UHS-I mode and eMMC HS200 mode on
> > LS1046ARDB in dts. Also, the eSDHC peripheral clock must be used
> > instead of platform clock to support these modes.
> >
> > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
> > ---
> >  arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 8 ++++++++
> >  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi    | 4 ++--
> >  2 files changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> > b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> > index d1ccc00..08528c2 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> > @@ -64,6 +64,14 @@
> >  	};
> >  };
> >
> > +&esdhc {
> > +	mmc-hs200-1_8v;
> > +	sd-uhs-sdr104;
> > +	sd-uhs-sdr50;
> > +	sd-uhs-sdr25;
> > +	sd-uhs-sdr12;
> > +};
> > +
> 
> Please sort the node alphabetically.

[Lu Yangbo-B47093] Ok, I will do that.

> 
> >  &duart0 {
> >  	status = "okay";
> >  };
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > index f4b8b7e..f06f329 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > @@ -209,10 +209,10 @@
> >  		};
> >
> >  		esdhc: esdhc at 1560000 {
> > -			compatible = "fsl,esdhc";
> > +			compatible = "fsl,ls1046a-esdhc", "fsl,esdhc";
> 
> I do not see "fsl,ls1046a-esdhc" is a documented compatible.
> 

[Lu Yangbo-B47093] Ok, I will add a doc patch.

> Shawn
> 
> >  			reg = <0x0 0x1560000 0x0 0x10000>;
> >  			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
> > -			clock-frequency = <0>;
> > +			clocks = <&clockgen 2 1>;
> >  			voltage-ranges = <1800 1800 3300 3300>;
> >  			sdhci,auto-cmd12;
> >  			big-endian;
> > --
> > 2.1.0.27.g96db324
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 3/3] arm64: dts: ls1012a: add eSDHC nodes

[Y.B. Lu]

Hi Shawn,

> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo at kernel.org]
> Sent: Wednesday, May 03, 2017 9:06 PM
> To: Y.B. Lu
> Cc: linux-arm-kernel at lists.infradead.org; ulf.hansson at linaro.org; Catalin
> Marinas; Xiaobo Xie
> Subject: Re: [PATCH 3/3] arm64: dts: ls1012a: add eSDHC nodes
> 
> On Fri, Apr 21, 2017 at 11:52:36AM +0800, Yangbo Lu wrote:
> > There are two eSDHC controllers in LS1012A. This patch is to add eSDHC
> > nodes for ls1012a dts. Also enable eSDHC for RDB/QDS boards.
> >
> > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
> > ---
> >  arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts |  8 ++++++++
> > arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 13 ++++++++++++
> >  arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi    | 25
> +++++++++++++++++++++++
> >  3 files changed, 46 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
> > b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
> > index e2a93d5..a21a587 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
> > @@ -130,3 +130,11 @@
> >  &sata {
> >  	status = "okay";
> >  };
> > +
> > +&esdhc0 {
> > +	status = "okay";
> > +};
> > +
> > +&esdhc1 {
> > +	status = "okay";
> > +};
> 
> Sort these labeled nodes alphabetically.

[Lu Yangbo-B47093] Ok, I will do that.

> 
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
> > b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
> > index ed77f6b..57669b0 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
> > @@ -61,3 +61,16 @@
> >  &sata {
> >  	status = "okay";
> >  };
> > +
> > +&esdhc0 {
> > +	sd-uhs-sdr104;
> > +	sd-uhs-sdr50;
> > +	sd-uhs-sdr25;
> > +	sd-uhs-sdr12;
> > +	status = "okay";
> > +};
> > +
> > +&esdhc1 {
> > +	mmc-hs200-1_8v;
> > +	status = "okay";
> > +};
> 
> Ditto
> 

[Lu Yangbo-B47093] No problem.

> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > index b497ac1..e3a1943 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > @@ -302,6 +302,31 @@
> >  			};
> >  		};
> >
> > +		esdhc0: esdhc at 1560000 {
> 
> Sort the nodes in order of unit-address.

[Lu Yangbo-B47093] Ok, I will do that.

> 
> > +			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
> 
> Please document the compatible.
> 

[Lu Yangbo-B47093] Ok, will add a patch for that

> Shawn
> 
> > +			reg = <0x0 0x1560000 0x0 0x10000>;
> > +			interrupts = <0 62 0x4>;
> > +			clocks = <&clockgen 4 0>;
> > +			voltage-ranges = <1800 1800 3300 3300>;
> > +			sdhci,auto-cmd12;
> > +			big-endian;
> > +			bus-width = <4>;
> > +			status = "disabled";
> > +		};
> > +
> > +		esdhc1: esdhc at 1580000 {
> > +			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
> > +			reg = <0x0 0x1580000 0x0 0x10000>;
> > +			interrupts = <0 65 0x4>;
> > +			clocks = <&clockgen 4 0>;
> > +			voltage-ranges = <1800 1800 3300 3300>;
> > +			sdhci,auto-cmd12;
> > +			big-endian;
> > +			broken-cd;
> > +			bus-width = <4>;
> > +			status = "disabled";
> > +		};
> > +
> >  		i2c0: i2c at 2180000 {
> >  			compatible = "fsl,vf610-i2c";
> >  			#address-cells = <1>;
> > --
> > 2.1.0.27.g96db324
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for ls1012a/ls1046a/ls208xa

[Y.B. Lu]

Hi Shawn,

> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo at kernel.org]
> Sent: Wednesday, May 03, 2017 9:14 PM
> To: Y.B. Lu
> Cc: linux-arm-kernel at lists.infradead.org; ulf.hansson at linaro.org; Catalin
> Marinas; Xiaobo Xie
> Subject: Re: [PATCH 0/3] Add eSDHC UHS-I/HS200 mode support for
> ls1012a/ls1046a/ls208xa
> 
> On Fri, Apr 21, 2017 at 11:52:33AM +0800, Yangbo Lu wrote:
> > This patch is to add eSDHC UHS-I/HS200 mode support for
> ls1012a/ls1046a/ls208xa.
> > Because eSDHC is not a standard SD controller, the specific speed mode
> > support depends on board's peripheral circuit for eSDHC. So, we have
> > to add these speed modes support on board dts file.
> >
> > In additon, these dts patches depends on esdhc driver patches which
> > just had been merged on mmc.git. Otherwise, the UHS-I SD card and eMMC
> > HS200 card would fail to be initialized, but other cards still could
> work fine.
> 
> So it sounds like just a new feature development which doesn't cause any
> regression, even if driver and dts changes are merged independently.
> For such case, we can just merge patches in their natural path separately.
> 

[Lu Yangbo-B47093] The dts patches affect cards which support uhs-i/hs200 modes.
Without driver patches, these card couldn't work. But they work on high speed mode on your current kernel.

Other legacy high speed cards always work fine.
I think it's ok to apply them now(affect uhs-i/hs200 cards, but legacy high speed cards work), or wait for driver patches pulled.

Thanks :)

> Shawn