This series tries to address some dtbs_check warnings on i.MX6ULL.
Changes in V3:
- add Krzysztof's Reviewed-Bys
- fix indentation in Patch 6 found by Krzysztof Kozlowski
Changes in V2:
- new patch to fix fsl-imx-uart warnings
- fixed GPC typo found by Fabio Estevam
- keep enum in bindings as suggested by Krzysztof Kozlowski
- make imx6ul GPT compatible to imx6sx
Stefan Wahren (6):
dt-bindings: serial: fsl-imx-uart: add missing properties
dt-bindings: crypto: fsl-dcp: add imx6sl and imx6ull compatible
dt-bindings: imx-thermal: add imx6sll and imx6ul compatible
dt-bindings: imxgpt: add imx6ul compatible
ARM: dts: imx: Adjust dma-apbh node name
ARM: dts: imx6ul: Add clock and PGC node to GPC
.../devicetree/bindings/crypto/fsl-dcp.yaml | 12 ++++++---
.../bindings/serial/fsl-imx-uart.yaml | 25 +++++++++++++++++++
.../bindings/thermal/imx-thermal.yaml | 14 ++++++++---
.../devicetree/bindings/timer/fsl,imxgpt.yaml | 3 +++
arch/arm/boot/dts/imx23.dtsi | 2 +-
arch/arm/boot/dts/imx28.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
arch/arm/boot/dts/imx6sx.dtsi | 2 +-
arch/arm/boot/dts/imx6ul.dtsi | 14 ++++++++++-
arch/arm/boot/dts/imx7s.dtsi | 2 +-
10 files changed, 65 insertions(+), 13 deletions(-)
--
2.34.1
Currently the dtbs_check for imx generates warnings like this:
serial@7000c000: Unevaluated properties are not allowed
('clock-names', 'clocks', 'dma-names', 'dmas' were unexpected)
So add the missing properties to the devicetree binding.
Signed-off-by: Stefan Wahren <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/serial/fsl-imx-uart.yaml | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml b/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
index 4cbe76e1715b..06f4b02b0550 100644
--- a/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
+++ b/Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
@@ -52,6 +52,24 @@ properties:
interrupts:
maxItems: 1
+ clocks:
+ items:
+ - description: ipg clock
+ - description: per clock
+
+ clock-names:
+ items:
+ - const: ipg
+ - const: per
+
+ dmas:
+ maxItems: 2
+
+ dma-names:
+ items:
+ - const: rx
+ - const: tx
+
fsl,dte-mode:
$ref: /schemas/types.yaml#/definitions/flag
description: |
@@ -87,11 +105,15 @@ required:
- compatible
- reg
- interrupts
+ - clocks
+ - clock-names
unevaluatedProperties: false
examples:
- |
+ #include <dt-bindings/clock/imx5-clock.h>
+
aliases {
serial0 = &uart1;
};
@@ -100,6 +122,9 @@ examples:
compatible = "fsl,imx51-uart", "fsl,imx21-uart";
reg = <0x73fbc000 0x4000>;
interrupts = <31>;
+ clocks = <&clks IMX5_CLK_UART1_IPG_GATE>,
+ <&clks IMX5_CLK_UART1_PER_GATE>;
+ clock-names = "ipg", "per";
uart-has-rtscts;
fsl,dte-mode;
};
--
2.34.1
Currently the dtbs_check for imx6ul generates warnings like this:
['fsl,imx6ul-gpt', 'fsl,imx6sx-gpt'] is too long
According to the timer-imx-gpt driver all imx6 use the same imx6dl data,
but according to the existing DTS files the imx6ul GPT IP is derived from
imx6sx. So better follow the DTS files here and make the imx6ul GPT
compatible to the imx6sl one to fix the warning.
Signed-off-by: Stefan Wahren <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
---
Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml b/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml
index 716c6afcca1f..685137338ac9 100644
--- a/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml
+++ b/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml
@@ -34,6 +34,9 @@ properties:
- fsl,imxrt1050-gpt
- fsl,imxrt1170-gpt
- const: fsl,imx6dl-gpt
+ - items:
+ - const: fsl,imx6ul-gpt
+ - const: fsl,imx6sx-gpt
reg:
maxItems: 1
--
2.34.1
Currently the dtbs_check generates warnings like this:
$nodename:0: 'dma-apbh@110000' does not match '^dma-controller(@.*)?$'
So fix all affected dma-apbh node names.
Signed-off-by: Stefan Wahren <[email protected]>
---
arch/arm/boot/dts/imx23.dtsi | 2 +-
arch/arm/boot/dts/imx28.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
arch/arm/boot/dts/imx6sx.dtsi | 2 +-
arch/arm/boot/dts/imx6ul.dtsi | 2 +-
arch/arm/boot/dts/imx7s.dtsi | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index d19508c8f9ed..a3668a0827fc 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -59,7 +59,7 @@ icoll: interrupt-controller@80000000 {
reg = <0x80000000 0x2000>;
};
- dma_apbh: dma-apbh@80004000 {
+ dma_apbh: dma-controller@80004000 {
compatible = "fsl,imx23-dma-apbh";
reg = <0x80004000 0x2000>;
interrupts = <0 14 20 0
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index a8d3c3113e0f..29e37b1fae66 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -78,7 +78,7 @@ hsadc: hsadc@80002000 {
status = "disabled";
};
- dma_apbh: dma-apbh@80004000 {
+ dma_apbh: dma-controller@80004000 {
compatible = "fsl,imx28-dma-apbh";
reg = <0x80004000 0x2000>;
interrupts = <82 83 84 85
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index b72ec745f6d1..bda182edc589 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -150,7 +150,7 @@ soc: soc {
interrupt-parent = <&gpc>;
ranges;
- dma_apbh: dma-apbh@110000 {
+ dma_apbh: dma-controller@110000 {
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
reg = <0x00110000 0x2000>;
interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 93ac2380ca1e..4233943a1cca 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -209,7 +209,7 @@ gpu: gpu@1800000 {
power-domains = <&pd_pu>;
};
- dma_apbh: dma-apbh@1804000 {
+ dma_apbh: dma-controller@1804000 {
compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";
reg = <0x01804000 0x2000>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 3d9d0f823568..118764c50d92 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -164,7 +164,7 @@ intc: interrupt-controller@a01000 {
<0x00a06000 0x2000>;
};
- dma_apbh: dma-apbh@1804000 {
+ dma_apbh: dma-controller@1804000 {
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
reg = <0x01804000 0x2000>;
interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index efe2525b62fa..54026c2c93fa 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -1257,7 +1257,7 @@ fec1: ethernet@30be0000 {
};
};
- dma_apbh: dma-apbh@33000000 {
+ dma_apbh: dma-controller@33000000 {
compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh";
reg = <0x33000000 0x2000>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
--
2.34.1
On Fri, Apr 14, 2023 at 11:19:46AM +0200, Stefan Wahren wrote:
> Currently the dtbs_check generates warnings like this:
>
> $nodename:0: 'dma-apbh@110000' does not match '^dma-controller(@.*)?$'
>
> So fix all affected dma-apbh node names.
>
> Signed-off-by: Stefan Wahren <[email protected]>
Applied, thanks!
Hi,
Am 14.04.23 um 11:19 schrieb Stefan Wahren:
> This series tries to address some dtbs_check warnings on i.MX6ULL.
>
> Changes in V3:
> - add Krzysztof's Reviewed-Bys
> - fix indentation in Patch 6 found by Krzysztof Kozlowski
>
> Changes in V2:
> - new patch to fix fsl-imx-uart warnings
> - fixed GPC typo found by Fabio Estevam
> - keep enum in bindings as suggested by Krzysztof Kozlowski
> - make imx6ul GPT compatible to imx6sx
>
> Stefan Wahren (6):
> dt-bindings: serial: fsl-imx-uart: add missing properties
> dt-bindings: crypto: fsl-dcp: add imx6sl and imx6ull compatible
> dt-bindings: imx-thermal: add imx6sll and imx6ul compatible
> dt-bindings: imxgpt: add imx6ul compatible
> ARM: dts: imx: Adjust dma-apbh node name
> ARM: dts: imx6ul: Add clock and PGC node to GPC
>
currently patch 3, 5 and 6 has been applied. Should i resend the rest of
the series?