Skip to contentSkip to conversation

uodate xenon controller properties in CN913X family

PATCH Superseded [email protected] 2 participants 6 messages Dec 15, 2020

Subsystems (5)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover uodate xenon controller properties in CN913X family

From: Konstantin Porotchkin <[email protected]>

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

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(+)
Signature · 1 line
2.17.1
#1 lore raw

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

From: Marcin Wojtas <[email protected]>

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

---
 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt +1 -0
index ed1456f5c94d..c51a62d751dc 100644
@@ -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:
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/3 mmc: xenon: add AP807 compatible string

In reply to [email protected]

From: Marcin Wojtas <[email protected]>

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.

---
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++
 drivers/mmc/host/sdhci-xenon.c                | 1 +
 2 files changed, 5 insertions(+)
arch/arm64/boot/dts/marvell/armada-ap807.dtsi +4 -0
index 623010f3ca89..e9a740ec22cb 100644
@@ -27,3 +27,7 @@
 		#clock-cells = <1>;
 	};
 };
+
+&ap_sdhci0 {
+	compatible = "marvell,armada-ap807-sdhci";
+};
drivers/mmc/host/sdhci-xenon.c +1 -0
index 24c978de2a3f..29f6bede9b96 100644
@@ -668,6 +668,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",},
+	{ .compatible = "marvell,armada-ap807-sdhci",},
 	{ .compatible = "marvell,armada-cp110-sdhci",},
 	{ .compatible = "marvell,armada-3700-sdhci",},
 	{}
Signature · 1 line
2.17.1
maintainer
#3 lore raw

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

Quoted 31 lines · On 15/12/20 5:56 pm, [email protected] wrote:

From: Marcin Wojtas <[email protected]>

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.

---
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++
 drivers/mmc/host/sdhci-xenon.c                | 1 +
 2 files changed, 5 insertions(+)
arch/arm64/boot/dts/marvell/armada-ap807.dtsi +4 -0
index 623010f3ca89..e9a740ec22cb 100644
@@ -27,3 +27,7 @@
 		#clock-cells = <1>;
 	};
 };
+
+&ap_sdhci0 {
+	compatible = "marvell,armada-ap807-sdhci";
+};
drivers/mmc/host/sdhci-xenon.c +0 -0
index 24c978de2a3f..29f6bede9b96 100644

drivers/mmc/host/sdhci-xenon.c static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = { · line 671

Quoted 4 lines
drivers/mmc/host/sdhci-xenon.c +1 -0
@@ -668,6 +668,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",},
+	{ .compatible = "marvell,armada-ap807-sdhci",},

Didn't you add match data here? Then it needs a re-base on Ulf's 'next' branch.

Quoted 4 lines
drivers/mmc/host/sdhci-xenon.c +0 -0
 	{ .compatible = "marvell,armada-cp110-sdhci",},
 	{ .compatible = "marvell,armada-3700-sdhci",},
 	{}
#4 lore raw

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

Quoted 49 lines

-----Original Message-----
From: Adrian Hunter <[email protected]>
Sent: Tuesday, December 15, 2020 19:16
To: Kostya Porotchkin <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [EXT] Re: [PATCH 2/3] mmc: xenon: add AP807 compatible string

External Email

----------------------------------------------------------------------

Quoted 34 lines · On 15/12/20 5:56 pm, [email protected] wrote:

From: Marcin Wojtas <[email protected]>

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.

---
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++
 drivers/mmc/host/sdhci-xenon.c                | 1 +
 2 files changed, 5 insertions(+)
arch/arm64/boot/dts/marvell/armada-ap807.dtsi +3 -0
index 623010f3ca89..e9a740ec22cb 100644
@@ -27,3 +27,7 @@
 		#clock-cells = <1>;
 	};
 };
+
+&ap_sdhci0 {
+	compatible = "marvell,armada-ap807-sdhci"; };
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-xenon.c index 24c978de2a3f..29f6bede9b96 100644

drivers/mmc/host/sdhci-xenon.c +0 -0
@@ -668,6 +668,7 @@ static const struct dev_pm_ops
 sdhci_xenon_dev_pm_ops = {
 
Quoted 6 lines

drivers/mmc/host/sdhci-xenon.c static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = { · line 671

Quoted 3 lines
drivers/mmc/host/sdhci-xenon.c +1 -0
 static const struct of_device_id sdhci_xenon_dt_ids[] = {
 	{ .compatible = "marvell,armada-ap806-sdhci",},
+	{ .compatible = "marvell,armada-ap807-sdhci",},

Didn't you add match data here? Then it needs a re-base on Ulf's 'next' branch.

[KP] Thank you, I will rebase on top of kernel/git/ulfh/mmc.git then, and re-submit as v2

Quoted 5 lines
Quoted 5 lines
drivers/mmc/host/sdhci-xenon.c +0 -0
 	{ .compatible = "marvell,armada-cp110-sdhci",},
 	{ .compatible = "marvell,armada-3700-sdhci",},

{}

#5 lore raw

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

In reply to [email protected]

From: Marcin Wojtas <[email protected]>

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

---
 arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/marvell/cn9130-db.dts +2 -0
index d24294888400..741ae534b477 100644
@@ -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";
 };
Signature · 1 line
2.17.1