Skip to contentSkip to conversation

Add support for several new rk3566 SBCs

PATCH Applied Peter Geis 5 participants 20 messages Apr 29, 2022 – May 1, 2022

Subsystems (2)
lore
Share & tools
lore

Peter Geis

author
#0 lore raw

v2 cover Add support for several new rk3566 SBCs

The following series adds support for the following single board computers:
- Pine64 Quartz64 Model B
- Pine64 SoQuartz SoM with RPi CM4IO carrier board
- Firefly Station M2

Patches 1, 2, and 3 add the requisite dt-bindings. Patch 4 adds support for the SFC to the rk356x device tree. Patch 5 adds the Quartz64 Model B device tree. Patch 6 adds the SoQuartz CM4IO device tree.
Patch 7 adds the Firefly Station M2 device tree.

Please review and apply at your convenience.

Very Respectfully,
Peter Geis

Changelog:
v2:
- squash Model B into Model A binding
- collect acks

Furkan Kardame (1):
arm64: dts: rockchip: add dts for Firefly Station M2 rk3566

Peter Geis (6):
dt-bindings: arm: rockchip: Add Pine64 Quartz64 Model B
dt-bindings: arm: rockchip: Add Pine64 SoQuartz SoM
dt-bindings: arm: rockchip: Add Firefly Station M2
arm64: dts: rockchip: add rk356x sfc support
arm64: dts: rockchip: add Pine64 Quartz64-B device tree
arm64: dts: rockchip: add SoQuartz CM4IO dts

 .../devicetree/bindings/arm/rockchip.yaml     |  18 +-
 arch/arm64/boot/dts/rockchip/Makefile         |   3 +
 .../boot/dts/rockchip/rk3566-quartz64-b.dts   | 615 ++++++++++++++++++
 .../arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 580 +++++++++++++++++
 .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 167 +++++
 .../boot/dts/rockchip/rk3566-soquartz.dtsi    | 607 +++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk356x.dtsi      |  11 +
 7 files changed, 1999 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v2 1/7 dt-bindings: arm: rockchip: Add Pine64 Quartz64 Model B

The Quartz64 Model B is a compact single board computer from Pine64 based on the rk3566 SoC. It outputs on uart2 for the debug console.

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +4 -2
index eece92f83a2d..beb5b0ac1a2a 100644
@@ -502,9 +502,11 @@ properties:
           - const: pine64,rockpro64
           - const: rockchip,rk3399
 
-      - description: Pine64 Quartz64 Model A
+      - description: Pine64 Quartz64 Model A/B
         items:
-          - const: pine64,quartz64-a
+          - enum:
+              - pine64,quartz64-a
+              - pine64,quartz64-b
           - const: rockchip,rk3566
 
       - description: Radxa Rock
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH v2 2/7 dt-bindings: arm: rockchip: Add Pine64 SoQuartz SoM

In reply to Peter Geis

The SoQuartz system on module is designed to be pin compatible with the RPi CM4 SoM. It is based on the rk3566 SoC and outputs on uart2 for debug and console. The first carrier board supported is the CM4IO board from RPi.

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +7 -0
index beb5b0ac1a2a..b85a8e6c5e75 100644
@@ -509,6 +509,13 @@ properties:
               - pine64,quartz64-b
           - const: rockchip,rk3566
 
+      - description: Pine64 SoQuartz SoM
+        items:
+          - enum:
+              - pine64,soquartz-cm4io
+          - const: pine64,soquartz
+          - const: rockchip,rk3566
+
       - description: Radxa Rock
         items:
           - const: radxa,rock
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH v2 3/7 dt-bindings: arm: rockchip: Add Firefly Station M2

In reply to Peter Geis

The Station M2 is a compact single board computer based on the rk3566 SoC. It outputs on uart2 for debug and console purposes.

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
index b85a8e6c5e75..288d044d48bc 100644
@@ -133,6 +133,11 @@ properties:
               - firefly,roc-rk3399-pc-plus
           - const: rockchip,rk3399
 
+      - description: Firefly Station M2
+        items:
+          - const: firefly,rk3566-roc-pc
+          - const: rockchip,rk3566
+
       - description: FriendlyElec NanoPi R2S
         items:
           - const: friendlyarm,nanopi-r2s
