This series tries to address some dtbs_check warnings on i.MX6ULL.
Stefan Wahren (6):
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: imx6ul: Fix second GPT compatible
ARM: dts: imx: Adjust dma-apbh node name
ARM: dts: imx6ul: Add clock and PGC node to GDC
.../devicetree/bindings/crypto/fsl-dcp.yaml | 11 ++++++++---
.../bindings/thermal/imx-thermal.yaml | 13 +++++++++----
.../devicetree/bindings/timer/fsl,imxgpt.yaml | 1 +
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 | 18 +++++++++++++++---
arch/arm/boot/dts/imx7s.dtsi | 2 +-
9 files changed, 38 insertions(+), 15 deletions(-)
--
2.34.1
Currently the dtbs_check for imx6 generates warnings like this:
'fsl,imx6sl-dcp' is not one of ['fsl,imx23-dcp', 'fsl,imx28-dcp']
['fsl,imx6sl-dcp', 'fsl,imx28-dcp'] is too long
or
'fsl,imx6ull-dcp' is not one of ['fsl,imx23-dcp', 'fsl,imx28-dcp']
['fsl,imx6ull-dcp', 'fsl,imx28-dcp'] is too long
So add them to the devicetree binding.
Signed-off-by: Stefan Wahren <[email protected]>
---
Documentation/devicetree/bindings/crypto/fsl-dcp.yaml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml b/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml
index 99be01539fcd..1695c4c58dc8 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml
+++ b/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml
@@ -11,9 +11,14 @@ maintainers:
properties:
compatible:
- enum:
- - fsl,imx23-dcp
- - fsl,imx28-dcp
+ oneOf:
+ - const: fsl,imx23-dcp
+ - const: fsl,imx28-dcp
+ - items:
+ - enum:
+ - fsl,imx6sl-dcp
+ - fsl,imx6ull-dcp
+ - const: fsl,imx28-dcp
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 41e08fa23cce..6571f8a1553d 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 65b2c6c131b3..412baa848837 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
According to the imxgpt DT schema all i.MX6 GPT IP is
derived from imx6dl. So fix the imx6ul DTS accordingly
and avoid dtbs_check warnings.
Signed-off-by: Stefan Wahren <[email protected]>
---
arch/arm/boot/dts/imx6ul.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index f0a9139748b8..65b2c6c131b3 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -448,7 +448,7 @@ can2: can@2094000 {
};
gpt1: timer@2098000 {
- compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
+ compatible = "fsl,imx6ul-gpt", "fsl,imx6dl-gpt";
reg = <0x02098000 0x4000>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_GPT1_BUS>,
@@ -734,7 +734,7 @@ gpr: iomuxc-gpr@20e4000 {
};
gpt2: timer@20e8000 {
- compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
+ compatible = "fsl,imx6ul-gpt", "fsl,imx6dl-gpt";
reg = <0x020e8000 0x4000>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6UL_CLK_GPT2_BUS>,
--
2.34.1
According to fsl,imx-gpc.yaml the General Power Control requires
a ipg clock and a Power Gating Control node. So add them to fix
the dtbs_check warnings on i.MX6UL boards:
gpc@20dc000: 'clocks' is a required property
gpc@20dc000: 'clock-names' is a required property
gpc@20dc000: 'pgc' is a required property
Suggested-by: Jacky Bai <[email protected]>
Signed-off-by: Stefan Wahren <[email protected]>
---
arch/arm/boot/dts/imx6ul.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 412baa848837..fd6c064fa032 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -720,6 +720,18 @@ gpc: gpc@20dc000 {
#interrupt-cells = <3>;
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
interrupt-parent = <&intc>;
+ clocks = <&clks IMX6UL_CLK_IPG>;
+ clock-names = "ipg";
+
+ pgc {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ power-domain@0 {
+ reg = <0>;
+ #power-domain-cells = <0>;
+ };
+ };
};
iomuxc: pinctrl@20e0000 {
--
2.34.1
Currently the dtbs_check for imx6 generates warnings like this:
['fsl,imx6sll-tempmon', 'fsl,imx6sx-tempmon'] is too long
So add them to the devicetree binding.
Signed-off-by: Stefan Wahren <[email protected]>
---
.../devicetree/bindings/thermal/imx-thermal.yaml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/thermal/imx-thermal.yaml b/Documentation/devicetree/bindings/thermal/imx-thermal.yaml
index b22c8b59d5c7..9a20c5d74617 100644
--- a/Documentation/devicetree/bindings/thermal/imx-thermal.yaml
+++ b/Documentation/devicetree/bindings/thermal/imx-thermal.yaml
@@ -12,10 +12,15 @@ maintainers:
properties:
compatible:
- enum:
- - fsl,imx6q-tempmon
- - fsl,imx6sx-tempmon
- - fsl,imx7d-tempmon
+ oneOf:
+ - const: fsl,imx6q-tempmon
+ - const: fsl,imx6sx-tempmon
+ - items:
+ - enum:
+ - fsl,imx6sll-tempmon
+ - fsl,imx6ul-tempmon
+ - const: fsl,imx6sx-tempmon
+ - const: fsl,imx7d-tempmon
interrupts:
description: |
--
2.34.1
Currently the dtbs_check for imx6ul generates warnings like this:
['fsl,imx6ul-gpt', 'fsl,imx6sx-gpt'] is too long
Since the imx6ul GPT IP is compatible to imx6dl, add the compatible
to the enum. The mentioned warning also needs adjustment of the
affected DTS, but this should be done in a different patch.
Signed-off-by: Stefan Wahren <[email protected]>
---
Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml b/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml
index 716c6afcca1f..8d9e8c1b7dcf 100644
--- a/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml
+++ b/Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml
@@ -31,6 +31,7 @@ properties:
- enum:
- fsl,imx6sl-gpt
- fsl,imx6sx-gpt
+ - fsl,imx6ul-gpt
- fsl,imxrt1050-gpt
- fsl,imxrt1170-gpt
- const: fsl,imx6dl-gpt
--
2.34.1
Hi Stefan,
On Sun, Mar 5, 2023 at 7:59 PM Stefan Wahren <[email protected]> wrote:
>
> According to fsl,imx-gpc.yaml the General Power Control requires
> a ipg clock and a Power Gating Control node. So add them to fix
> the dtbs_check warnings on i.MX6UL boards:
>
> gpc@20dc000: 'clocks' is a required property
> gpc@20dc000: 'clock-names' is a required property
> gpc@20dc000: 'pgc' is a required property
There is a typo in the Subject: s/GDC/GPC.
On 05/03/2023 23:58, Stefan Wahren wrote:
> Currently the dtbs_check for imx6 generates warnings like this:
>
> 'fsl,imx6sl-dcp' is not one of ['fsl,imx23-dcp', 'fsl,imx28-dcp']
> ['fsl,imx6sl-dcp', 'fsl,imx28-dcp'] is too long
>
> or
>
> 'fsl,imx6ull-dcp' is not one of ['fsl,imx23-dcp', 'fsl,imx28-dcp']
> ['fsl,imx6ull-dcp', 'fsl,imx28-dcp'] is too long
>
> So add them to the devicetree binding.
>
> Signed-off-by: Stefan Wahren <[email protected]>
> ---
> Documentation/devicetree/bindings/crypto/fsl-dcp.yaml | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml b/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml
> index 99be01539fcd..1695c4c58dc8 100644
> --- a/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml
> +++ b/Documentation/devicetree/bindings/crypto/fsl-dcp.yaml
> @@ -11,9 +11,14 @@ maintainers:
>
> properties:
> compatible:
> - enum:
> - - fsl,imx23-dcp
> - - fsl,imx28-dcp
> + oneOf:
> + - const: fsl,imx23-dcp
> + - const: fsl,imx28-dcp
Keep these two as enum (so just indent under oneOf).
> + - items:
> + - enum:
> + - fsl,imx6sl-dcp
> + - fsl,imx6ull-dcp
> + - const: fsl,imx28-dcp
>
> reg:
> maxItems: 1
Best regards,
Krzysztof
On 05/03/2023 23:58, Stefan Wahren wrote:
> Currently the dtbs_check for imx6 generates warnings like this:
>
> ['fsl,imx6sll-tempmon', 'fsl,imx6sx-tempmon'] is too long
>
> So add them to the devicetree binding.
>
> Signed-off-by: Stefan Wahren <[email protected]>
> ---
> .../devicetree/bindings/thermal/imx-thermal.yaml | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/thermal/imx-thermal.yaml b/Documentation/devicetree/bindings/thermal/imx-thermal.yaml
> index b22c8b59d5c7..9a20c5d74617 100644
> --- a/Documentation/devicetree/bindings/thermal/imx-thermal.yaml
> +++ b/Documentation/devicetree/bindings/thermal/imx-thermal.yaml
> @@ -12,10 +12,15 @@ maintainers:
>
> properties:
> compatible:
> - enum:
> - - fsl,imx6q-tempmon
> - - fsl,imx6sx-tempmon
> - - fsl,imx7d-tempmon
> + oneOf:
> + - const: fsl,imx6q-tempmon
> + - const: fsl,imx6sx-tempmon
Keep the old three compatibles an enum.
> + - items:
> + - enum:
> + - fsl,imx6sll-tempmon
> + - fsl,imx6ul-tempmon
> + - const: fsl,imx6sx-tempmon
> + - const: fsl,imx7d-tempmon
>
> interrupts:
> description: |
Best regards,
Krzysztof
On 05/03/2023 23:58, Stefan Wahren wrote:
> Currently the dtbs_check for imx6ul generates warnings like this:
>
> ['fsl,imx6ul-gpt', 'fsl,imx6sx-gpt'] is too long
>
> Since the imx6ul GPT IP is compatible to imx6dl, add the compatible
> to the enum. The mentioned warning also needs adjustment of the
> affected DTS, but this should be done in a different patch.
>
Unfortunately I do not understand it. Your next commit says - according
to DT schema - while the bindings do not suggest any compatibility here
for imx6ul. It seems you make a change and then justify with it another
change (next commit). Instead please justify both commits - this and
next - with proper real explanation, what is compatible with what.
Best regards,
Krzysztof
On 05/03/2023 23:58, Stefan Wahren wrote:
> According to the imxgpt DT schema all i.MX6 GPT IP is
That's not true... you just changed the bindings to say that.
> derived from imx6dl. So fix the imx6ul DTS accordingly
> and avoid dtbs_check warnings.
>
> Signed-off-by: Stefan Wahren <[email protected]>
> ---
> arch/arm/boot/dts/imx6ul.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> index f0a9139748b8..65b2c6c131b3 100644
> --- a/arch/arm/boot/dts/imx6ul.dtsi
> +++ b/arch/arm/boot/dts/imx6ul.dtsi
> @@ -448,7 +448,7 @@ can2: can@2094000 {
> };
>
> gpt1: timer@2098000 {
> - compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
> + compatible = "fsl,imx6ul-gpt", "fsl,imx6dl-gpt";
Best regards,
Krzysztof