* [PATCH v3 1/4] dt-bindings: mmc: xenon: add AP807 compatible string
2021-01-12 9:46 [PATCH v3 0/4] update xenon controller properties in CN913X kostap
@ 2021-01-12 9:46 ` kostap
2021-01-12 9:46 ` [PATCH v3 2/4] " kostap
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: kostap @ 2021-01-12 9:46 UTC (permalink / raw)
To: linux-mmc
Cc: ulf.hansson, robh+dt, andrew, gregory.clement,
sebastian.hesselbarth, adrian.hunter, devicetree,
linux-arm-kernel, mw, jaz, nadavh, bpeled, stefanc,
Konstantin Porotchkin
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>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 2/4] mmc: xenon: add AP807 compatible string
2021-01-12 9:46 [PATCH v3 0/4] update xenon controller properties in CN913X kostap
2021-01-12 9:46 ` [PATCH v3 1/4] dt-bindings: mmc: xenon: add AP807 compatible string kostap
@ 2021-01-12 9:46 ` kostap
2021-01-12 9:46 ` [PATCH v3 3/4] arm64: dts: change AP807 SDHCI compatibility string kostap
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: kostap @ 2021-01-12 9:46 UTC (permalink / raw)
To: linux-mmc
Cc: ulf.hansson, robh+dt, andrew, gregory.clement,
sebastian.hesselbarth, adrian.hunter, devicetree,
linux-arm-kernel, mw, jaz, nadavh, bpeled, stefanc,
Konstantin Porotchkin
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>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
---
drivers/mmc/host/sdhci-xenon.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index d19eef5f725f..666cee4c7f7c 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -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},
{}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 3/4] arm64: dts: change AP807 SDHCI compatibility string
2021-01-12 9:46 [PATCH v3 0/4] update xenon controller properties in CN913X kostap
2021-01-12 9:46 ` [PATCH v3 1/4] dt-bindings: mmc: xenon: add AP807 compatible string kostap
2021-01-12 9:46 ` [PATCH v3 2/4] " kostap
@ 2021-01-12 9:46 ` kostap
2021-01-12 9:46 ` [PATCH v3 4/4] arm64: dts: cn913x-db: enable MMC HS400 kostap
2021-01-13 11:25 ` [PATCH v3 0/4] update xenon controller properties in CN913X Ulf Hansson
4 siblings, 0 replies; 6+ messages in thread
From: kostap @ 2021-01-12 9:46 UTC (permalink / raw)
To: linux-mmc
Cc: ulf.hansson, robh+dt, andrew, gregory.clement,
sebastian.hesselbarth, adrian.hunter, devicetree,
linux-arm-kernel, mw, jaz, nadavh, bpeled, stefanc,
Konstantin Porotchkin
From: Konstantin Porotchkin <kostap@marvell.com>
This patch adds new compatible string to AP807 DTSI to avoid
its SDHCI controller to run in "slow mode" with disabled UHS.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
---
arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 5 +++++
1 file 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..d9bbbfa4b4eb 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
@@ -27,3 +27,8 @@
#clock-cells = <1>;
};
};
+
+&ap_sdhci0 {
+ compatible = "marvell,armada-ap807-sdhci";
+};
+
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 4/4] arm64: dts: cn913x-db: enable MMC HS400
2021-01-12 9:46 [PATCH v3 0/4] update xenon controller properties in CN913X kostap
` (2 preceding siblings ...)
2021-01-12 9:46 ` [PATCH v3 3/4] arm64: dts: change AP807 SDHCI compatibility string kostap
@ 2021-01-12 9:46 ` kostap
2021-01-13 11:25 ` [PATCH v3 0/4] update xenon controller properties in CN913X Ulf Hansson
4 siblings, 0 replies; 6+ messages in thread
From: kostap @ 2021-01-12 9:46 UTC (permalink / raw)
To: linux-mmc
Cc: ulf.hansson, robh+dt, andrew, gregory.clement,
sebastian.hesselbarth, adrian.hunter, devicetree,
linux-arm-kernel, mw, jaz, nadavh, bpeled, stefanc,
Konstantin Porotchkin
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>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 0/4] update xenon controller properties in CN913X
2021-01-12 9:46 [PATCH v3 0/4] update xenon controller properties in CN913X kostap
` (3 preceding siblings ...)
2021-01-12 9:46 ` [PATCH v3 4/4] arm64: dts: cn913x-db: enable MMC HS400 kostap
@ 2021-01-13 11:25 ` Ulf Hansson
4 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2021-01-13 11:25 UTC (permalink / raw)
To: Kostya Porotchkin
Cc: linux-mmc, Rob Herring, Andrew Lunn, Gregory Clement,
Sebastian Hesselbarth, Adrian Hunter, DTML, Linux ARM,
Marcin Wojtas, jaz, Nadav Haklai, bpeled, stefanc
On Tue, 12 Jan 2021 at 10:47, <kostap@marvell.com> wrote:
>
> 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
>
> - 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(+)
>
> --
> 2.17.1
>
Patch1 and patch 2 applied for next (I leave the other for arm soc), thanks!
Kind regards
Uffe
^ permalink raw reply [flat|nested] 6+ messages in thread