split rk3568 and rk3566 device trees
Subsystems (2)
cover split rk3568 and rk3566 device trees
This is an example patch set that addresses the split of the rk3568 and rk3566 soc device trees.
This method attempts to avoid deleting and modifing nodes by maintaining a common dtsi for all common items and adding in the differences in separate dtsi files.
It also includes a basic dts for the Pine64 Quartz64 Model A board as an example of a rk3566 device.
This series has the following prerequisite:
arm64: dts: rockchip: add pmu and qos nodes for rk3568
https://patchwork.kernel.org/project/linux-rockchip/patch/[email protected]/
Peter Geis (4):
arm64: dts: rockchip: move rk3568 dtsi to rk356x dtsi
arm64: dts: rockchip: split rk3568 device tree
arm64: dts: rockchip: add rk3566 dtsi
arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A
.../devicetree/bindings/arm/rockchip.yaml | 5 + arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3566-quartz64-a.dts | 321 +++++++ arch/arm64/boot/dts/rockchip/rk3566.dtsi | 20 + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 814 +----------------- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 786 +++++++++++++++++ 6 files changed, 1153 insertions(+), 794 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi
Signature · 1 line
2.25.1
RFC PATCH 1/4 arm64: dts: rockchip: move rk3568 dtsi to rk356x dtsi
In preparation for separating the rk3568 and rk3566 device trees, move the base rk3568 dtsi to rk356x dtsi.
This will allow us to strip out the rk3568 specific nodes.
---
arch/arm64/boot/dts/rockchip/{rk3568.dtsi => rk356x.dtsi} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename arch/arm64/boot/dts/rockchip/{rk3568.dtsi => rk356x.dtsi} (100%)arch/arm64/boot/dts/rockchip/rk356x.dtsi renamed from arch/arm64/boot/dts/rockchip/rk3568.dtsi +0 -0
Signature · 1 line
2.25.1
RFC PATCH 2/4 arm64: dts: rockchip: split rk3568 device tree
In reply to Peter GeisIn preparation for the rk3566 inclusion, split apart the rk3568 specific nodes into a separate device tree.
This allows us to create the rk3566 device tree without deleting nodes.
--- arch/arm64/boot/dts/rockchip/rk3568.dtsi | 48 ++++++++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 36 ------------------ 2 files changed, 48 insertions(+), 36 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3568.dtsi
arch/arm64/boot/dts/rockchip/rk3568.dtsi new file +48 -0
@@ -0,0 +1,48 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. + */ + +#include "rk356x.dtsi" + +/ { + compatible = "rockchip,rk3568"; + + qos_pcie3x1: qos@fe190080 { + compatible = "rockchip,rk3568-qos", "syscon"; + reg = <0x0 0xfe190080 0x0 0x20>; + }; + + qos_pcie3x2: qos@fe190100 { + compatible = "rockchip,rk3568-qos", "syscon"; + reg = <0x0 0xfe190100 0x0 0x20>; + }; + + qos_sata0: qos@fe190200 { + compatible = "rockchip,rk3568-qos", "syscon"; + reg = <0x0 0xfe190200 0x0 0x20>; + }; +}; + +&cpu0_opp_table { + opp-1992000000 { + opp-hz = /bits/ 64 <1992000000>; + opp-microvolt = <1150000 1150000 1150000>; + }; +}; + +&power { + power-domain@RK3568_PD_PIPE { + reg = <RK3568_PD_PIPE>; + clocks = <&cru PCLK_PIPE>; + pm_qos = <&qos_pcie2x1>, + <&qos_pcie3x1>, + <&qos_pcie3x2>, + <&qos_sata0>, + <&qos_sata1>, + <&qos_sata2>, + <&qos_usb3_0>, + <&qos_usb3_1>; + #power-domain-cells = <0>; + }; +};
arch/arm64/boot/dts/rockchip/rk356x.dtsi +0 -36
@@ -13,8 +13,6 @@ #include <dt-bindings/thermal/thermal.h> / { - compatible = "rockchip,rk3568"; - interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>;
@@ -121,11 +119,6 @@ opp-1800000000 { opp-hz = /bits/ 64 <1800000000>; opp-microvolt = <1050000 1050000 1150000>; }; - - opp-1992000000 { - opp-hz = /bits/ 64 <1992000000>; - opp-microvolt = <1150000 1150000 1150000>; - }; }; firmware {
@@ -334,20 +327,6 @@ power-domain@RK3568_PD_RKVENC { <&qos_rkvenc_wr_m0>; #power-domain-cells = <0>; }; - - power-domain@RK3568_PD_PIPE { - reg = <RK3568_PD_PIPE>; - clocks = <&cru PCLK_PIPE>; - pm_qos = <&qos_pcie2x1>, - <&qos_pcie3x1>, - <&qos_pcie3x2>, - <&qos_sata0>, - <&qos_sata1>, - <&qos_sata2>, - <&qos_usb3_0>, - <&qos_usb3_1>; - #power-domain-cells = <0>; - }; }; };
@@ -431,21 +410,6 @@ qos_pcie2x1: qos@fe190000 { reg = <0x0 0xfe190000 0x0 0x20>; }; - qos_pcie3x1: qos@fe190080 { - compatible = "rockchip,rk3568-qos", "syscon"; - reg = <0x0 0xfe190080 0x0 0x20>; - }; - - qos_pcie3x2: qos@fe190100 { - compatible = "rockchip,rk3568-qos", "syscon"; - reg = <0x0 0xfe190100 0x0 0x20>; - }; - - qos_sata0: qos@fe190200 { - compatible = "rockchip,rk3568-qos", "syscon"; - reg = <0x0 0xfe190200 0x0 0x20>; - }; - qos_sata1: qos@fe190280 { compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x0 0xfe190280 0x0 0x20>;
Signature · 1 line
2.25.1
RFC PATCH 3/4 arm64: dts: rockchip: add rk3566 dtsi
In reply to Peter GeisAdd the rk3566 dtsi which includes the soc specific changes for this chip.
--- arch/arm64/boot/dts/rockchip/rk3566.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi
arch/arm64/boot/dts/rockchip/rk3566.dtsi new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +#include "rk356x.dtsi" + +/ { + compatible = "rockchip,rk3566"; +}; + +&power { + power-domain@RK3568_PD_PIPE { + reg = <RK3568_PD_PIPE>; + clocks = <&cru PCLK_PIPE>; + pm_qos = <&qos_pcie2x1>, + <&qos_sata1>, + <&qos_sata2>, + <&qos_usb3_0>, + <&qos_usb3_1>; + #power-domain-cells = <0>; + }; +};
Signature · 1 line
2.25.1
RFC PATCH 4/4 arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A
In reply to Peter GeisAdd a basic dts for the Pine64 Quartz64 Model A Single Board Computer. This board outputs on uart2 for debug.
--- .../devicetree/bindings/arm/rockchip.yaml | 5 + arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3566-quartz64-a.dts | 321 ++++++++++++++++++ 3 files changed, 327 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
@@ -455,6 +455,11 @@ properties: - const: pine64,rockpro64 - const: rockchip,rk3399 + - description: Pine64 Quartz64 Model A + items: + - const: pine64,quartz64-a + - const: rockchip,rk3566 + - description: Radxa Rock items: - const: radxa,rock
arch/arm64/boot/dts/rockchip/Makefile +1 -0
@@ -51,4 +51,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts new file +321 -0
321 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [RFC PATCH 4/4] arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A
Quoted 11 lines · Peter Geis
Add a basic dts for the Pine64 Quartz64 Model A Single Board Computer. This board outputs on uart2 for debug.
Signed-off-by Peter Geis <[email protected]>--- .../devicetree/bindings/arm/rockchip.yaml | 5 + arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3566-quartz64-a.dts | 321 ++++++++++++++++++ 3 files changed, 327 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
Re: [RFC PATCH 4/4] arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A
Quoted 14 lines · Rob Herring
Quoted 11 lines · Peter Geis
Add a basic dts for the Pine64 Quartz64 Model A Single Board Computer. This board outputs on uart2 for debug.
Signed-off-by Peter Geis <[email protected]>--- .../devicetree/bindings/arm/rockchip.yaml | 5 + arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3566-quartz64-a.dts | 321 ++++++++++++++++++ 3 files changed, 327 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
Quoted 1 line
Acked-by Rob Herring <[email protected]>
Thank you!
I need to split the dt-bindings out into a separate patch, and the quartz64-a dts has some mild changes.
Are you okay with me using your ack still?
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Rob Herring
maintainerRe: [RFC PATCH 4/4] arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A
Quoted 16 lines · Peter Geis
Quoted 14 lines · Rob Herring
Quoted 11 lines · Peter Geis
Add a basic dts for the Pine64 Quartz64 Model A Single Board Computer. This board outputs on uart2 for debug.
Signed-off-by Peter Geis <[email protected]>--- .../devicetree/bindings/arm/rockchip.yaml | 5 + arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3566-quartz64-a.dts | 321 ++++++++++++++++++ 3 files changed, 327 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
Quoted 6 lines
Quoted 1 line
Acked-by Rob Herring <[email protected]>Thank you!
I need to split the dt-bindings out into a separate patch, and the quartz64-a dts has some mild changes.
Are you okay with me using your ack still?
Yes.
Rob
Quoted 9 lines · Peter Geis
This is an example patch set that addresses the split of the rk3568 and rk3566 soc device trees.
This method attempts to avoid deleting and modifing nodes by maintaining a common dtsi for all common items and adding in the differences in separate dtsi files.
It also includes a basic dts for the Pine64 Quartz64 Model A board as an example of a rk3566 device.[...]
Applied, thanks!
[1/4] arm64: dts: rockchip: move rk3568 dtsi to rk356x dtsi
commit: 94c75b5265fe899391e298eace826e4f8d1e8e40
[2/4] arm64: dts: rockchip: split rk3568 device tree
commit: 92eb5ffbae440700dd38378e24d8091fe166c352
[3/4] arm64: dts: rockchip: add rk3566 dtsi
commit: 04e1ecf6099cc3ba17c2d4279c968a656320cd12
[4/4] arm64: dts: rockchip: add basic dts for Pine64 Quartz64-A
commit: c95414d68f116462acf9622f715b8a568bb1dd00Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>