update xenon controller properties in CN913X family
Subsystems (5)
v2 cover update 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.
- 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(+)
Signature · 1 line
2.17.1
PATCH v2 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
@@ -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
PATCH v2 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
@@ -27,3 +27,7 @@ #clock-cells = <1>; }; }; + +&ap_sdhci0 { + compatible = "marvell,armada-ap807-sdhci"; +};
drivers/mmc/host/sdhci-xenon.c +1 -0
@@ -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 }, {}
Signature · 1 line
2.17.1
Re: [PATCH v2 2/3] mmc: xenon: add AP807 compatible string
Quoted 9 lines · On 16/12/20 9:45 am, [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.
Signed-off-by Marcin Wojtas <[email protected]>
Quoted 30 lines
--- 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@@ -27,3 +27,7 @@ #clock-cells = <1>; }; }; + +&ap_sdhci0 { + compatible = "marvell,armada-ap807-sdhci"; +};drivers/mmc/host/sdhci-xenon.c +1
-0@@ -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
In reply to [email protected]Quoted 9 lines · On Wed, 16 Dec 2020 at 08:46, <[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.
Quoted 4 lines
Signed-off-by Marcin Wojtas <[email protected]>--- 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
Quoted 29 lines
2 files changed, 5 insertions(+)arch/arm64/boot/dts/marvell/armada-ap807.dtsi +4
-0@@ -27,3 +27,7 @@ #clock-cells = <1>; }; }; + +&ap_sdhci0 { + compatible = "marvell,armada-ap807-sdhci"; +};drivers/mmc/host/sdhci-xenon.c +1
-1@@ -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
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
@@ -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
Re: [PATCH v2 3/3] arm64: dts: cn913x-db: enable MMC HS400
Hi,
śr., 16 gru 2020 o 08:46 <[email protected]> napisał(a):
Quoted 17 lines
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.
Signed-off-by Marcin Wojtas <[email protected]>--- arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 ++ 1 file changed, 2 insertions(+)arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-0
arch/arm64/boot/dts/marvell/cn9130-db.dts line 120
Quoted 8 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +2
-0@@ -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