Signature · 1 line
2.25.1
author
#5 lore raw

PATCH v2 4/7 arm64: dts: rockchip: add rk356x sfc support

In reply to Peter Geis

Add the sfc node to the rk356x device tree. This enables spi flash support for this soc.

---
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +11 -0
index ca20d7b91fe5..61a6d9d4c8a0 100644
@@ -750,6 +750,17 @@ sdmmc1: mmc@fe2c0000 {
 		status = "disabled";
 	};
 
+	sfc: spi@fe300000 {
+		compatible = "rockchip,sfc";
+		reg = <0x0 0xfe300000 0x0 0x4000>;
+		interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>;
+		clock-names = "clk_sfc", "hclk_sfc";
+		pinctrl-0 = <&fspi_pins>;
+		pinctrl-names = "default";
+		status = "disabled";
+	};
+
 	sdhci: mmc@fe310000 {
 		compatible = "rockchip,rk3568-dwcmshc";
 		reg = <0x0 0xfe310000 0x0 0x10000>;
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH v2 5/7 arm64: dts: rockchip: add Pine64 Quartz64-B device tree

In reply to Peter Geis

Add a device tree for the Pine64 Quartz64 Model B single board computer. This board ouputs debug on uart2 and supports the following components:
Gigabit Ethernet
USB2 x2 (one port otg capable)
USB3
PCIe/SATA M2
HDMI
DSI (RPi compatible pinout)
CSI (RPi compatible pinout)
A/B/G/N WiFi
Bluetooth
SDMMC
eMMC
SPI Flash
PI-40 compatible pin header

---
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3566-quartz64-b.dts   | 615 ++++++++++++++++++
 2 files changed, 616 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 4ae9f35434b8..252ee47b8a1d 100644
@@ -59,5 +59,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +615 -0

615 lines not on this page · raw message

Signature · 1 line
2.25.1
#7 lore raw

Re: [PATCH v2 5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree

I love your patch! Yet something to improve:

Hi Peter,

I love your patch! Yet something to improve:

[auto build test ERROR on robh/for-next]
[also build test ERROR on arm/for-next arm64/for-next/core clk/clk-next kvmarm/next shawnguo/for-next soc/for-next v5.18-rc4] [cannot apply to rockchip/for-next xilinx-xlnx/master keystone/next next-20220429]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm64-randconfig-r021-20220428 (https://download.01.org/0day-ci/archive/20220430/[email protected]/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 400775649969b9baf3bc2a510266e7912bb16ae9)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/d933bfeea016da20a99bce012bbf071f9d86e2bf
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433 git checkout d933bfeea016da20a99bce012bbf071f9d86e2bf
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> Error: arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts:601.1-16 Label or path usb_host0_xhci not found
>> Error: arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts:605.1-16 Label or path usb_host1_xhci not found

FATAL ERROR: Syntax error parsing input tree

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
author
#8 lore raw

Re: [PATCH v2 5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree

Quoted 11 lines · kernel test robot

Hi Peter,

I love your patch! Yet something to improve:

[auto build test ERROR on robh/for-next]
[also build test ERROR on arm/for-next arm64/for-next/core clk/clk-next kvmarm/next shawnguo/for-next soc/for-next v5.18-rc4] [cannot apply to rockchip/for-next xilinx-xlnx/master keystone/next next-20220429]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

The three new device trees are dependent on my usb series which was accepted through Heiko's tree.
I can drop the xhci dependency, but this will just happen again adding it back in if it's done in this RC series.

Quoted 30 lines
url:    https://github.com/intel-lab-lkp/linux/commits/Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm64-randconfig-r021-20220428 (https://download.01.org/0day-ci/archive/20220430/202204300850.X97CRcO6-lkp(a)intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 400775649969b9baf3bc2a510266e7912bb16ae9)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/d933bfeea016da20a99bce012bbf071f9d86e2bf
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433 git checkout d933bfeea016da20a99bce012bbf071f9d86e2bf
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

Quoted 2 lines
Quoted 2 lines

Error: arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts:601.1-16 Label or path usb_host0_xhci not found
Error: arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts:605.1-16 Label or path usb_host1_xhci not found

FATAL ERROR: Syntax error parsing input tree

--
0-DAY CI Kernel Test Service
https://01.org/lkp

maintainer
#9 lore raw

Re: [PATCH v2 5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree

Am Samstag, 30. April 2022, 16:46:31 CEST schrieb Peter Geis:

Quoted 13 lines · kernel test robot
Quoted 11 lines

Hi Peter,

I love your patch! Yet something to improve:

[auto build test ERROR on robh/for-next]
[also build test ERROR on arm/for-next arm64/for-next/core clk/clk-next kvmarm/next shawnguo/for-next soc/for-next v5.18-rc4] [cannot apply to rockchip/for-next xilinx-xlnx/master keystone/next next-20220429]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

Quoted 4 lines

The three new device trees are dependent on my usb series which was accepted through Heiko's tree.
I can drop the xhci dependency, but this will just happen again adding it back in if it's done in this RC series.

Of course dropping that part is not necessary :-)
I.e. the dependency is in my tree and this stuff will go on top.

I'm just not sure if I should give Krzysztof more time for patch1. The binding of course looks great now already, I guess I'll let the Quartz-B sit some days more.

Heiko

Quoted 32 lines
Quoted 31 lines

url:    https://github.com/intel-lab-lkp/linux/commits/Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm64-randconfig-r021-20220428 (https://download.01.org/0day-ci/archive/20220430/202204300850.X97CRcO6-lkp(a)intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 400775649969b9baf3bc2a510266e7912bb16ae9)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/d933bfeea016da20a99bce012bbf071f9d86e2bf
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433 git checkout d933bfeea016da20a99bce012bbf071f9d86e2bf
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

Quoted 2 lines
Quoted 2 lines

Error: arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts:601.1-16 Label or path usb_host0_xhci not found
Error: arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts:605.1-16 Label or path usb_host1_xhci not found

FATAL ERROR: Syntax error parsing input tree

--
0-DAY CI Kernel Test Service
https://01.org/lkp

#10 lore raw

Re: [PATCH v2 5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree

In reply to Peter Geis
Quoted 55 lines · Peter Geis

Add a device tree for the Pine64 Quartz64 Model B single board computer. This board ouputs debug on uart2 and supports the following components:
Gigabit Ethernet
USB2 x2 (one port otg capable)
USB3
PCIe/SATA M2
HDMI
DSI (RPi compatible pinout)
CSI (RPi compatible pinout)
A/B/G/N WiFi
Bluetooth
SDMMC
eMMC
SPI Flash
PI-40 compatible pin header

---
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3566-quartz64-b.dts   | 615 ++++++++++++++++++
 2 files changed, 616 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 4ae9f35434b8..252ee47b8a1d 100644
@@ -59,5 +59,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +15 -0
new file mode 100644
index 000000000000..184ab7e1d178
@@ -0,0 +1,615 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ *
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include "rk3566.dtsi"
+
+/ {
+	model = "Pine64 RK3566 Quartz64-B Board";
+	compatible = "pine64,quartz64-b", "rockchip,rk3566";
+

[..]

arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts line 427

Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +5 -0
+
+&mdio1 {
 
+	rgmii_phy1: ethernet-phy@0 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <0x1>;

Hi,

The reg value doesn't match the node name. Other 2 boards use "reg = <0>" with label "rgmii_phy1". Could you check?

Johan

Quoted 3 lines
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +3 -0
+	};
+};
+
maintainer
#11 lore raw

Re: [PATCH v2 5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree

Am Sonntag, 1. Mai 2022, 09:06:33 CEST schrieb Johan Jonker:

Quoted 69 lines · Peter Geis
Quoted 55 lines

Add a device tree for the Pine64 Quartz64 Model B single board computer. This board ouputs debug on uart2 and supports the following components:
Gigabit Ethernet
USB2 x2 (one port otg capable)
USB3
PCIe/SATA M2
HDMI
DSI (RPi compatible pinout)
CSI (RPi compatible pinout)
A/B/G/N WiFi
Bluetooth
SDMMC
eMMC
SPI Flash
PI-40 compatible pin header

---
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3566-quartz64-b.dts   | 615 ++++++++++++++++++
 2 files changed, 616 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 4ae9f35434b8..252ee47b8a1d 100644
@@ -59,5 +59,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +15 -0
new file mode 100644
index 000000000000..184ab7e1d178
@@ -0,0 +1,615 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ *
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include "rk3566.dtsi"
+
+/ {
+	model = "Pine64 RK3566 Quartz64-B Board";
+	compatible = "pine64,quartz64-b", "rockchip,rk3566";
+

[..]

arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts line 427

Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +5 -0
+
+&mdio1 {
 
+	rgmii_phy1: ethernet-phy@0 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <0x1>;

Hi,

Quoted 3 lines

The reg value doesn't match the node name. Other 2 boards use "reg = <0>" with label "rgmii_phy1". Could you check?

I do have an older Quartz-B in my boardfarm and in that older devicetree the phy-reg also is "0" instead of the "1" used here.

Is that a hardware-change?

Thanks
Heiko

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#12 lore raw

Re: [PATCH v2 5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree

Quoted 71 lines · Heiko Stübner

Am Sonntag, 1. Mai 2022, 09:06:33 CEST schrieb Johan Jonker:

Quoted 69 lines · Peter Geis
Quoted 55 lines

Add a device tree for the Pine64 Quartz64 Model B single board computer. This board ouputs debug on uart2 and supports the following components:
Gigabit Ethernet
USB2 x2 (one port otg capable)
USB3
PCIe/SATA M2
HDMI
DSI (RPi compatible pinout)
CSI (RPi compatible pinout)
A/B/G/N WiFi
Bluetooth
SDMMC
eMMC
SPI Flash
PI-40 compatible pin header

---
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3566-quartz64-b.dts   | 615 ++++++++++++++++++
 2 files changed, 616 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 4ae9f35434b8..252ee47b8a1d 100644
@@ -59,5 +59,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +15 -0
new file mode 100644
index 000000000000..184ab7e1d178
@@ -0,0 +1,615 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ *
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include "rk3566.dtsi"
+
+/ {
+   model = "Pine64 RK3566 Quartz64-B Board";
+   compatible = "pine64,quartz64-b", "rockchip,rk3566";
+

[..]

arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts line 427

Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +5 -0
+
+&mdio1 {
 
+   rgmii_phy1: ethernet-phy@0 {
+           compatible = "ethernet-phy-ieee802.3-c22";
+           reg = <0x1>;

Hi,

Quoted 8 lines
Quoted 3 lines

The reg value doesn't match the node name. Other 2 boards use "reg = <0>" with label "rgmii_phy1". Could you check?

I do have an older Quartz-B in my boardfarm and in that older devicetree the phy-reg also is "0" instead of the "1" used here.

Is that a hardware-change?

The ethernet maintainers previously brought up that 0x0 is the broadcast address for the mdio-bus. They requested we put the actual bus id of the phy even on single phy busses. This is the first one I've confirmed the bus address on.

Though I realized ethernet-phy@0 should be ethernet-phy@1 since you mentioned this. Strange dtbs-check doesn't catch this, would you fix it in line Heiko or do you want another revision?

Quoted 5 lines

Thanks
Heiko

maintainer
#13 lore raw

Re: [PATCH v2 5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree

Am Sonntag, 1. Mai 2022, 13:48:02 CEST schrieb Peter Geis:

Quoted 81 lines · Heiko Stübner
Quoted 71 lines

Am Sonntag, 1. Mai 2022, 09:06:33 CEST schrieb Johan Jonker:

Quoted 69 lines · Peter Geis
Quoted 55 lines

Add a device tree for the Pine64 Quartz64 Model B single board computer. This board ouputs debug on uart2 and supports the following components:
Gigabit Ethernet
USB2 x2 (one port otg capable)
USB3
PCIe/SATA M2
HDMI
DSI (RPi compatible pinout)
CSI (RPi compatible pinout)
A/B/G/N WiFi
Bluetooth
SDMMC
eMMC
SPI Flash
PI-40 compatible pin header

---
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3566-quartz64-b.dts   | 615 ++++++++++++++++++
 2 files changed, 616 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 4ae9f35434b8..252ee47b8a1d 100644
@@ -59,5 +59,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +15 -0
new file mode 100644
index 000000000000..184ab7e1d178
@@ -0,0 +1,615 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ *
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include "rk3566.dtsi"
+
+/ {
+   model = "Pine64 RK3566 Quartz64-B Board";
+   compatible = "pine64,quartz64-b", "rockchip,rk3566";
+

[..]

arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts line 427

Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts new file +5 -0
+
+&mdio1 {
 
+   rgmii_phy1: ethernet-phy@0 {
+           compatible = "ethernet-phy-ieee802.3-c22";
+           reg = <0x1>;

Hi,

Quoted 8 lines
Quoted 3 lines

The reg value doesn't match the node name. Other 2 boards use "reg = <0>" with label "rgmii_phy1". Could you check?

I do have an older Quartz-B in my boardfarm and in that older devicetree the phy-reg also is "0" instead of the "1" used here.

Is that a hardware-change?

Quoted 8 lines

The ethernet maintainers previously brought up that 0x0 is the broadcast address for the mdio-bus. They requested we put the actual bus id of the phy even on single phy busses. This is the first one I've confirmed the bus address on.

Though I realized ethernet-phy@0 should be ethernet-phy@1 since you mentioned this. Strange dtbs-check doesn't catch this, would you fix it in line Heiko

no that's ok, I can fix that up. Just wanted to clarify what the intention was first :-)

Quoted 8 lines

or do you want another revision?

Quoted 5 lines

Thanks
Heiko

author
#14 lore raw

PATCH v2 6/7 arm64: dts: rockchip: add SoQuartz CM4IO dts

In reply to Peter Geis

This is the initial SoQuartz SoM device tree on a CM4IO carrier board. This board outputs debug on uart2 and supports the following components:
Gigabit Ethernet
USB2 (OTG/Host shared)
PCIe 2.0 x1
HDMI (HDMI Port 0)
eDP (HDMI Port 1)
DSI (RPi compatible pinout)
CSI (RPi compatible pinout)
A/B/G/N WiFi
Bluetooth
SDMMC
eMMC
SPI NOR Flash (Not placed)
PI-40 compatible pin header

---
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 167 +++++
 .../boot/dts/rockchip/rk3566-soquartz.dtsi    | 607 ++++++++++++++++++
 3 files changed, 775 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 252ee47b8a1d..23a2a0c111ac 100644
@@ -60,5 +60,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts new file +167 -0

167 lines not on this page · raw message

arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi new file +607 -0

607 lines not on this page · raw message

Signature · 1 line
2.25.1
#15 lore raw

Re: [PATCH v2 6/7] arm64: dts: rockchip: add SoQuartz CM4IO dts

I love your patch! Yet something to improve:

Hi Peter,

I love your patch! Yet something to improve:

[auto build test ERROR on robh/for-next]
[also build test ERROR on arm/for-next arm64/for-next/core clk/clk-next kvmarm/next shawnguo/for-next soc/for-next v5.18-rc4] [cannot apply to rockchip/for-next xilinx-xlnx/master keystone/next next-20220429]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm64-randconfig-r021-20220428 (https://download.01.org/0day-ci/archive/20220430/[email protected]/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 400775649969b9baf3bc2a510266e7912bb16ae9)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/9c1ec04920cfad39477824908a540d7547dbed23
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433 git checkout 9c1ec04920cfad39477824908a540d7547dbed23
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> Error: arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi:605.1-16 Label or path usb_host0_xhci not found
>> Error: arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts:161.1-16 Label or path usb_host0_xhci not found

FATAL ERROR: Syntax error parsing input tree

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
author
#16 lore raw

PATCH v2 7/7 arm64: dts: rockchip: add dts for Firefly Station M2 rk3566

In reply to Peter Geis

From: Furkan Kardame <[email protected]>

Add dts for Firefly Station M2.
Working IO:
* UART
* LED
* LAN
* Wifi
* SD Card
* eMMC
* USB2

---
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 580 ++++++++++++++++++
 2 files changed, 581 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 23a2a0c111ac..617915c17ca8 100644
@@ -60,6 +60,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts new file +580 -0

580 lines not on this page · raw message

Signature · 1 line
2.25.1
#17 lore raw

Re: [PATCH v2 7/7] arm64: dts: rockchip: add dts for Firefly Station M2 rk3566

Thank you for the patch! Yet something to improve:

Hi Peter,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on robh/for-next]
[also build test ERROR on arm/for-next arm64/for-next/core clk/clk-next kvmarm/next shawnguo/for-next soc/for-next v5.18-rc4] [cannot apply to rockchip/for-next xilinx-xlnx/master keystone/next next-20220429]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm64-randconfig-r021-20220428 (https://download.01.org/0day-ci/archive/20220430/[email protected]/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 400775649969b9baf3bc2a510266e7912bb16ae9)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/8e40f3685ab414fc5e5e003d51b62065a3880b6c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Peter-Geis/Add-support-for-several-new-rk3566-SBCs/20220429-195433 git checkout 8e40f3685ab414fc5e5e003d51b62065a3880b6c
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> Error: arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts:566.1-16 Label or path usb_host0_xhci not found
>> Error: arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts:570.1-16 Label or path usb_host1_xhci not found

FATAL ERROR: Syntax error parsing input tree

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
maintainer Applied
#18 lore raw

Re: (subset) [PATCH v2 0/7] Add support for several new rk3566 SBCs

In reply to Peter Geis
Quoted 6 lines · Peter Geis

The following series adds support for the following single board computers:
- Pine64 Quartz64 Model B
- Pine64 SoQuartz SoM with RPi CM4IO carrier board
- Firefly Station M2

Quoted 7 lines

Patches 1, 2, and 3 add the requisite dt-bindings. Patch 4 adds support for the SFC to the rk356x device tree. Patch 5 adds the Quartz64 Model B device tree. Patch 6 adds the SoQuartz CM4IO device tree.
Patch 7 adds the Firefly Station M2 device tree.

[...]

Applied, thanks!

[4/7] arm64: dts: rockchip: add rk356x sfc support

      commit: 13e0ee34f39c01948a7bbaab0b3c225d9b00a5bb

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>
maintainer Applied
#19 lore raw

Re: (subset) [PATCH v2 0/7] Add support for several new rk3566 SBCs

In reply to Peter Geis
Quoted 6 lines · Peter Geis

The following series adds support for the following single board computers:
- Pine64 Quartz64 Model B
- Pine64 SoQuartz SoM with RPi CM4IO carrier board
- Firefly Station M2

Quoted 7 lines

Patches 1, 2, and 3 add the requisite dt-bindings. Patch 4 adds support for the SFC to the rk356x device tree. Patch 5 adds the Quartz64 Model B device tree. Patch 6 adds the SoQuartz CM4IO device tree.
Patch 7 adds the Firefly Station M2 device tree.

[...]

Applied, thanks!

[1/7] dt-bindings: arm: rockchip: Add Pine64 Quartz64 Model B

      commit: c37415f55bdadffe5b4c0e7981e9fc7e8b96beea
[2/7] dt-bindings: arm: rockchip: Add Pine64 SoQuartz SoM
      commit: c466828fb3ba8cb7f5c3bf28766da9b70bf9745e
[3/7] dt-bindings: arm: rockchip: Add Firefly Station M2
      commit: e52ded5543708e0382f236ce35372a63f4568341
[5/7] arm64: dts: rockchip: add Pine64 Quartz64-B device tree
      commit: dcc8c66bef79befa6c9ebe7d7d62b0ce66983c20
[6/7] arm64: dts: rockchip: add SoQuartz CM4IO dts
      commit: 5859b5a9c3ac92d831bed164374cb837519524ad
[7/7] arm64: dts: rockchip: add dts for Firefly Station M2 rk3566
      commit: 30ac9b4e25d8cece00d32c7419f9d919f55421fe

I've adjusted the styling of comments a bit, also dropped one double newline as well as fixed the node name for the ethernet-phy for QuartzB.

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip