Skip to contentSkip to conversation

Add support for Radxa ROCK Pi S

PATCH Applied Sjoerd Simons 3 participants 6 messages Jun 14, 2022 – Jun 17, 2022

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

v2 cover Add support for Radxa ROCK Pi S

This adds a device-tree for the Radxa Rock Pi S; The first patch was originally submitted a few years back but seems to have stalled. I've adjusted it to sort the device nodes and drop duplication of dtsi properties. The second patch adds support for a bunch of additional peripherals.

Changes in v2:
- Split binding documentation into its own commit

Akash Gajjar (1):
arm64: dts: rockchip: add ROCK Pi S DTS support

Sjoerd Simons (2):
dt-bindings: arm: rockchip: Add Radxa ROCK Pi S
arm64: dts: rockchip: rock-pi-s add more peripherals

 .../devicetree/bindings/arm/rockchip.yaml     |   5 +
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 256 ++++++++++++++++++
 3 files changed, 262 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Signature · 1 line
2.36.1
#1 lore raw

PATCH v2 1/3 dt-bindings: arm: rockchip: Add Radxa ROCK Pi S

Add entry for the Radxa ROCK Pi S board

---

(no changes since v1)

 Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
index cf9eb1e8326a..7811ba64149c 100644
@@ -554,6 +554,11 @@ properties:
           - const: vamrs,rk3399pro-vmarc-som
           - const: rockchip,rk3399pro
 
+      - description: Radxa ROCK Pi S
+        items:
+          - const: radxa,rockpis
+          - const: rockchip,rk3308
+
       - description: Radxa Rock2 Square
         items:
           - const: radxa,rock2-square
Signature · 1 line
2.36.1
#3 lore raw

PATCH v2 2/3 arm64: dts: rockchip: add ROCK Pi S DTS support

In reply to Sjoerd Simons

From: Akash Gajjar <[email protected]>

ROCK Pi S is RK3308 based SBC from radxa.com. ROCK Pi S has a,
- 256MB/512MB DDR3 RAM
- SD, NAND flash (optional on board 1/2/4/8Gb)
- 100MB ethernet, PoE (optional)
- Onboard 802.11 b/g/n wifi + Bluetooth 4.0 Module
- USB2.0 Type-A HOST x1
- USB3.0 Type-C OTG x1
- 26-pin expansion header
- USB Type-C DC 5V Power Supply

This patch enables
- Console
- NAND Flash
- SD Card

[sjoerd: Sort dt nodes, drop properties duplicated from dtsi]

---

(no changes since v1)

 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 204 ++++++++++++++++++
 2 files changed, 205 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 18d00eae3072..ef79a672804a 100644
@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2-of10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-edimm2.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +204 -0

204 lines not on this page · raw message

Signature · 1 line
2.36.1
#4 lore raw

PATCH v2 3/3 arm64: dts: rockchip: rock-pi-s add more peripherals

In reply to Sjoerd Simons

This enables the following peripherals:
* Onboard ethernet support
* Bluetooth
* USB 2 port
* OTG port via type-c connector
* Hardware watchog

Also add aliases for the mmc devices and the ethernet interface

---

(no changes since v1)

 .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +52 -0
index 9095efe25ccd..46ba48b843c5 100644
@@ -11,6 +11,12 @@ / {
 	model = "Radxa ROCK Pi S";
 	compatible = "radxa,rockpis", "rockchip,rk3308";
 
+	aliases {
+		ethernet0 = &gmac;
+		mmc0 = &emmc;
+		mmc1 = &sdmmc;
+	};
+
 	chosen {
 		stdout-path = "serial0:1500000n8";
 	};
@@ -132,6 +138,15 @@ &emmc {
 	status = "okay";
 };
 
+&gmac {
+	clock_in_out = "output";
+	phy-supply = <&vcc_io>;
+	snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	snps,reset-delays-us = <0 50000 50000>;
+	status = "okay";
+};
+
 &i2c1 {
 	status = "okay";
 };
@@ -195,10 +210,47 @@ &sdmmc {
 	status = "okay";
 };
 
+&u2phy {
+	status = "okay";
+
+	u2phy_host: host-port {
+		phy-supply = <&vcc5v0_otg>;
+		status = "okay";
+	};
+
+	u2phy_otg: otg-port {
+		phy-supply = <&vcc5v0_otg>;
+		status = "okay";
+	};
+};
+
 &uart0 {
 	status = "okay";
 };
 
 &uart4 {
 	status = "okay";
+
+	bluetooth {
+		compatible = "realtek,rtl8723bs-bt";
+		device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
+		host-wake-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&usb_host_ehci {
+	status = "okay";
+};
+
+&usb_host_ohci {
+	status = "okay";
+};
+
+&usb20_otg {
+	dr_mode = "peripheral";
+	status = "okay";
+};
+
+&wdt {
+	status = "okay";
 };
Signature · 1 line
2.36.1
maintainer Applied
#5 lore raw
In reply to Sjoerd Simons
Quoted 10 lines · Sjoerd Simons

This adds a device-tree for the Radxa Rock Pi S; The first patch was originally submitted a few years back but seems to have stalled. I've adjusted it to sort the device nodes and drop duplication of dtsi properties. The second patch adds support for a bunch of additional peripherals.

Changes in v2:
- Split binding documentation into its own commit

[...]

Applied, thanks!

[1/3] dt-bindings: arm: rockchip: Add Radxa ROCK Pi S

      commit: 5a86111e9defa367499c932c8e23b03897a97a2b
[2/3] arm64: dts: rockchip: add ROCK Pi S DTS support
      commit: 2e04c25b13206aabb5ffa38632d638c340e5857c

dropped some unneeded double-blank lines from patch2

[3/3] arm64: dts: rockchip: rock-pi-s add more peripherals

      commit: bc3753aed81f6b4a81f3e8bbb32b90f9a8c7cca3

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>