* [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
@ 2021-01-15 19:30 ` Grygorii Strashko
0 siblings, 0 replies; 8+ messages in thread
From: Grygorii Strashko @ 2021-01-15 19:30 UTC (permalink / raw)
To: Nishanth Menon, devicetree, linux-arm-kernel, Faiz Abbas
Cc: linux-kernel, Rob Herring, Vignesh Raghavendra, Ulf Hansson,
Grygorii Strashko
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.strashko@ti.com>
---
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>;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
@ 2021-01-15 19:30 ` Grygorii Strashko
0 siblings, 0 replies; 8+ messages in thread
From: Grygorii Strashko @ 2021-01-15 19:30 UTC (permalink / raw)
To: Nishanth Menon, devicetree, linux-arm-kernel, Faiz Abbas
Cc: Grygorii Strashko, Ulf Hansson, Rob Herring, linux-kernel,
Vignesh Raghavendra
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.strashko@ti.com>
---
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>;
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
2021-01-15 19:30 ` Grygorii Strashko
@ 2021-01-21 14:59 ` Aswath Govindraju
-1 siblings, 0 replies; 8+ messages in thread
From: Aswath Govindraju @ 2021-01-21 14:59 UTC (permalink / raw)
To: Grygorii Strashko, Nishanth Menon, devicetree, linux-arm-kernel,
Faiz Abbas
Cc: linux-kernel, Rob Herring, Vignesh Raghavendra, Ulf Hansson
On 16/01/21 1:00 am, 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.strashko@ti.com>
Reviewed-by: Aswath Govindraju <a-govindraju@ti.com>
> ---
> 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>;
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
@ 2021-01-21 14:59 ` Aswath Govindraju
0 siblings, 0 replies; 8+ messages in thread
From: Aswath Govindraju @ 2021-01-21 14:59 UTC (permalink / raw)
To: Grygorii Strashko, Nishanth Menon, devicetree, linux-arm-kernel,
Faiz Abbas
Cc: Ulf Hansson, Rob Herring, linux-kernel, Vignesh Raghavendra
On 16/01/21 1:00 am, 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.strashko@ti.com>
Reviewed-by: Aswath Govindraju <a-govindraju@ti.com>
> ---
> 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>;
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
2021-01-15 19:30 ` Grygorii Strashko
@ 2021-01-21 16:34 ` Suman Anna
-1 siblings, 0 replies; 8+ messages in thread
From: Suman Anna @ 2021-01-21 16:34 UTC (permalink / raw)
To: Grygorii Strashko, Nishanth Menon, devicetree, linux-arm-kernel,
Faiz Abbas
Cc: linux-kernel, Rob Herring, Vignesh Raghavendra, Ulf Hansson,
Aswath Govindraju
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.strashko@ti.com>
Thanks for fixing these Grygorii,
Reviewed-by: Suman Anna <s-anna@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>;
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
@ 2021-01-21 16:34 ` Suman Anna
0 siblings, 0 replies; 8+ messages in thread
From: Suman Anna @ 2021-01-21 16:34 UTC (permalink / raw)
To: Grygorii Strashko, Nishanth Menon, devicetree, linux-arm-kernel,
Faiz Abbas
Cc: Aswath Govindraju, Ulf Hansson, Rob Herring, linux-kernel,
Vignesh Raghavendra
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.strashko@ti.com>
Thanks for fixing these Grygorii,
Reviewed-by: Suman Anna <s-anna@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>;
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
2021-01-15 19:30 ` Grygorii Strashko
@ 2021-01-22 12:44 ` Nishanth Menon
-1 siblings, 0 replies; 8+ messages in thread
From: Nishanth Menon @ 2021-01-22 12:44 UTC (permalink / raw)
To: devicetree, linux-arm-kernel, Faiz Abbas, Grygorii Strashko
Cc: Nishanth Menon, linux-kernel, Rob Herring, Vignesh Raghavendra,
Ulf Hansson
On Fri, 15 Jan 2021 21:30:16 +0200, 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
Hi Grygorii Strashko,
I have applied the following to branch ti-k3-dts-next on [1].
Thank you!
[1/1] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
commit: 0cf73209ce2c60c5b717a02d9de10a6d524e08a6
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
@ 2021-01-22 12:44 ` Nishanth Menon
0 siblings, 0 replies; 8+ messages in thread
From: Nishanth Menon @ 2021-01-22 12:44 UTC (permalink / raw)
To: devicetree, linux-arm-kernel, Faiz Abbas, Grygorii Strashko
Cc: Nishanth Menon, Ulf Hansson, Rob Herring, linux-kernel,
Vignesh Raghavendra
On Fri, 15 Jan 2021 21:30:16 +0200, 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
Hi Grygorii Strashko,
I have applied the following to branch ti-k3-dts-next on [1].
Thank you!
[1/1] arm64: dts: ti: k3: mmc: fix dtbs_check warnings
commit: 0cf73209ce2c60c5b717a02d9de10a6d524e08a6
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-01-22 12:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-15 19:30 [PATCH] arm64: dts: ti: k3: mmc: fix dtbs_check warnings Grygorii Strashko
2021-01-15 19:30 ` Grygorii Strashko
2021-01-21 14:59 ` Aswath Govindraju
2021-01-21 14:59 ` Aswath Govindraju
2021-01-21 16:34 ` Suman Anna
2021-01-21 16:34 ` Suman Anna
2021-01-22 12:44 ` Nishanth Menon
2021-01-22 12:44 ` Nishanth Menon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.