Skip to contentSkip to conversation

dt-bindings: arm: fix Rockchip Kylin board bindings

PATCH In review Johan Jonker 3 participants 6 messages Mar 2, 2020 – Mar 11, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 dt-bindings: arm: fix Rockchip Kylin board bindings

A test with the command below gives this error:

arch/arm/boot/dts/rk3036-kylin.dt.yaml: /: compatible:
['rockchip,rk3036-kylin', 'rockchip,rk3036'] is not valid under any of the given schemas

Normally the dt-binding is the authoritative part, so boards should follow the binding, but in the kylin-case the compatible from the .dts is used for years in the field now, so fix the binding, as otherwise
we would break old users.

Fix this error by changing 'rockchip,kylin-rk3036' to 'rockchip,rk3036-kylin' in rockchip.yaml.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/rockchip.yaml

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +1 -1
index 874b0eaa2..203158038 100644
@@ -443,7 +443,7 @@ properties:
 
       - description: Rockchip Kylin
         items:
-          - const: rockchip,kylin-rk3036
+          - const: rockchip,rk3036-kylin
           - const: rockchip,rk3036
 
       - description: Rockchip PX3 Evaluation board
Signature · 1 line
2.11.0
#1 lore raw

PATCH v2 2/3 dt-bindings: arm: add Rockchip rk3036-evb board

A test with the command below gives this error:

arch/arm/boot/dts/rk3036-evb.dt.yaml: /: compatible:
['rockchip,rk3036-evb', 'rockchip,rk3036'] is not valid under any of the given schemas

This board was somehow never added to the documentation. Fix this error by adding the rk3036-evb board to rockchip.yaml.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/rockchip.yaml

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
index 203158038..d303790f5 100644
@@ -468,6 +468,11 @@ properties:
           - const: rockchip,r88
           - const: rockchip,rk3368
 
+      - description: Rockchip RK3036 Evaluation board
+        items:
+          - const: rockchip,rk3036-evb
+          - const: rockchip,rk3036
+
       - description: Rockchip RK3228 Evaluation board
         items:
           - const: rockchip,rk3228-evb
Signature · 1 line
2.11.0
maintainer Reviewed-by on v2 2/3
#2 lore raw

Re: [PATCH v2 2/3] dt-bindings: arm: add Rockchip rk3036-evb board

Quoted 9 lines · Johan Jonker

A test with the command below gives this error:

arch/arm/boot/dts/rk3036-evb.dt.yaml: /: compatible:
['rockchip,rk3036-evb', 'rockchip,rk3036'] is not valid under any of the given schemas

This board was somehow never added to the documentation. Fix this error by adding the rk3036-evb board to rockchip.yaml.

Quoted 8 lines

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/rockchip.yaml

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
 1 file changed, 5 insertions(+)
#3 lore raw

PATCH v2 3/3 arm64: dts: rockchip: fix compatible property for rk3399-evb

In reply to Johan Jonker

A test with the command below gives this error:

arch/arm64/boot/dts/rockchip/rk3399-evb.dt.yaml: /: compatible:
['rockchip,rk3399-evb', 'rockchip,rk3399', 'google,rk3399evb-rev2'] is not valid under any of the given schemas

'google,rk3399evb-rev2' was a no longer used variant for Google. The binding only mentions 'rockchip,rk3399-evb', 'rockchip,rk3399', so fix this error by removing 'google,rk3399evb-rev2' from the compatible property in rk3399-evb.dts and change it into generic rk3399-evb support only.

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/rockchip.yaml

---
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-evb.dts +1 -2
index 77008dca4..d1afd1e1d 100644
@@ -9,8 +9,7 @@
 
 / {
 	model = "Rockchip RK3399 Evaluation Board";
-	compatible = "rockchip,rk3399-evb", "rockchip,rk3399",
-		     "google,rk3399evb-rev2";
+	compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
Signature · 1 line
2.11.0
maintainer Reviewed-by on v2 1/3
#4 lore raw
In reply to Johan Jonker
Quoted 14 lines · Johan Jonker

A test with the command below gives this error:

arch/arm/boot/dts/rk3036-kylin.dt.yaml: /: compatible:
['rockchip,rk3036-kylin', 'rockchip,rk3036'] is not valid under any of the given schemas

Normally the dt-binding is the authoritative part, so boards should follow the binding, but in the kylin-case the compatible from the .dts is used for years in the field now, so fix the binding, as otherwise
we would break old users.

Fix this error by changing 'rockchip,kylin-rk3036' to 'rockchip,rk3036-kylin' in rockchip.yaml.

Quoted 8 lines

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/rockchip.yaml

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
maintainer
#5 lore raw
In reply to Johan Jonker

Am Montag, 2. März 2020, 10:27:57 CET schrieb Johan Jonker:

Quoted 11 lines

A test with the command below gives this error:

arch/arm/boot/dts/rk3036-kylin.dt.yaml: /: compatible:
['rockchip,rk3036-kylin', 'rockchip,rk3036'] is not valid under any of the given schemas

Normally the dt-binding is the authoritative part, so boards should follow the binding, but in the kylin-case the compatible from the .dts is used for years in the field now, so fix the binding, as otherwise
we would break old users.

Quoted 7 lines

Fix this error by changing 'rockchip,kylin-rk3036' to 'rockchip,rk3036-kylin' in rockchip.yaml.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/rockchip.yaml

applied all 3 for 5.7

Thanks
Heiko