Add mmc-support for mt7986
v3 cover Add mmc-support for mt7986
From: Frank Wunderlich <[email protected]>
I've noticed the mtk-sd binding needs a bit more work get into a more clean state.
There are 2 properties missing that maybe need to be added later or dropped from devicetrees:
drv-type (which is used in mt8183-kukui.dtsi and set to <2>) andr_smpl (used in mt7622-rfb1.dts and mt7622-bananapi-bpi-r64.dts, both times set to <1>)
i don't know their function and boundaries and i do not find them in driver. I guess they are added by accident, so i removing them in the patches 5+6.
v2:
- add compatible based binding
v3:
- solve "not" statement in binding and reorder if statements,drop mt8183
- added patches removing invalid properties (not in driver)
Frank Wunderlich (4):
dt-bindings: mmc: mtk-sd: add mt7986
arm64: dts: mediatek: mt2712e: swap last 2 clocks to match binding
arm64: dts: mt8183: drop drv-type from mmc-node
arm64: dts: mt7622: drop r_smpl property from mmc node
Nícolas F. R. A. Prado (1):
dt-bindings: mmc: mtk-sd: Set clocks based on compatible
Sam Shih (2):
dt-bindings: mmc: Add compatible for Mediatek MT7986
mmc: mediatek: add support for MT7986 SoC
.../devicetree/bindings/mmc/mtk-sd.yaml | 137 ++++++++++++++---- arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 6 +- .../dts/mediatek/mt7622-bananapi-bpi-r64.dts | 1 - arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 1 - .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 1 - drivers/mmc/host/mtk-sd.c | 14 ++ 6 files changed, 124 insertions(+), 36 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/7 dt-bindings: mmc: Add compatible for Mediatek MT7986
From: Sam Shih <[email protected]>
This commit adds dt-binding documentation of mmc for Mediatek MT7986 SoC Platform.
--- Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +1 -0
@@ -23,6 +23,7 @@ properties: - mediatek,mt6795-mmc - mediatek,mt7620-mmc - mediatek,mt7622-mmc + - mediatek,mt7986-mmc - mediatek,mt8135-mmc - mediatek,mt8173-mmc - mediatek,mt8183-mmc
Signature · 1 line
2.34.1
PATCH v3 2/7 dt-bindings: mmc: mtk-sd: Set clocks based on compatible
In reply to Frank WunderlichFrom: Nícolas F. R. A. Prado <[email protected]>
The binding was describing a single clock list for all platforms, but that's not really suitable:
Most platforms using at least 2 clocks (source, hclk), some of them a third "source_cg". Mt2712 requires an extra 'bus_clk' on some of its controllers, while mt8192 requires 8 clocks.
Move the clock definitions inside if blocks that match on the compatibles.
I used Patch from Nícolas F. R. A. Prado and modified it to not using "not" statement.
---
v2:
- add this patch
v3:
- add blank lines and change "not" to matchlist
- reorder entries - make generic first then order alphanumeric
- rewrite commit description
- drop soc-specific mt8183 - constraints were also set for it above
--- .../devicetree/bindings/mmc/mtk-sd.yaml | 113 +++++++++++++----- 1 file changed, 83 insertions(+), 30 deletions(-)
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +83 -30
@@ -10,9 +10,6 @@ maintainers: - Chaotian Jing <[email protected]> - Wenbin Mei <[email protected]> -allOf: - - $ref: mmc-controller.yaml# - properties: compatible: oneOf:
@@ -49,27 +46,11 @@ properties: description: Should contain phandle for the clock feeding the MMC controller. minItems: 2 - items: - - description: source clock (required). - - description: HCLK which used for host (required). - - description: independent source clock gate (required for MT2712). - - description: bus clock used for internal register access (required for MT2712 MSDC0/3). - - description: msdc subsys clock gate (required for MT8192). - - description: peripheral bus clock gate (required for MT8192). - - description: AXI bus clock gate (required for MT8192). - - description: AHB bus clock gate (required for MT8192). + maxItems: 7 clock-names: minItems: 2 - items: - - const: source - - const: hclk - - const: source_cg - - const: bus_clk - - const: sys_cg - - const: pclk_cg - - const: axi_cg - - const: ahb_cg + maxItems: 7 interrupts: description:
@@ -191,15 +172,87 @@ required: - vmmc-supply - vqmmc-supply -if: - properties: - compatible: - contains: - const: mediatek,mt8183-mmc -then: - properties: - reg: - minItems: 2 +allOf: + - $ref: mmc-controller.yaml# + - if: + properties: + compatible: + enum: + - mediatek,mt2701-mmc + - mediatek,mt6779-mmc + - mediatek,mt6795-mmc + - mediatek,mt7620-mmc + - mediatek,mt7622-mmc + - mediatek,mt7623-mmc + - mediatek,mt8135-mmc + - mediatek,mt8173-mmc + - mediatek,mt8183-mmc + - mediatek,mt8186-mmc + - mediatek,mt8188-mmc + - mediatek,mt8195-mmc + - mediatek,mt8516-mmc + then: + properties: + clocks: + minItems: 2 + items: + - description: source clock + - description: HCLK which used for host + - description: independent source clock gate + clock-names: + minItems: 2 + items: + - const: source + - const: hclk + - const: source_cg + + - if: + properties: + compatible: + contains: + const: mediatek,mt2712-mmc + then: + properties: + clocks: + minItems: 3 + items: + - description: source clock + - description: HCLK which used for host + - description: independent source clock gate + - description: bus clock used for internal register access (required for MSDC0/3). + clock-names: + minItems: 3 + items: + - const: source + - const: hclk + - const: source_cg + - const: bus_clk + + - if: + properties: + compatible: + contains: + const: mediatek,mt8192-mmc + then: + properties: + clocks: + items: + - description: source clock + - description: HCLK which used for host + - description: independent source clock gate + - description: msdc subsys clock gate + - description: peripheral bus clock gate + - description: AXI bus clock gate + - description: AHB bus clock gate + clock-names: + items: + - const: source + - const: hclk + - const: source_cg + - const: sys_cg + - const: pclk_cg + - const: axi_cg + - const: ahb_cg unevaluatedProperties: false
Signature · 1 line
2.34.1
Re: [PATCH v3 2/7] dt-bindings: mmc: mtk-sd: Set clocks based on compatible
Quoted 12 lines · Frank Wunderlich
From: Nícolas F. R. A. Prado <[email protected]>
The binding was describing a single clock list for all platforms, but that's not really suitable:
Most platforms using at least 2 clocks (source, hclk), some of them a third "
source_cg". Mt2712 requires an extra 'bus_clk' on some of its controllers, while mt8192 requires 8 clocks.Move the clock definitions inside if blocks that match on the compatibles.
Quoted 7 lines
I used Patch from Nícolas F. R. A. Prado and modified it to not using "not" statement.
Fixes 59a23395d8aa ("dt-bindings: mmc: Add support for MT8192 SoC")Signed-off-by Nícolas F. R. A. Prado <[email protected]>Signed-off-by Frank Wunderlich <[email protected]>
Best regards,
Krzysztof
Re: [PATCH v3 2/7] dt-bindings: mmc: mtk-sd: Set clocks based on compatible
In reply to Frank WunderlichHi,
thank you for picking this up.
Quoted 19 lines · Frank Wunderlich
From: Nícolas F. R. A. Prado <[email protected]>
The binding was describing a single clock list for all platforms, but that's not really suitable:
Most platforms using at least 2 clocks (source, hclk), some of them a third "
source_cg". Mt2712 requires an extra 'bus_clk' on some of its controllers, while mt8192 requires 8 clocks.Move the clock definitions inside if blocks that match on the compatibles.
I used Patch from Nícolas F. R. A. Prado and modified it to not using "not" statement.
Fixes 59a23395d8aa ("dt-bindings: mmc: Add support for MT8192 SoC")Signed-off-by Nícolas F. R. A. Prado <[email protected]>Signed-off-by Frank Wunderlich <[email protected]>
Quoted 8 lines
---
v2:
- add this patch
v3:
- add blank lines and change "not" to matchlist
- reorder entries - make generic first then order alphanumeric
- rewrite commit description
- drop soc-specific mt8183 - constraints were also set for it above
This is wrong, see below.
Quoted 8 lines
--- .../devicetree/bindings/mmc/mtk-sd.yaml | 113 +++++++++++++----- 1 file changed, 83 insertions(+), 30 deletions(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +0
-0
[..]
Documentation/devicetree/bindings/mmc/mtk-sd.yaml required: · line 202
Quoted 10 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +0
-9-if: - properties: - compatible: - contains: - const: mediatek,mt8183-mmc -then: - properties: - reg: - minItems: 2
You can't drop this. Nodes with the mt8183 compatible should keep requiring two reg values. It's not covered by the branch below.
Thanks,
Nícolas
Quoted 34 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +34
-0+allOf: + - $ref: mmc-controller.yaml# + - if: + properties: + compatible: + enum: + - mediatek,mt2701-mmc + - mediatek,mt6779-mmc + - mediatek,mt6795-mmc + - mediatek,mt7620-mmc + - mediatek,mt7622-mmc + - mediatek,mt7623-mmc + - mediatek,mt8135-mmc + - mediatek,mt8173-mmc + - mediatek,mt8183-mmc + - mediatek,mt8186-mmc + - mediatek,mt8188-mmc + - mediatek,mt8195-mmc + - mediatek,mt8516-mmc + then: + properties: + clocks: + minItems: 2 + items: + - description: source clock + - description: HCLK which used for host + - description: independent source clock gate + clock-names: + minItems: 2 + items: + - const: source + - const: hclk + - const: source_cg +
[..]
Re: [PATCH v3 2/7] dt-bindings: mmc: mtk-sd: Set clocks based on compatible
Am 24. Oktober 2022 18:43:53 MESZ schrieb "Nícolas F. R. A. Prado" <[email protected]>:
Quoted 33 lines
Hi,
thank you for picking this up.
Quoted 19 lines · Frank Wunderlich
From: Nícolas F. R. A. Prado <[email protected]>
The binding was describing a single clock list for all platforms, but that's not really suitable:
Most platforms using at least 2 clocks (source, hclk), some of them a third "
source_cg". Mt2712 requires an extra 'bus_clk' on some of its controllers, while mt8192 requires 8 clocks.Move the clock definitions inside if blocks that match on the compatibles.
I used Patch from Nícolas F. R. A. Prado and modified it to not using "not" statement.
Fixes 59a23395d8aa ("dt-bindings: mmc: Add support for MT8192 SoC")Signed-off-by Nícolas F. R. A. Prado <[email protected]>Signed-off-by Frank Wunderlich <[email protected]>Quoted 8 lines
---
v2:
- add this patch
v3:
- add blank lines and change "not" to matchlist
- reorder entries - make generic first then order alphanumeric
- rewrite commit description
- drop soc-specific mt8183 - constraints were also set for it above
Quoted 1 line
This is wrong, see below.
You are right,will fix in v4
Quoted 23 lines
Quoted 8 lines
--- .../devicetree/bindings/mmc/mtk-sd.yaml | 113 +++++++++++++----- 1 file changed, 83 insertions(+), 30 deletions(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +0
-0[..]
Documentation/devicetree/bindings/mmc/mtk-sd.yaml required: · line 202
Quoted 10 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +0
-9-if: - properties: - compatible: - contains: - const: mediatek,mt8183-mmc -then: - properties: - reg: - minItems: 2You can't drop this. Nodes with the mt8183 compatible should keep requiring two reg values. It's not covered by the branch below.
Quoted 2 lines
Thanks,
Nícolas
regards Frank
PATCH v3 3/7 dt-bindings: mmc: mtk-sd: add mt7986
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add SoC specific section for defining clock configuration.
---
v3:
- drop assigned-clocks/assigned-clock-parents
- fix clock description
--- .../devicetree/bindings/mmc/mtk-sd.yaml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+)
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +23 -0
@@ -228,6 +228,29 @@ allOf: - const: source_cg - const: bus_clk + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt7986-mmc + then: + properties: + clocks: + minItems: 3 + items: + - description: source clock + - description: HCLK which used for host + - description: AXI bus clock gate + - description: AHB bus clock gate + clock-names: + minItems: 3 + items: + - const: source + - const: hclk + - const: axi_cg + - const: ahb_cg + - if: properties: compatible:
Signature · 1 line
2.34.1
Re: [PATCH v3 3/7] dt-bindings: mmc: mtk-sd: add mt7986
Quoted 5 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add SoC specific section for defining clock configuration.
Signed-off-by Frank Wunderlich <[email protected]>
Best regards,
Krzysztof
Aw: Re: [PATCH v3 3/7] dt-bindings: mmc: mtk-sd: add mt7986
Hi
Quoted 7 lines
Gesendet: Sonntag, 23. Oktober 2022 um 14:56 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>
An: "Frank Wunderlich" <[email protected]>, [email protected]
Cc: "Frank Wunderlich" <[email protected]>, "Chaotian Jing" <[email protected]>, "Ulf Hansson" <[email protected]>, "Rob Herring" <[email protected]>, "Krzysztof Kozlowski" <[email protected]>, "Matthias Brugger" <[email protected]>, "Wenbin Mei" <[email protected]>, [email protected], [email protected], [email protected], [email protected]
Betreff: Re: [PATCH v3 3/7] dt-bindings: mmc: mtk-sd: add mt7986On 23/10/2022 05:12, Frank Wunderlich wrote:
Quoted 8 lines
Quoted 5 lines
From: Frank Wunderlich <[email protected]>
Add SoC specific section for defining clock configuration.
Signed-off-by Frank Wunderlich <[email protected]>Reviewed-by Krzysztof Kozlowski <[email protected]>
Hi,
got another config from mtk which requires changing binding a bit
clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
<&infracfg CLK_INFRA_MSDC_HCK_CK>,
<&infracfg CLK_INFRA_MSDC_CK>,
<&infracfg CLK_INFRA_MSDC_133M_CK>,
<&infracfg CLK_INFRA_MSDC_66M_CK>;
clock-names = "source", "hclk", "source_cg", "bus_clk",
"sys_cg";in binding:
+++ b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml @@ -241,15 +241,17 @@ allOf:
items:
- description: source clock
- description: HCLK which used for host
- - description: AXI bus clock gate
- - description: AHB bus clock gate
+ - description: independent source clock gate
+ - description: bus clock used for internal register access (required for MSDC0/3).
+ - description: msdc subsys clock gate
clock-names:
minItems: 3
items:
- const: source
- const: hclk
- - const: axi_cg
- - const: ahb_cg
+ - const: "source_cg"
+ - const: "bus_clk"
+ - const: "sys_cg"will send an updated v4...old version was working but i should use the new one.
@Krzysztof can i take your RB here or should i leave it as Patch was changed?
regards Frank
Re: Aw: Re: [PATCH v3 3/7] dt-bindings: mmc: mtk-sd: add mt7986
Quoted 54 lines · Frank Wunderlich
Hi
Quoted 7 lines
Gesendet: Sonntag, 23. Oktober 2022 um 14:56 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>
An: "Frank Wunderlich" <[email protected]>, [email protected]
Cc: "Frank Wunderlich" <[email protected]>, "Chaotian Jing" <[email protected]>, "Ulf Hansson" <[email protected]>, "Rob Herring" <[email protected]>, "Krzysztof Kozlowski" <[email protected]>, "Matthias Brugger" <[email protected]>, "Wenbin Mei" <[email protected]>, [email protected], [email protected], [email protected], [email protected]
Betreff: Re: [PATCH v3 3/7] dt-bindings: mmc: mtk-sd: add mt7986On 23/10/2022 05:12, Frank Wunderlich wrote:
Quoted 8 lines
Quoted 5 lines
From: Frank Wunderlich <[email protected]>
Add SoC specific section for defining clock configuration.
Signed-off-by Frank Wunderlich <[email protected]>Reviewed-by Krzysztof Kozlowski <[email protected]>Hi,
got another config from mtk which requires changing binding a bit
clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>, <&infracfg CLK_INFRA_MSDC_HCK_CK>, <&infracfg CLK_INFRA_MSDC_CK>, <&infracfg CLK_INFRA_MSDC_133M_CK>, <&infracfg CLK_INFRA_MSDC_66M_CK>; clock-names = "source", "hclk", "source_cg", "bus_clk", "sys_cg";in binding:
+++
b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml(quoted diff) +6
-4@@ -241,15 +241,17 @@ allOf: items: - description: source clock - description: HCLK which used for host - - description: AXI bus clock gate - - description: AHB bus clock gate + - description: independent source clock gate + - description: bus clock used for internal register access (required for MSDC0/3). + - description: msdc subsys clock gate clock-names: minItems: 3 items: - const: source - const: hclk - - const: axi_cg - - const: ahb_cg + - const: "source_cg" + - const: "bus_clk" + - const: "sys_cg"will send an updated v4...old version was working but i should use the new one.
Quoted 1 line
@Krzysztof can i take your RB here or should i leave it as Patch was changed?
Please drop my tag, so I will re-review it.
Thanks!
Best regards,
Krzysztof
PATCH v3 4/7 arm64: dts: mediatek: mt2712e: swap last 2 clocks to match binding
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
First 3 clocks for mt2712 need to be "source", "hclk", "source_cg" so swap last 2 of mmc0 to match the binding.
--- arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/mediatek/mt2712e.dtsi +3 -3
@@ -766,9 +766,9 @@ mmc0: mmc@11230000 { interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_LOW>; clocks = <&pericfg CLK_PERI_MSDC30_0>, <&pericfg CLK_PERI_MSDC50_0_HCLK_EN>, - <&pericfg CLK_PERI_MSDC30_0_QTR_EN>, - <&pericfg CLK_PERI_MSDC50_0_EN>; - clock-names = "source", "hclk", "bus_clk", "source_cg"; + <&pericfg CLK_PERI_MSDC50_0_EN>, + <&pericfg CLK_PERI_MSDC30_0_QTR_EN>; + clock-names = "source", "hclk", "source_cg", "bus_clk"; status = "disabled"; };
Signature · 1 line
2.34.1
PATCH v3 5/7 arm64: dts: mt8183: drop drv-type from mmc-node
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
This property is not defined in binding and driver.
--- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +0 -1
@@ -378,7 +378,6 @@ &mmc1 { mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; max-frequency = <200000000>; - drv-type = <2>; cap-sd-highspeed; sd-uhs-sdr50; sd-uhs-sdr104;
Signature · 1 line
2.34.1
PATCH v3 6/7 arm64: dts: mt7622: drop r_smpl property from mmc node
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
This property is not defined in binding and driver.
--- arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 1 - arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 1 - 2 files changed, 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +0 -1
@@ -235,7 +235,6 @@ &mmc1 { bus-width = <4>; max-frequency = <50000000>; cap-sd-highspeed; - r_smpl = <1>; cd-gpios = <&pio 81 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; vqmmc-supply = <®_3p3v>;
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +0 -1
@@ -208,7 +208,6 @@ &mmc1 { bus-width = <4>; max-frequency = <50000000>; cap-sd-highspeed; - r_smpl = <1>; cd-gpios = <&pio 81 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; vqmmc-supply = <®_3p3v>;
Signature · 1 line
2.34.1
PATCH v3 7/7 mmc: mediatek: add support for MT7986 SoC
In reply to Frank WunderlichFrom: Sam Shih <[email protected]>
Adding mt7986 own characteristics and of_device_id to have support of MT7986 SoC.
--- drivers/mmc/host/mtk-sd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/mmc/host/mtk-sd.c +14 -0
@@ -552,6 +552,19 @@ static const struct mtk_mmc_compatible mt7622_compat = { .support_64g = false, }; +static const struct mtk_mmc_compatible mt7986_compat = { + .clk_div_bits =12 , + .recheck_sdio_irq = true, + .hs400_tune = false, + .pad_tune_reg =MSDC_PAD_TUNE0 , + .async_fifo = true, + .data_tune = true, + .busy_check = true, + .stop_clk_fix = true, + .enhance_rx = true, + .support_64g = true, +}; +static const struct mtk_mmc_compatible mt8135_compat = { .clk_div_bits =8 , .recheck_sdio_irq = true,
@@ -609,6 +622,7 @@ static const struct of_device_id msdc_of_ids[] = { { .compatible = "mediatek,mt6795-mmc", .data = &mt6795_compat}, { .compatible = "mediatek,mt7620-mmc", .data = &mt7620_compat}, { .compatible = "mediatek,mt7622-mmc", .data = &mt7622_compat}, + { .compatible = "mediatek,mt7986-mmc", .data = &mt7986_compat}, { .compatible = "mediatek,mt8135-mmc", .data = &mt8135_compat}, { .compatible = "mediatek,mt8173-mmc", .data = &mt8173_compat}, { .compatible = "mediatek,mt8183-mmc", .data = &mt8183_compat},
Signature · 1 line
2.34.1