Skip to contentSkip to conversation

arm64: dts: rockchip: add ROCK Pi S DTS support

PATCH Superseded Akash Gajjar 4 participants 4 messages Dec 30, 2019 – Jan 6, 2020

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm64: dts: rockchip: add ROCK Pi S DTS support

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

---
Changes for v2
- Use pwm-supply for vdd_core node instead of vi-supply
- Add USB2.0 node support

Changes for v3
- Use small S on dts file name
- Add missing semicolon
- Remove USB2.0 node support

 .../devicetree/bindings/arm/rockchip.yaml     |   5 +
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 221 ++++++++++++++++++
 3 files changed, 227 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
index d9847b306b83..48d40c928d45 100644
@@ -422,6 +422,11 @@ properties:
           - const: radxa,rockpi4
           - const: rockchip,rk3399
 
+      - description: Radxa ROCK Pi S
+        items:
+          - const: radxa,rockpis
+          - const: rockchip,rk3308
+
       - description: Radxa Rock2 Square
         items:
           - const: radxa,rock2-square
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 48fb631d5451..e56a5527bab4 100644
@@ -2,6 +2,7 @@
 dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.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) += rk3328-a1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +221 -0

221 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer Reviewed-by on v3 1/1
#1 lore raw
Quoted 26 lines · Akash Gajjar

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

---
Changes for v2
- Use pwm-supply for vdd_core node instead of vi-supply
- Add USB2.0 node support

Changes for v3
- Use small S on dts file name
- Add missing semicolon
- Remove USB2.0 node support

Quoted 6 lines
 .../devicetree/bindings/arm/rockchip.yaml     |   5 +
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 221 ++++++++++++++++++
 3 files changed, 227 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Reviewed-by Rob Herring
#2 lore raw

Hi,

Question for Rob Herring.
See my comments at version 2.
What is the reason that the non valid/existent node options supports-sd, supports-sd max-frequeency num-slots and disable-wp together with the many style issues are accepted?

Thanks.

Quoted 26 lines · Akash Gajjar

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

Signed-off-by Akash Gajjar <akash at openedev.com>

---
Changes for v2
- Use pwm-supply for vdd_core node instead of vi-supply
- Add USB2.0 node support

Changes for v3
- Use small S on dts file name
- Add missing semicolon
- Remove USB2.0 node support

Quoted 6 lines
 .../devicetree/bindings/arm/rockchip.yaml     |   5 +
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 221 ++++++++++++++++++
 3 files changed, 227 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Reviewed-by Rob Herring <robh at kernel.org>
maintainer
#3 lore raw
In reply to Akash Gajjar

Hi Akash,

Am Montag, 30. Dezember 2019, 15:49:32 CET schrieb Akash Gajjar:

Quoted 18 lines

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

+&emmc {

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 127

Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +4 -0
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+	supports-sd;

supports-sd is not a property

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 130

Quoted 3 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +3 -0
+	disable-wp;
+	non-removable;
+	num-slots = <1>;

nums-slots was removed very long ago

Review

Quoted 1 line
(quoted diff) +1 -0
+	vin-supply = <&vcc_io>;

please provide actual vmmc and vqmmc supplies
vin is not a valid supply for emmcs

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 144

Quoted 13 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +13 -0
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&sdmmc {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	max-frequeency = <150000000>;
+	supports-sd;

supports-sd is not a valid property

Review

Quoted 2 lines
(quoted diff) +2 -0
+	disable-wp;
+	num-slots = <1>;

again, obsolete num-slots

Quoted 49 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +49 -0
+	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>;
+	card-detect-delay = <800>;
+	status = "okay";
+};
+
+&spi2 {
+	status = "okay";
+	max-freq = <10000000>;
+};
+
+&pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&rtc_32k>;
+
+	leds {
+		green_led_gio: green-led-gpio {
+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		heartbeat_led_gpio: heartbeat-led-gpio {
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	usb {
+		otg_vbus_drv: otg-vbus-drv {
+			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	sdio-pwrseq {
+		wifi_enable_h: wifi-enable-h {
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		wifi_host_wake: wifi-host-wake {
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+};
+
+&pwm0 {
+	status = "okay";
+	pinctrl-0 = <&pwm0_pin_pull_down>;
+};
+
+&saradc {
+	vref-supply = <&vcc_1v8>;
+	status = "okay";

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 205

Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +10 -0
+};
+
+&sdio {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	bus-width = <4>;
+	max-frequency = <1000000>;
+	cap-sd-highspeed;
+	cap-sdio-irq;
+	supports-sdio;

not a valid property

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 211

Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +6 -0
+	keep-power-in-suspend;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	non-removable;
+	sd-uhs-sdr104;
+	status = "okay";
+};

Heiko