[PATCH v2 0/3] update xenon controller properties in CN913X family

[PATCH v2 0/3] update xenon controller properties in CN913X family

[kostap]

From: Konstantin Porotchkin <kostap@marvell.com>

The following patches series updates Xenon SDHCI controller properties
for usage with Marvell Armada CN913X SoC family.

- v2: rebase on top of "next" branch of linux/kernel/git/ulfh/mmc.git

Marcin Wojtas (3):
  dt-bindings: mmc: xenon: add AP807 compatible string
  mmc: xenon: add AP807 compatible string
  arm64: dts: cn913x-db: enable MMC HS400

 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt | 1 +
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi                 | 4 ++++
 arch/arm64/boot/dts/marvell/cn9130-db.dts                     | 2 ++
 drivers/mmc/host/sdhci-xenon.c                                | 1 +
 4 files changed, 8 insertions(+)

-- 
2.17.1

[PATCH v2 1/3] dt-bindings: mmc: xenon: add AP807 compatible string

[kostap]

From: Marcin Wojtas <mw@semihalf.com>

This patch adds DT binding description for the Xenon
SD/MMC controller included in AP807 north bridge.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
index ed1456f5c94d..c51a62d751dc 100644
--- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
@@ -12,6 +12,7 @@ Required Properties:
   - "marvell,armada-3700-sdhci": For controllers on Armada-3700 SoC.
   Must provide a second register area and marvell,pad-type.
   - "marvell,armada-ap806-sdhci": For controllers on Armada AP806.
+  - "marvell,armada-ap807-sdhci": For controllers on Armada AP807.
   - "marvell,armada-cp110-sdhci": For controllers on Armada CP110.
 
 - clocks:
-- 
2.17.1

[PATCH v2 2/3] mmc: xenon: add AP807 compatible string

[kostap]

From: Marcin Wojtas <mw@semihalf.com>

This patch adds new compatible string to differentiate
between the controllers versions included in the AP807
north bridge. Thanks to this change, the SoCs which use
AP807 will not run unintentionally in the 'slow mode'
with disabled UHS modes.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++
 drivers/mmc/host/sdhci-xenon.c                | 1 +
 2 files changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
index 623010f3ca89..e9a740ec22cb 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
@@ -27,3 +27,7 @@
 		#clock-cells = <1>;
 	};
 };
