mbox series

[0/6] ARM: dts: imx6ull: Fix dtbs_check warnings

Message ID 20230305225901.7119-1-stefan.wahren@i2se.com
Headers show
Series ARM: dts: imx6ull: Fix dtbs_check warnings | expand

Message

Stefan Wahren March 5, 2023, 10:58 p.m. UTC 
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(-)

Comments

Krzysztof Kozlowski March 6, 2023, 6:36 a.m. UTC | #1 
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 <stefan.wahren@i2se.com>
> ---
>  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
Krzysztof Kozlowski March 6, 2023, 6:37 a.m. UTC | #2 
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 <stefan.wahren@i2se.com>
> ---
>  .../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
Krzysztof Kozlowski March 6, 2023, 6:40 a.m. UTC | #3 
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 <stefan.wahren@i2se.com>
> ---
>  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