dt-bindings: arm: rockchip: Update ROCKPi 4 binding
Subsystems (2)
PATCH v3 1/4 dt-bindings: arm: rockchip: Update ROCKPi 4 binding
ROCKPi 4 has 3 variants of hardware platforms called ROCKPi 4A, 4B, and 4C.
- ROCKPi 4A has no Wif/BT.
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4C
So, update the existing ROCKPi 4 binding to support ROCKPi 4A/B/C hardware platforms.
---
Changes for v3:
- new patch
Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -1
@@ -430,8 +430,12 @@ properties: - const: radxa,rock - const: rockchip,rk3188 - - description: Radxa ROCK Pi 4 + - description: Radxa ROCK Pi 4A/B/C items: + - enum: + - const: radxa,rockpi4a + - const: radxa,rockpi4b + - const: radxa,rockpi4c - const: radxa,rockpi4 - const: rockchip,rk3399
Signature · 1 line
2.25.1
PATCH v3 2/4 arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts
ROCKPi 4 has 3 variants of hardware platforms called RockPI 4A, 4B, and 4C.
- ROCKPi 4A has no Wif/BT.
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4C
So move common nodes, properties into dtsi file and include on respective variant dts files.
---
Changes for v3:
- none
Changes for v2:
- update commit message
- add radxa,rockpi4a
arch/arm64/boot/dts/rockchip/Makefile | 2 +-
.../{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 3 ---
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 +++++++++++++
3 files changed, 14 insertions(+), 4 deletions(-)
rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (99%)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dtsarch/arm64/boot/dts/rockchip/Makefile +1 -1
@@ -33,7 +33,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb -dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi renamed from arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts +0 -3
@@ -11,9 +11,6 @@ #include "rk3399-opp.dtsi" / { - model = "Radxa ROCK Pi 4"; - compatible = "radxa,rockpi4", "rockchip,rk3399"; - chosen { stdout-path = "serial2:1500000n8"; };
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar <[email protected]> + * Copyright (c) 2019 Pragnesh Patel <[email protected]> + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" + +/ { + model = "Radxa ROCK Pi 4A"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399"; +};
Signature · 1 line
2.25.1
PATCH v3 3/4 arm64: dts: rockchip: Add Radxa ROCK Pi 4B support
In reply to Jagan TekiRockPI 4B has AP6256 Wifi/BT, so enable them in 4B dts instead of enable in common dtsi.
---
Changes for v3:
- none
Changes for v2:
- update commit message
- add radxa,rockpi4b
arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 23 ---------- .../boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 +++++++++++++++++++ 3 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
@@ -34,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +0 -23
@@ -584,17 +584,6 @@ &sdio0 { pinctrl-names = "default"; pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; sd-uhs-sdr104; - status = "okay"; - - brcmf: wifi@1 { - compatible = "brcm,bcm4329-fmac"; - reg = <1>; - interrupt-parent = <&gpio0>; - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; - interrupt-names = "host-wake"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_l>; - }; }; &sdmmc {
@@ -663,18 +652,6 @@ u2phy1_host: host-port { &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; - status = "okay"; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - clocks = <&rk808 1>; - clock-names = "ext_clock"; - device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; - host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; - }; }; &uart2 {
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 4/4 arm64: dts: rockchip: Add Radxa ROCK Pi 4C support
In reply to Jagan TekiRock PI 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4C.
So, add or enable difference nodes/properties in 4C dts by including common dtsi.
---
Changes for v3:
- none
Changes for v2:
- update commit message
- add radxa,rockpi4c
arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4c.dts | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
@@ -35,6 +35,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
2.25.1
Rob Herring
maintainerQuoted 25 lines · Jagan Teki
ROCKPi 4 has 3 variants of hardware platforms called ROCKPi 4A, 4B, and 4C.
- ROCKPi 4A has no Wif/BT.
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4CSo, update the existing ROCKPi 4 binding to support ROCKPi 4A/B/C hardware platforms.
---
Changes for v3:
- new patchDocumentation/devicetree/bindings/arm/rockchip.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/rockchip.yaml +0
-0@@ -430,8 +430,12 @@ properties: - const: radxa,rock
Documentation/devicetree/bindings/arm/rockchip.yaml properties: · line 439
Quoted 10 lines
Documentation/devicetree/bindings/arm/rockchip.yaml +5
-1- const: rockchip,rk3188 - - description: Radxa ROCK Pi 4 + - description: Radxa ROCK Pi 4A/B/C items: + - enum: + - const: radxa,rockpi4a + - const: radxa,rockpi4b + - const: radxa,rockpi4c - const: radxa,rockpi4
radxa,rockpi4 already meant 'ROCKPi 4A' and should continue to do so. Just add 4B and 4C strings. It's up to you if they should be backwards compatible with 'radxa,rockpi4' (meaning 4A), but I'd guess not unless it's just a board pop option.
Quoted 5 lines
Documentation/devicetree/bindings/arm/rockchip.yaml +0
-0- const: rockchip,rk3399Signature · 1 line
2.25.1
Quoted 29 lines · Rob Herring
Quoted 27 lines · Jagan Teki
ROCKPi 4 has 3 variants of hardware platforms called ROCKPi 4A, 4B, and 4C.
- ROCKPi 4A has no Wif/BT.
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4CSo, update the existing ROCKPi 4 binding to support ROCKPi 4A/B/C hardware platforms.
---
Changes for v3:
- new patchDocumentation/devicetree/bindings/arm/rockchip.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/rockchip.yaml +0
-0@@ -430,8 +430,12 @@ properties: - const: radxa,rock - const: rockchip,rk3188
Quoted 13 lines
Documentation/devicetree/bindings/arm/rockchip.yaml properties: · line 439
Quoted 8 lines
Documentation/devicetree/bindings/arm/rockchip.yaml +5
-1- - description: Radxa ROCK Pi 4 + - description: Radxa ROCK Pi 4A/B/C items: + - enum: + - const: radxa,rockpi4a + - const: radxa,rockpi4b + - const: radxa,rockpi4c - const: radxa,rockpi4radxa,rockpi4 already meant 'ROCKPi 4A' and should continue to do so. Just add 4B and 4C strings. It's up to you if they should be backwards compatible with 'radxa,rockpi4' (meaning 4A), but I'd guess not unless it's just a board pop option.
At-least from dts nodes enablement point of view the existing dts (with radxa,rockpi4) is 4B since it has wifi/bt enabled. 4A is the real name of the board so having a compatible with radxa,rockpi4a is meaningful as I understood.
So, based on the above statements the respective binding look like
- description: Radxa ROCK Pi 4A/B/C
items:
- enum:
- radxa,rockpi4a
- radxa,rockpi4b
- radxa,rockpi4c
- const: radxa,rockpi4
- const: rockchip,rk3399
Comments, please?
Jagan.
Rob Herring
maintainerQuoted 11 lines · Jagan Teki
ROCKPi 4 has 3 variants of hardware platforms called ROCKPi 4A, 4B, and 4C.
- ROCKPi 4A has no Wif/BT.
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4CSo, update the existing ROCKPi 4 binding to support ROCKPi 4A/B/C hardware platforms.
Quoted 8 lines
---
Changes for v3:
- new patchDocumentation/devicetree/bindings/arm/rockchip.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
My bot found errors running 'make dt_binding_check' on your patch:
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/arm/rockchip.yaml: properties:compatible:oneOf:48:items: [{'enum': [{'const': 'radxa,rockpi4a'}, {'const': 'radxa,rockpi4b'}, {'const': 'radxa,rockpi4c'}]}, {'const': 'radxa,rockpi4'}, {'const': 'rockchip,rk3399'}] is not valid under any of the given schemas (Possible causes of the failure):
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/arm/rockchip.yaml: properties:compatible:oneOf:48:items: [{'enum': [{'const': 'radxa,rockpi4a'}, {'const': 'radxa,rockpi4b'}, {'const': 'radxa,rockpi4c'}]}, {'const': 'radxa,rockpi4'}, {'const': 'rockchip,rk3399'}] is not of type 'object' /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/arm/rockchip.yaml: properties:compatible:oneOf:48:items:0:enum:0: {'const': 'radxa,rockpi4a'} is not of type 'string'
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/arm/rockchip.yaml: properties:compatible:oneOf:48:items:0:enum:1: {'const': 'radxa,rockpi4b'} is not of type 'string'
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/arm/rockchip.yaml: properties:compatible:oneOf:48:items:0:enum:2: {'const': 'radxa,rockpi4c'} is not of type 'string'
Documentation/devicetree/bindings/Makefile:20: recipe for target 'Documentation/devicetree/bindings/arm/rockchip.example.dts' failed make[1]: *** [Documentation/devicetree/bindings/arm/rockchip.example.dts] Error 1
make[1]: *** Waiting for unfinished jobs.... /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/arm/rockchip.yaml: ignoring, error in schema: properties: compatible: oneOf: 48: items
warning: no schema found in file: ./Documentation/devicetree/bindings/arm/rockchip.yaml /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/arm/rockchip.yaml: ignoring, error in schema: properties: compatible: oneOf: 48: items
warning: no schema found in file: ./Documentation/devicetree/bindings/arm/rockchip.yaml
Makefile:1347: recipe for target 'dt_binding_check' failed
make: *** [dt_binding_check] Error 2
See https://patchwork.ozlabs.org/patch/1334641
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:
pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade
Please check and re-submit.