+
+&ap_sdhci0 {
+	compatible = "marvell,armada-ap807-sdhci";
+};
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index c67611fdaa8a..add1b4dcd5e5 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -684,6 +684,7 @@ static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = {
 
 static const struct of_device_id sdhci_xenon_dt_ids[] = {
 	{ .compatible = "marvell,armada-ap806-sdhci", .data = (void *)XENON_AP806},
+	{ .compatible = "marvell,armada-ap807-sdhci", .data = (void *)XENON_AP807},
 	{ .compatible = "marvell,armada-cp110-sdhci", .data =  (void *)XENON_CP110},
 	{ .compatible = "marvell,armada-3700-sdhci", .data =  (void *)XENON_A3700},
 	{}
-- 
2.17.1

Re: [PATCH v2 2/3] mmc: xenon: add AP807 compatible string

[Adrian Hunter]

On 16/12/20 9:45 am, kostap@marvell.com wrote:
> From: Marcin Wojtas <mw@semihalf.com>
> 
> This patch adds new compatible string to differentiate
> between the controllers versions included in the AP807
> north bridge. Thanks to this change, the SoCs which use
> AP807 will not run unintentionally in the 'slow mode'
> with disabled UHS modes.
> 
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++
>  drivers/mmc/host/sdhci-xenon.c                | 1 +
>  2 files changed, 5 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> index 623010f3ca89..e9a740ec22cb 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> @@ -27,3 +27,7 @@
>  		#clock-cells = <1>;
>  	};
>  };
> +
> +&ap_sdhci0 {
> +	compatible = "marvell,armada-ap807-sdhci";
> +};
> diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
> index c67611fdaa8a..add1b4dcd5e5 100644
> --- a/drivers/mmc/host/sdhci-xenon.c
> +++ b/drivers/mmc/host/sdhci-xenon.c
> @@ -684,6 +684,7 @@ static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = {
>  
>  static const struct of_device_id sdhci_xenon_dt_ids[] = {
>  	{ .compatible = "marvell,armada-ap806-sdhci", .data = (void *)XENON_AP806},
> +	{ .compatible = "marvell,armada-ap807-sdhci", .data = (void *)XENON_AP807},
>  	{ .compatible = "marvell,armada-cp110-sdhci", .data =  (void *)XENON_CP110},
>  	{ .compatible = "marvell,armada-3700-sdhci", .data =  (void *)XENON_A3700},
>  	{}
> 

Re: [PATCH v2 2/3] mmc: xenon: add AP807 compatible string

[Ulf Hansson]

On Wed, 16 Dec 2020 at 08:46, <kostap@marvell.com> wrote:
>
> From: Marcin Wojtas <mw@semihalf.com>
>
> This patch adds new compatible string to differentiate
> between the controllers versions included in the AP807
> north bridge. Thanks to this change, the SoCs which use
> AP807 will not run unintentionally in the 'slow mode'
> with disabled UHS modes.
>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++
>  drivers/mmc/host/sdhci-xenon.c                | 1 +

Please split this patch, one for arm64 (for SoC maintainers) and one
for mmc (which I will pick).

Kind regards
Uffe


>  2 files changed, 5 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> index 623010f3ca89..e9a740ec22cb 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> @@ -27,3 +27,7 @@
>                 #clock-cells = <1>;
>         };
>  };
> +
> +&ap_sdhci0 {
> +       compatible = "marvell,armada-ap807-sdhci";
> +};
> diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
> index c67611fdaa8a..add1b4dcd5e5 100644
> --- a/drivers/mmc/host/sdhci-xenon.c
> +++ b/drivers/mmc/host/sdhci-xenon.c
> @@ -684,6 +684,7 @@ static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = {
>
>  static const struct of_device_id sdhci_xenon_dt_ids[] = {
>         { .compatible = "marvell,armada-ap806-sdhci", .data = (void *)XENON_AP806},
> +       { .compatible = "marvell,armada-ap807-sdhci", .data = (void *)XENON_AP807},
>         { .compatible = "marvell,armada-cp110-sdhci", .data =  (void *)XENON_CP110},
>         { .compatible = "marvell,armada-3700-sdhci", .data =  (void *)XENON_A3700},
>         {}
> --
> 2.17.1
>

[PATCH v2 3/3] arm64: dts: cn913x-db: enable MMC HS400

[kostap]

From: Marcin Wojtas <mw@semihalf.com>

This patch adds necessary flags in the device tree
which enable HS400 mode on AP807 MMC controller
on the CN913x-DB board.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dts b/arch/arm64/boot/dts/marvell/cn9130-db.dts
index ce49a70d88a0..79020e6d2792 100644
--- a/arch/arm64/boot/dts/marvell/cn9130-db.dts
+++ b/arch/arm64/boot/dts/marvell/cn9130-db.dts
@@ -113,6 +113,8 @@
 &ap_sdhci0 {
 	pinctrl-names = "default";
 	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
 	vqmmc-supply = <&ap0_reg_sd_vccq>;
 	status = "okay";
 };
-- 
2.17.1

Re: [PATCH v2 3/3] arm64: dts: cn913x-db: enable MMC HS400

[Marcin Wojtas]

Hi,

śr., 16 gru 2020 o 08:46 <kostap@marvell.com> napisał(a):
>
> From: Marcin Wojtas <mw@semihalf.com>
>
> This patch adds necessary flags in the device tree
> which enable HS400 mode on AP807 MMC controller
> on the CN913x-DB board.
>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dts b/arch/arm64/boot/dts/marvell/cn9130-db.dts
> index ce49a70d88a0..79020e6d2792 100644
> --- a/arch/arm64/boot/dts/marvell/cn9130-db.dts
> +++ b/arch/arm64/boot/dts/marvell/cn9130-db.dts
> @@ -113,6 +113,8 @@
>  &ap_sdhci0 {
>         pinctrl-names = "default";
>         bus-width = <8>;
> +       mmc-ddr-1_8v;
> +       mmc-hs400-1_8v;
>         vqmmc-supply = <&ap0_reg_sd_vccq>;
>         status = "okay";
>  };

I can confirm all works fine on top of the mmc next branch:
[    3.591989] mmc0: new HS400 MMC card at address 0001

Best regards,
Marcin