Skip to contentSkip to conversation

update xenon controller properties in CN913X

PATCH In review [email protected] 3 participants 7 messages Jan 12, 2021 – Jan 29, 2021

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v3 cover update xenon controller properties in CN913X

From: Konstantin Porotchkin <[email protected]>

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

- v3:
* separate between driver and DTSI changes for new compatibility string
* add my signed-off-by entry to all patches

Konstantin Porotchkin (1):
arm64: dts: change AP807 SDHCI compatibility string

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

 .../devicetree/bindings/mmc/marvell,xenon-sdhci.txt          | 1 +
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi                | 5 +++++
 arch/arm64/boot/dts/marvell/cn9130-db.dts                    | 2 ++
 drivers/mmc/host/sdhci-xenon.c                               | 1 +
 4 files changed, 9 insertions(+)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/4 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 v3 2/4 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.

---
 drivers/mmc/host/sdhci-xenon.c | 1 +
 1 file changed, 1 insertion(+)
drivers/mmc/host/sdhci-xenon.c +1 -0
index d19eef5f725f..666cee4c7f7c 100644
@@ -689,6 +689,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},
 	{}
Signature · 1 line
2.17.1
#3 lore raw

PATCH v3 3/4 arm64: dts: change AP807 SDHCI compatibility string

In reply to [email protected]

From: Konstantin Porotchkin <[email protected]>

This patch adds new compatible string to AP807 DTSI to avoid its SDHCI controller to run in "slow mode" with disabled UHS.

---
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/marvell/armada-ap807.dtsi +5 -0
index 623010f3ca89..d9bbbfa4b4eb 100644
@@ -27,3 +27,8 @@
 		#clock-cells = <1>;
 	};
 };
+
+&ap_sdhci0 {
+	compatible = "marvell,armada-ap807-sdhci";
+};
+
Signature · 1 line
2.17.1
#4 lore raw

PATCH v3 4/4 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 ce49a70d88a0..79020e6d2792 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
#5 lore raw
In reply to [email protected]
Quoted 22 lines · On Tue, 12 Jan 2021 at 10:47, <[email protected]> wrote:

From: Konstantin Porotchkin <[email protected]>

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

- v3:
* separate between driver and DTSI changes for new compatibility string
* add my signed-off-by entry to all patches

Konstantin Porotchkin (1):
arm64: dts: change AP807 SDHCI compatibility string

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

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

--
2.17.1

Patch1 and patch 2 applied for next (I leave the other for arm soc), thanks!

Kind regards
Uffe

maintainer
#6 lore raw

Hi,

Quoted 29 lines · On Tue, 12 Jan 2021 at 10:47, <[email protected]> wrote:
Quoted 28 lines

From: Konstantin Porotchkin <[email protected]>

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

- v3:
* separate between driver and DTSI changes for new compatibility string
* add my signed-off-by entry to all patches

Konstantin Porotchkin (1):
arm64: dts: change AP807 SDHCI compatibility string

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

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

--
2.17.1

Patch1 and patch 2 applied for next (I leave the other for arm soc), thanks!

Patches 3 and 4 applied on mvebu/dt64

Thanks,

Gregory

Quoted 3 lines

Kind regards
Uffe

Signature · 8 lines
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel