On 1/15/21 1:30 PM, Grygorii Strashko wrote:
> Now the dtbs_check produces below warnings
> sdhci@4f80000: clock-names:0: 'clk_ahb' was expected
> sdhci@4f80000: clock-names:1: 'clk_xin' was expected
> $nodename:0: 'sdhci@4f80000' does not match '^mmc(@.*)?$'
>
> Fix above warnings by updating mmc DT definitions to follow
> sdhci-am654.yaml bindings:
> - rename sdhci dt nodes to 'mmc@'
> - swap clk_xin/clk_ahb clocks, the clk_ahb clock expected to be defined
> first
>
> Signed-off-by: Grygorii Strashko <grygorii.stras...@ti.com>
Thanks for fixing these Grygorii,
Reviewed-by: Suman Anna <s-a...@ti.com>
On a side note, there are still couple more warnings on J721E dtb
/uhome/projects/opensrc/kernels/linux-next/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dt.yaml:
mmc@4fb0000: compatible: More than one condition true in oneOf schema:
{'oneOf': [{'additionalItems': False,
'items': [{'const': 'ti,am654-sdhci-5.1'}],
'maxItems': 1,
'minItems': 1,
'type': 'array'},
{'additionalItems': False,
'items': [{'const': 'ti,j721e-sdhci-8bit'}],
'maxItems': 1,
'minItems': 1,
'type': 'array'},
{'additionalItems': False,
'items': [{'const': 'ti,j721e-sdhci-4bit'}],
'maxItems': 1,
'minItems': 1,
'type': 'array'},
{'additionalItems': False,
'items': [{'const': 'ti,j721e-sdhci-4bit'}],
'maxItems': 1,
'minItems': 1,
'type': 'array'},
{'additionalItems': False,
'items': [{'const': 'ti,am64-sdhci-8bit'}],
'maxItems': 1,
'minItems': 1,
'type': 'array'},
{'additionalItems': False,
'items': [{'const': 'ti,am64-sdhci-4bit'}],
'maxItems': 1,
'minItems': 1,
'type': 'array'},
{'additionalItems': False,
'items': [{'const': 'ti,j7200-sdhci-8bit'},
{'const': 'ti,j721e-sdhci-8bit'}],
'maxItems': 2,
'minItems': 2,
'type': 'array'},
{'additionalItems': False,
'items': [{'const': 'ti,j7200-sdhci-4bit'},
{'const': 'ti,j721e-sdhci-4bit'}],
'maxItems': 2,
'minItems': 2,
'type': 'array'}]}
From schema:
/uhome/projects/opensrc/kernels/linux-next/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
Also, the YAML itself can do with some improvements. I see a minItems of 1, so I
am assuming clk_ahb is always the mandatory clock where applicable, can you
confirm?
regards
Suman
> ---
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 8 ++++----
> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 18 +++++++++---------
> 3 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 12591a854020..ceb579fb427d 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -256,7 +256,7 @@
> #size-cells = <0>;
> };
>
> - sdhci0: sdhci@4f80000 {
> + sdhci0: mmc@4f80000 {
> compatible = "ti,am654-sdhci-5.1";
> reg = <0x0 0x4f80000 0x0 0x260>, <0x0 0x4f90000 0x0 0x134>;
> power-domains = <&k3_pds 47 TI_SCI_PD_EXCLUSIVE>;
> @@ -280,7 +280,7 @@
> dma-coherent;
> };
>
> - sdhci1: sdhci@4fa0000 {
> + sdhci1: mmc@4fa0000 {
> compatible = "ti,am654-sdhci-5.1";
> reg = <0x0 0x4fa0000 0x0 0x260>, <0x0 0x4fb0000 0x0 0x134>;
> power-domains = <&k3_pds 48 TI_SCI_PD_EXCLUSIVE>;
> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
> b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
> index 4e39f0325c03..3f23b913b498 100644
> --- a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
> @@ -506,8 +506,8 @@
> reg = <0x00 0x04f80000 0x00 0x260>, <0x00 0x4f88000 0x00 0x134>;
> interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
> power-domains = <&k3_pds 91 TI_SCI_PD_EXCLUSIVE>;
> - clock-names = "clk_xin", "clk_ahb";
> - clocks = <&k3_clks 91 3>, <&k3_clks 91 0>;
> + clock-names = "clk_ahb", "clk_xin";
> + clocks = <&k3_clks 91 0>, <&k3_clks 91 3>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-mmc-hs = <0x0>;
> ti,otap-del-sel-ddr52 = <0x6>;
> @@ -525,8 +525,8 @@
> reg = <0x00 0x04fb0000 0x00 0x260>, <0x00 0x4fb8000 0x00 0x134>;
> interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
> power-domains = <&k3_pds 92 TI_SCI_PD_EXCLUSIVE>;
> - clock-names = "clk_xin", "clk_ahb";
> - clocks = <&k3_clks 92 2>, <&k3_clks 92 1>;
> + clock-names = "clk_ahb", "clk_xin";
> + clocks = <&k3_clks 92 1>, <&k3_clks 92 2>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-sd-hs = <0x0>;
> ti,otap-del-sel-sdr12 = <0xf>;
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index 2d526ea44a85..8c84dafb7125 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -1032,13 +1032,13 @@
> clock-names = "gpio";
> };
>
> - main_sdhci0: sdhci@4f80000 {
> + main_sdhci0: mmc@4f80000 {
> compatible = "ti,j721e-sdhci-8bit";
> reg = <0x0 0x4f80000 0x0 0x1000>, <0x0 0x4f88000 0x0 0x400>;
> interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
> power-domains = <&k3_pds 91 TI_SCI_PD_EXCLUSIVE>;
> - clock-names = "clk_xin", "clk_ahb";
> - clocks = <&k3_clks 91 1>, <&k3_clks 91 0>;
> + clock-names = "clk_ahb", "clk_xin";
> + clocks = <&k3_clks 91 0>, <&k3_clks 91 1>;
> assigned-clocks = <&k3_clks 91 1>;
> assigned-clock-parents = <&k3_clks 91 2>;
> bus-width = <8>;
> @@ -1054,13 +1054,13 @@
> dma-coherent;
> };
>
> - main_sdhci1: sdhci@4fb0000 {
> + main_sdhci1: mmc@4fb0000 {
> compatible = "ti,j721e-sdhci-4bit";
> reg = <0x0 0x04fb0000 0x0 0x1000>, <0x0 0x4fb8000 0x0 0x400>;
> interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
> power-domains = <&k3_pds 92 TI_SCI_PD_EXCLUSIVE>;
> - clock-names = "clk_xin", "clk_ahb";
> - clocks = <&k3_clks 92 0>, <&k3_clks 92 5>;
> + clock-names = "clk_ahb", "clk_xin";
> + clocks = <&k3_clks 92 5>, <&k3_clks 92 0>;
> assigned-clocks = <&k3_clks 92 0>;
> assigned-clock-parents = <&k3_clks 92 1>;
> ti,otap-del-sel-legacy = <0x0>;
> @@ -1074,13 +1074,13 @@
> dma-coherent;
> };
>
> - main_sdhci2: sdhci@4f98000 {
> + main_sdhci2: mmc@4f98000 {
> compatible = "ti,j721e-sdhci-4bit";
> reg = <0x0 0x4f98000 0x0 0x1000>, <0x0 0x4f90000 0x0 0x400>;
> interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
> power-domains = <&k3_pds 93 TI_SCI_PD_EXCLUSIVE>;
> - clock-names = "clk_xin", "clk_ahb";
> - clocks = <&k3_clks 93 0>, <&k3_clks 93 5>;
> + clock-names = "clk_ahb", "clk_xin";
> + clocks = <&k3_clks 93 5>, <&k3_clks 93 0>;
> assigned-clocks = <&k3_clks 93 0>;
> assigned-clock-parents = <&k3_clks 93 1>;
> ti,otap-del-sel-legacy = <0x0>;
>
