* [PATCH v2 0/2] arm64: dts: ac5: add mmc @ 2024-01-03 17:28 Elad Nachman 2024-01-03 17:28 ` [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 Elad Nachman 2024-01-03 17:28 ` [PATCH v2 2/2] arm64: dts: ac5: add mmc node and clock Elad Nachman 0 siblings, 2 replies; 6+ messages in thread From: Elad Nachman @ 2024-01-03 17:28 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, conor+dt, andrew, gregory.clement, sebastian.hesselbarth, huziji, ulf.hansson, linux-mmc, devicetree, linux-kernel, linux-arm-kernel Cc: enachman From: Elad Nachman <enachman@marvell.com> This patch series adds device tree support for the Marvell AC5/X/IM series of SOCs. This is required due to bus limitation of 31-bit in this SOC family plus the fact that the DDR memory starts at address 0x2_0000_0000 . Elad Nachman (2): dt-bindings: mmc: add Marvell ac5 arm64: dts: ac5: add mmc node and clock .../bindings/mmc/marvell,xenon-sdhci.yaml | 4 ++- arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 31 ++++++++++++++++++- .../boot/dts/marvell/ac5-98dx35xx-rd.dts | 4 +++ 3 files changed, 37 insertions(+), 2 deletions(-) -- 2.25.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 2024-01-03 17:28 [PATCH v2 0/2] arm64: dts: ac5: add mmc Elad Nachman @ 2024-01-03 17:28 ` Elad Nachman 2024-01-04 7:37 ` Krzysztof Kozlowski 2024-01-05 10:18 ` Ulf Hansson 2024-01-03 17:28 ` [PATCH v2 2/2] arm64: dts: ac5: add mmc node and clock Elad Nachman 1 sibling, 2 replies; 6+ messages in thread From: Elad Nachman @ 2024-01-03 17:28 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, conor+dt, andrew, gregory.clement, sebastian.hesselbarth, huziji, ulf.hansson, linux-mmc, devicetree, linux-kernel, linux-arm-kernel Cc: enachman From: Elad Nachman <enachman@marvell.com> Add dt bindings for Marvell AC5/X/IM eMMC controller. This compatibility string covers the differences in the AC5/X version of the driver: 31-bit bus limitation and DDR memory starting at address 0x2_0000_0000, which are handled by usage of a bounce buffer plus a different DMA mask. Signed-off-by: Elad Nachman <enachman@marvell.com> --- .../devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml index 3a8e74894ae0..cfe6237716f4 100644 --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml @@ -27,7 +27,9 @@ properties: - marvell,armada-ap806-sdhci - items: - - const: marvell,armada-ap807-sdhci + - enum: + - marvell,armada-ap807-sdhci + - marvell,ac5-sdhci - const: marvell,armada-ap806-sdhci - items: -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 2024-01-03 17:28 ` [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 Elad Nachman @ 2024-01-04 7:37 ` Krzysztof Kozlowski 2024-01-05 10:18 ` Ulf Hansson 1 sibling, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2024-01-04 7:37 UTC (permalink / raw) To: Elad Nachman, robh+dt, krzysztof.kozlowski+dt, conor+dt, andrew, gregory.clement, sebastian.hesselbarth, huziji, ulf.hansson, linux-mmc, devicetree, linux-kernel, linux-arm-kernel On 03/01/2024 18:28, Elad Nachman wrote: > From: Elad Nachman <enachman@marvell.com> > > Add dt bindings for Marvell AC5/X/IM eMMC controller. > This compatibility string covers the differences in the > AC5/X version of the driver: 31-bit bus limitation and > DDR memory starting at address 0x2_0000_0000, which are handled > by usage of a bounce buffer plus a different DMA mask. > > Signed-off-by: Elad Nachman <enachman@marvell.com> > --- > .../devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > index 3a8e74894ae0..cfe6237716f4 100644 > --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > @@ -27,7 +27,9 @@ properties: > - marvell,armada-ap806-sdhci > > - items: > - - const: marvell,armada-ap807-sdhci > + - enum: > + - marvell,armada-ap807-sdhci > + - marvell,ac5-sdhci Order entries alphabetically if there is going to be resend/new version. Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 2024-01-03 17:28 ` [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 Elad Nachman 2024-01-04 7:37 ` Krzysztof Kozlowski @ 2024-01-05 10:18 ` Ulf Hansson 1 sibling, 0 replies; 6+ messages in thread From: Ulf Hansson @ 2024-01-05 10:18 UTC (permalink / raw) To: Elad Nachman Cc: robh+dt, krzysztof.kozlowski+dt, conor+dt, andrew, gregory.clement, sebastian.hesselbarth, huziji, linux-mmc, devicetree, linux-kernel, linux-arm-kernel On Wed, 3 Jan 2024 at 18:28, Elad Nachman <enachman@marvell.com> wrote: > > From: Elad Nachman <enachman@marvell.com> > > Add dt bindings for Marvell AC5/X/IM eMMC controller. > This compatibility string covers the differences in the > AC5/X version of the driver: 31-bit bus limitation and > DDR memory starting at address 0x2_0000_0000, which are handled > by usage of a bounce buffer plus a different DMA mask. > > Signed-off-by: Elad Nachman <enachman@marvell.com> Applied for next, thanks! Kind regards Uffe > --- > .../devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > index 3a8e74894ae0..cfe6237716f4 100644 > --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > @@ -27,7 +27,9 @@ properties: > - marvell,armada-ap806-sdhci > > - items: > - - const: marvell,armada-ap807-sdhci > + - enum: > + - marvell,armada-ap807-sdhci > + - marvell,ac5-sdhci > - const: marvell,armada-ap806-sdhci > > - items: > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] arm64: dts: ac5: add mmc node and clock 2024-01-03 17:28 [PATCH v2 0/2] arm64: dts: ac5: add mmc Elad Nachman 2024-01-03 17:28 ` [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 Elad Nachman @ 2024-01-03 17:28 ` Elad Nachman 2024-02-27 16:36 ` Gregory CLEMENT 1 sibling, 1 reply; 6+ messages in thread From: Elad Nachman @ 2024-01-03 17:28 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, conor+dt, andrew, gregory.clement, sebastian.hesselbarth, huziji, ulf.hansson, linux-mmc, devicetree, linux-kernel, linux-arm-kernel Cc: enachman From: Elad Nachman <enachman@marvell.com> Add mmc and mmc clock nodes to ac5 and ac5x device tree files Signed-off-by: Elad Nachman <enachman@marvell.com> --- arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 31 ++++++++++++++++++- .../boot/dts/marvell/ac5-98dx35xx-rd.dts | 4 +++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi index b5e042b8e929..5591939e057b 100644 --- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi +++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi @@ -77,7 +77,6 @@ soc { #address-cells = <2>; #size-cells = <2>; ranges; - dma-ranges; internal-regs@7f000000 { #address-cells = <1>; @@ -204,6 +203,30 @@ gpio1: gpio@18140 { }; }; + mmc_dma: bus@80500000 { + compatible = "simple-bus"; + ranges; + #address-cells = <0x2>; + #size-cells = <0x2>; + reg = <0x0 0x80500000 0x0 0x100000>; + dma-ranges = <0x0 0x0 0x2 0x0 0x0 0x80000000>; + dma-coherent; + + sdhci: mmc@805c0000 { + compatible = "marvell,ac5-sdhci", + "marvell,armada-ap806-sdhci"; + reg = <0x0 0x805c0000 0x0 0x1000>; + interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&emmc_clock>, <&cnm_clock>; + clock-names = "core", "axi"; + bus-width = <8>; + non-removable; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + }; + }; + /* * Dedicated section for devices behind 32bit controllers so we * can configure specific DMA mapping for them @@ -335,5 +358,11 @@ nand_clock: nand-clock { #clock-cells = <0>; clock-frequency = <400000000>; }; + + emmc_clock: emmc-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <400000000>; + }; }; }; diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts index f0ebdb84eec9..0c973d7a215a 100644 --- a/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts +++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts @@ -99,3 +99,7 @@ parition@2 { }; }; }; + +&sdhci { + status = "okay"; +}; -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] arm64: dts: ac5: add mmc node and clock 2024-01-03 17:28 ` [PATCH v2 2/2] arm64: dts: ac5: add mmc node and clock Elad Nachman @ 2024-02-27 16:36 ` Gregory CLEMENT 0 siblings, 0 replies; 6+ messages in thread From: Gregory CLEMENT @ 2024-02-27 16:36 UTC (permalink / raw) To: Elad Nachman, robh+dt, krzysztof.kozlowski+dt, conor+dt, andrew, sebastian.hesselbarth, huziji, ulf.hansson, linux-mmc, devicetree, linux-kernel, linux-arm-kernel Cc: enachman Hi Elad Nachman, > From: Elad Nachman <enachman@marvell.com> > > Add mmc and mmc clock nodes to ac5 and ac5x device tree files > > Signed-off-by: Elad Nachman <enachman@marvell.com> Applied on mvebu/dt64 Thanks, Gregory > --- > arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 31 ++++++++++++++++++- > .../boot/dts/marvell/ac5-98dx35xx-rd.dts | 4 +++ > 2 files changed, 34 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi > index b5e042b8e929..5591939e057b 100644 > --- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi > +++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi > @@ -77,7 +77,6 @@ soc { > #address-cells = <2>; > #size-cells = <2>; > ranges; > - dma-ranges; > > internal-regs@7f000000 { > #address-cells = <1>; > @@ -204,6 +203,30 @@ gpio1: gpio@18140 { > }; > }; > > + mmc_dma: bus@80500000 { > + compatible = "simple-bus"; > + ranges; > + #address-cells = <0x2>; > + #size-cells = <0x2>; > + reg = <0x0 0x80500000 0x0 0x100000>; > + dma-ranges = <0x0 0x0 0x2 0x0 0x0 0x80000000>; > + dma-coherent; > + > + sdhci: mmc@805c0000 { > + compatible = "marvell,ac5-sdhci", > + "marvell,armada-ap806-sdhci"; > + reg = <0x0 0x805c0000 0x0 0x1000>; > + interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&emmc_clock>, <&cnm_clock>; > + clock-names = "core", "axi"; > + bus-width = <8>; > + non-removable; > + mmc-ddr-1_8v; > + mmc-hs200-1_8v; > + mmc-hs400-1_8v; > + }; > + }; > + > /* > * Dedicated section for devices behind 32bit controllers so we > * can configure specific DMA mapping for them > @@ -335,5 +358,11 @@ nand_clock: nand-clock { > #clock-cells = <0>; > clock-frequency = <400000000>; > }; > + > + emmc_clock: emmc-clock { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <400000000>; > + }; > }; > }; > diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts > index f0ebdb84eec9..0c973d7a215a 100644 > --- a/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts > +++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts > @@ -99,3 +99,7 @@ parition@2 { > }; > }; > }; > + > +&sdhci { > + status = "okay"; > +}; > -- > 2.25.1 > -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-27 16:36 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-01-03 17:28 [PATCH v2 0/2] arm64: dts: ac5: add mmc Elad Nachman 2024-01-03 17:28 ` [PATCH v2 1/2] dt-bindings: mmc: add Marvell ac5 Elad Nachman 2024-01-04 7:37 ` Krzysztof Kozlowski 2024-01-05 10:18 ` Ulf Hansson 2024-01-03 17:28 ` [PATCH v2 2/2] arm64: dts: ac5: add mmc node and clock Elad Nachman 2024-02-27 16:36 ` Gregory CLEMENT
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).