Skip to content

Commit 4177ec9

Browse files
committed
Merge tag 'v7.1-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
Support for the RV1103B SoC and the Onion Omega4 board using it. While the RV1103B only got a B-extension to its name, the SoC internals were reworked heavily. So likely it's mainly pin compatible to the non-B variant. The dt-binding for the RV1103B clock driver is shared with the clock- driver branch going into the clock-tree. * tag 'v7.1-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: Add Onion Omega4 Evaluation Board dt-bindings: arm: rockchip: Add Omega4 Evaluation board ARM: dts: rockchip: Add support for RV1103B dt-bindings: soc: rockchip: grf: Add RV1103B compatibles dt-bindings: clock: rockchip: Add RV1103B CRU support Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2 parents 104f1e3 + 683192d commit 4177ec9

9 files changed

Lines changed: 1496 additions & 0 deletions

File tree

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,12 @@ properties:
813813
- const: netxeon,r89
814814
- const: rockchip,rk3288
815815

816+
- description: Onion Omega4 Evaluation board
817+
items:
818+
- const: onion,omega4-evb
819+
- const: onion,omega4
820+
- const: rockchip,rv1103b
821+
816822
- description: OPEN AI LAB EAIDK-610
817823
items:
818824
- const: openailab,eaidk-610

Documentation/devicetree/bindings/clock/rockchip,rv1126b-cru.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ description:
1717
properties:
1818
compatible:
1919
enum:
20+
- rockchip,rv1103b-cru
2021
- rockchip,rv1126b-cru
2122

2223
reg:

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ properties:
6363
- rockchip,rk3588-vo0-grf
6464
- rockchip,rk3588-vo1-grf
6565
- rockchip,rk3588-vop-grf
66+
- rockchip,rv1103b-ioc
6667
- rockchip,rv1108-usbgrf
6768
- const: syscon
6869
- items:
@@ -98,6 +99,7 @@ properties:
9899
- rockchip,rk3576-pmu0-grf
99100
- rockchip,rk3576-usb2phy-grf
100101
- rockchip,rk3588-usb2phy-grf
102+
- rockchip,rv1103b-pmu-grf
101103
- rockchip,rv1108-grf
102104
- rockchip,rv1108-pmugrf
103105
- rockchip,rv1126-grf
@@ -231,6 +233,7 @@ allOf:
231233
- rockchip,rk3036-grf
232234
- rockchip,rk3308-grf
233235
- rockchip,rk3368-pmugrf
236+
- rockchip,rv1103b-pmu-grf
234237

235238
then:
236239
properties:

arch/arm/boot/dts/rockchip/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
3+
rv1103b-omega4-evb.dtb \
34
rv1108-elgin-r1.dtb \
45
rv1108-evb.dtb \
56
rv1109-relfor-saib.dtb \
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2022 Rockchip Electronics Co., Ltd.
4+
* Copyright (c) 2025 plan44.ch/luz
5+
* Copyright (c) 2026 Onion Corporation
6+
*/
7+
8+
/dts-v1/;
9+
10+
#include <dt-bindings/gpio/gpio.h>
11+
#include <dt-bindings/leds/common.h>
12+
#include "rv1103b-omega4.dtsi"
13+
14+
/ {
15+
model = "Onion Omega4 Evaluation Board";
16+
compatible = "onion,omega4-evb", "onion,omega4", "rockchip,rv1103b";
17+
18+
aliases {
19+
serial0 = &uart0;
20+
};
21+
22+
chosen {
23+
stdout-path = "serial0:115200n8";
24+
};
25+
26+
leds {
27+
compatible = "gpio-leds";
28+
29+
led-0 {
30+
color = <LED_COLOR_ID_BLUE>;
31+
default-state = "on";
32+
function = LED_FUNCTION_STATUS;
33+
gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
34+
label = "sys";
35+
pinctrl-names = "default";
36+
pinctrl-0 = <&led>;
37+
};
38+
};
39+
};
40+
41+
&fspi0 {
42+
status = "okay";
43+
};
44+
45+
&pinctrl {
46+
leds {
47+
led: led {
48+
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
49+
};
50+
};
51+
};
52+
53+
&sdmmc0 {
54+
status = "okay";
55+
};
56+
57+
&sdmmc1 {
58+
status = "okay";
59+
};
60+
61+
&uart0 {
62+
status = "okay";
63+
};
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2022 Rockchip Electronics Co., Ltd.
4+
* Copyright (c) 2025 plan44.ch/luz
5+
* Copyright (c) 2026 Onion Corporation
6+
*/
7+
8+
/dts-v1/;
9+
10+
#include "rv1103b.dtsi"
11+
12+
/ {
13+
sdio_pwrseq: sdio-pwrseq {
14+
compatible = "mmc-pwrseq-simple";
15+
pinctrl-names = "default";
16+
pinctrl-0 = <&wifi_enable_h>;
17+
post-power-on-delay-ms = <300>;
18+
reset-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_LOW>;
19+
};
20+
21+
vcc3v3_sd: vcc3v3-sd {
22+
compatible = "regulator-fixed";
23+
gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
24+
pinctrl-names = "default";
25+
pinctrl-0 = <&sdmmc_pwren>;
26+
regulator-name = "vcc3v3_sd";
27+
regulator-min-microvolt = <3300000>;
28+
regulator-max-microvolt = <3300000>;
29+
};
30+
31+
vccio_sd: vccio-sd {
32+
compatible = "regulator-gpio";
33+
gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
34+
pinctrl-names = "default";
35+
pinctrl-0 = <&sdmmc_volt>;
36+
regulator-name = "vccio_sd";
37+
regulator-min-microvolt = <1800000>;
38+
regulator-max-microvolt = <3300000>;
39+
states = <3300000 1 1800000 0>;
40+
};
41+
};
42+
43+
&uart0 {
44+
bootph-all;
45+
pinctrl-names = "default";
46+
pinctrl-0 = <&uart0m0_xfer>;
47+
};
48+
49+
&fspi0 {
50+
spi_nand: flash@0 {
51+
compatible = "spi-nand";
52+
reg = <0>;
53+
bootph-pre-ram;
54+
bootph-some-ram;
55+
spi-max-frequency = <75000000>;
56+
spi-rx-bus-width = <4>;
57+
spi-tx-bus-width = <1>;
58+
59+
partitions {
60+
compatible = "fixed-partitions";
61+
#address-cells = <1>;
62+
#size-cells = <1>;
63+
64+
partition@0 {
65+
reg = <0x00000000 0x00040000>;
66+
label = "env";
67+
};
68+
69+
partition@40000 {
70+
reg = <0x00040000 0x00100000>;
71+
label = "idblock";
72+
read-only;
73+
};
74+
75+
partition@140000 {
76+
reg = <0x00140000 0x00100000>;
77+
label = "uboot";
78+
read-only;
79+
};
80+
81+
partition@240000 {
82+
reg = <0x00240000 0x00800000>;
83+
label = "boot";
84+
};
85+
86+
partition@a40000 {
87+
reg = <0x00a40000 0x0f5c0000>;
88+
label = "ubi";
89+
};
90+
};
91+
};
92+
};
93+
94+
&sdmmc0 {
95+
bus-width = <4>;
96+
cap-mmc-highspeed;
97+
cap-sd-highspeed;
98+
disable-wp;
99+
no-sdio;
100+
no-mmc;
101+
sd-uhs-sdr104;
102+
vmmc-supply = <&vcc3v3_sd>;
103+
vqmmc-supply = <&vccio_sd>;
104+
status = "disabled";
105+
};
106+
107+
&sdmmc1 {
108+
bus-width = <4>;
109+
cap-sd-highspeed;
110+
cap-sdio-irq;
111+
keep-power-in-suspend;
112+
mmc-pwrseq = <&sdio_pwrseq>;
113+
no-sd;
114+
no-mmc;
115+
non-removable;
116+
pinctrl-names = "default";
117+
pinctrl-0 = <&sdmmc1_cmd &sdmmc1_clk &sdmmc1_bus4>;
118+
status = "disabled";
119+
};
120+
121+
&pinctrl {
122+
sdio-pwrseq {
123+
/omit-if-no-ref/
124+
wifi_enable_h: wifi-enable-h {
125+
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
126+
};
127+
};
128+
129+
sdmmc {
130+
/omit-if-no-ref/
131+
sdmmc_pwren: sdmmc-pwren {
132+
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
133+
};
134+
135+
/omit-if-no-ref/
136+
sdmmc_volt: sdmmc-volt {
137+
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
138+
};
139+
};
140+
141+
wireless-wlan {
142+
/omit-if-no-ref/
143+
wifi_host_wake_irq: wifi-host-wake-irq {
144+
rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
145+
};
146+
};
147+
};

0 commit comments

Comments
 (0)