arm64: dts: rockchip: add ROCK Pi S DTS support
Subsystems (2)
PATCH v4 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 in v4
- remove supports-sd/sdio, nums-slots property
- use vmmc-supply for emmc node
Changes in v3
- Use small S on dts file name
- Add missing semicolon
- Remove USB2.0 node support
Changes in v2
- Use pwm-supply for vdd_core node instead of vi-supply
- Add 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 | 216 ++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
@@ -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
@@ -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 +216 -0
216 lines not on this page · raw message
Signature · 1 line
2.17.1
Hi Akash,
Quoted 188 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 SupplyThis patch enables
- Console
- NAND Flash
- SD Card---
Changes in v4
- remove supports-sd/sdio, nums-slots property
- use vmmc-supply for emmc nodeChanges in v3
- Use small S on dts file name
- Add missing semicolon
- Remove USB2.0 node supportChanges in v2
- Use pwm-supply forvdd_corenode instead of vi-supply
- Add 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 | 216 ++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dtsDocumentation/devicetree/bindings/arm/rockchip.yaml +5
-0@@ -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-squarearch/arm64/boot/dts/rockchip/Makefile +1
-0@@ -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.dtbarch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +118
-0@@ -0,0 +1,216 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar <akash-oRp2ZoJdM/RWk0Htik3J/[email protected]> + * Copyright (c) 2019 Jagan Teki <jagan-oRp2ZoJdM/RWk0Htik3J/[email protected]> + */ + +/dts-v1/; +#include "rk3308.dtsi" + +/ { + model = "Radxa ROCK Pi S"; + compatible = "radxa,rockpis", "rockchip,rk3308"; + + chosen { + stdout-path = "serial0:1500000n8"; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>; + + green-led { + label = "rockpis:green:power"; + gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; + default-state = "on"; + }; + + blue-led { + label = "rockpis:blue:user"; + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + default-state = "on"; + linux,default-trigger = "heartbeat"; + }; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; + }; + + vcc5v0_sys: vcc5v0-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + vdd_core: vdd-core { + compatible = "pwm-regulator"; + pwms = <&pwm0 0 5000 1>; + regulator-name = "vdd_core"; + regulator-min-microvolt = <827000>; + regulator-max-microvolt = <1340000>; + regulator-init-microvolt = <1015000>; + regulator-settling-time-up-us = <250>; + regulator-always-on; + regulator-boot-on; + pwm-supply = <&vcc5v0_sys>; + }; + + vdd_log: vdd-log { + compatible = "regulator-fixed"; + regulator-name = "vdd_log"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc_ddr: vcc-ddr { + compatible = "regulator-fixed"; + regulator-name = "vcc_ddr"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc_1v8: vcc-1v8 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_io>; + }; + + vcc_io: vcc-io { + compatible = "regulator-fixed"; + regulator-name = "vcc_io"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc5v0_otg: vcc5v0-otg { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_otg"; + regulator-always-on; + gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + enable-active-high; + pinctrl-names = "default"; + pinctrl-0 = <&otg_vbus_drv>; + vin-supply = <&vcc5v0_sys>; + }; +}; +
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 127
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +9
-0+&cpu0 { + cpu-supply = <&vdd_core>; +}; + +&emmc { + bus-width = <4>; + cap-mmc-highspeed; + mmc-hs200-1_8v; + disable-wp;
Remove all disable-wp from emmc or sdio controllers.
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 137
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +10
-0+ non-removable; + vmmc-supply = <&vcc_io>; + status = "okay"; +}; + +&i2c1 { + status = "okay"; +}; + +&sdmmc {
Sort nodes alphabetically for someone after you who wants to add a node in a list that is already a mess.
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +1
-0+ bus-width = <4>;
bus-width = <4>;
Already in dtsi.
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +1
-0+ cap-mmc-highspeed;
Only micro SD.
Do we still need cap-mmc-highspeed?
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 141
Quoted 3 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +2
-0+ cap-sd-highspeed; + max-frequeency = <150000000>;
replace max-frequeency by max-frequency max-frequency = <150000000> is already defined in rk3308.dtsi, so remove or change value.
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 144
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +3
-0+ disable-wp; + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>; + card-detect-delay = <800>;
Why do we need this?
Why is this value set to 800? All other dts use 200. What changed in the specifications?
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 148
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +4
-0+ status = "okay"; +}; + +&spi2 {
Sort nodes alphabetically.
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +1
-0+ status = "okay";
status below
Quoted 26 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +26
-0+ 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>;
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 185
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +10
-0+ }; + + wifi_host_wake: wifi-host-wake { + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; +}; + +&pwm0 { + status = "okay";
status below
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 197
Quoted 13 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +12
-0+ pinctrl-0 = <&pwm0_pin_pull_down>; +}; + +&saradc { + vref-supply = <&vcc_1v8>; + status = "okay"; +}; + +&sdio { + #address-cells = <1>; + #size-cells = <0>; + bus-width = <4>;
bus-width = <4>;
Already in dtsi.
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts line 204
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +7
-0+ max-frequency = <1000000>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + sd-uhs-sdr104;
Sort properties.
Keep status below.
Quoted 14 lines
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file +12
-1+ status = "okay"; +}; + +&uart0 { + status = "okay"; +}; + +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_xfer &uart4_rts &uart4_cts>; + status = "okay"; +}; --2.17.1
Rob Herring
maintainerQuoted 30 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 SupplyThis patch enables
- Console
- NAND Flash
- SD Card---
Changes in v4
- remove supports-sd/sdio, nums-slots property
- use vmmc-supply for emmc nodeChanges in v3
- Use small S on dts file name
- Add missing semicolon
- Remove USB2.0 node supportChanges in v2
- Use pwm-supply forvdd_corenode instead of vi-supply
- Add 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 | 216 ++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
Please add Acked-by/Reviewed-by tags when posting new versions. However, there's no need to repost patches *only* to add the tags. The upstream maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.