Skip to content

Commit 9acf372

Browse files
trinitrini
committed
Merge tag 'u-boot-rockchip-20220418' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Add rk3066 SoC support; - Add rk3066 MK808 board support; - dts sync from kernel for rk322x, rk3288; - some other board level config update;
2 parents aec75a3 + dcaaefd commit 9acf372

File tree

123 files changed

+5570
-596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+5570
-596
lines changed

‎arch/arm/dts/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ dtb-$(CONFIG_ROCKCHIP_PX30) += \
9090
dtb-$(CONFIG_ROCKCHIP_RK3036) += \
9191
rk3036-sdk.dtb
9292

93+
dtb-$(CONFIG_ROCKCHIP_RK3066) += \
94+
rk3066a-mk808.dtb
95+
9396
dtb-$(CONFIG_ROCKCHIP_RK3128) += \
9497
rk3128-evb.dtb
9598

‎arch/arm/dts/rk3066a-mk808-u-boot.dtsi

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
#include "rk3066a-u-boot.dtsi"
4+
5+
/ {
6+
config {
7+
u-boot,boot-led = "mk808:blue:power";
8+
};
9+
};
10+
11+
&cru {
12+
u-boot,dm-pre-reloc;
13+
};
14+
15+
&dmc {
16+
compatible = "rockchip,rk3066-dmc", "syscon";
17+
rockchip,pctl-timing = <0x12c 0xc8 0x1f4 0x1e 0x4e 0x4 0x69 0x6
18+
0x3 0x0 0x6 0x5 0xc 0x10 0x6 0x4
19+
0x4 0x5 0x4 0x200 0x3 0xa 0x40 0x0
20+
0x1 0x5 0x5 0x3 0xc 0x1e 0x100 0x0
21+
0x4 0x0>;
22+
rockchip,phy-timing = <0x208c6690 0x690878 0x10022a00
23+
0x220 0x40 0x0 0x0>;
24+
rockchip,sdram-params = <0x24716310 0 2 300000000 3 9 0>;
25+
};
26+
27+
&mmc0 {
28+
fifo-mode;
29+
max-frequency = <4000000>;
30+
u-boot,dm-spl;
31+
u-boot,spl-fifo-mode;
32+
};
33+
34+
&mmc1 {
35+
status = "disabled";
36+
};
37+
38+
&noc {
39+
compatible = "rockchip,rk3066-noc", "syscon";
40+
};
41+
42+
&timer2 {
43+
clock-frequency = <24000000>;
44+
u-boot,dm-pre-reloc;
45+
};
46+
47+
&uart2 {
48+
u-boot,dm-pre-reloc;
49+
};

‎arch/arm/dts/rk3066a-mk808.dts

+216
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2016 Paweł Jarosz <[email protected]>
4+
*/
5+
6+
/dts-v1/;
7+
#include <dt-bindings/input/input.h>
8+
#include "rk3066a.dtsi"
9+
10+
/ {
11+
model = "Rikomagic MK808";
12+
compatible = "rikomagic,mk808", "rockchip,rk3066a";
13+
14+
aliases {
15+
mmc0 = &mmc0;
16+
mmc1 = &mmc1;
17+
};
18+
19+
chosen {
20+
stdout-path = "serial2:115200n8";
21+
};
22+
23+
memory@60000000 {
24+
reg = <0x60000000 0x40000000>;
25+
device_type = "memory";
26+
};
27+
28+
adc-keys {
29+
compatible = "adc-keys";
30+
io-channels = <&saradc 1>;
31+
io-channel-names = "buttons";
32+
keyup-threshold-microvolt = <2500000>;
33+
poll-interval = <100>;
34+
35+
recovery {
36+
label = "recovery";
37+
linux,code = <KEY_VENDOR>;
38+
press-threshold-microvolt = <0>;
39+
};
40+
};
41+
42+
gpio-leds {
43+
compatible = "gpio-leds";
44+
45+
blue_led: led-0 {
46+
label = "mk808:blue:power";
47+
gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
48+
default-state = "off";
49+
linux,default-trigger = "default-on";
50+
};
51+
};
52+
53+
hdmi_con {
54+
compatible = "hdmi-connector";
55+
type = "c";
56+
57+
port {
58+
hdmi_con_in: endpoint {
59+
remote-endpoint = <&hdmi_out_con>;
60+
};
61+
};
62+
};
63+
64+
vcc_2v5: vcc-2v5 {
65+
compatible = "regulator-fixed";
66+
regulator-name = "vcc_2v5";
67+
regulator-min-microvolt = <2500000>;
68+
regulator-max-microvolt = <2500000>;
69+
};
70+
71+
vcc_io: vcc-io {
72+
compatible = "regulator-fixed";
73+
regulator-name = "vcc_io";
74+
regulator-min-microvolt = <3300000>;
75+
regulator-max-microvolt = <3300000>;
76+
};
77+
78+
vcc_host: usb-host-regulator {
79+
compatible = "regulator-fixed";
80+
enable-active-high;
81+
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
82+
pinctrl-0 = <&host_drv>;
83+
pinctrl-names = "default";
84+
regulator-always-on;
85+
regulator-name = "host-pwr";
86+
regulator-min-microvolt = <5000000>;
87+
regulator-max-microvolt = <5000000>;
88+
startup-delay-us = <100000>;
89+
vin-supply = <&vcc_io>;
90+
};
91+
92+
vcc_otg: usb-otg-regulator {
93+
compatible = "regulator-fixed";
94+
enable-active-high;
95+
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
96+
pinctrl-0 = <&otg_drv>;
97+
pinctrl-names = "default";
98+
regulator-always-on;
99+
regulator-name = "vcc_otg";
100+
regulator-min-microvolt = <5000000>;
101+
regulator-max-microvolt = <5000000>;
102+
startup-delay-us = <100000>;
103+
vin-supply = <&vcc_io>;
104+
};
105+
106+
vcc_sd: sdmmc-regulator {
107+
compatible = "regulator-fixed";
108+
gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
109+
pinctrl-0 = <&sdmmc_pwr>;
110+
pinctrl-names = "default";
111+
regulator-name = "vcc_sd";
112+
regulator-min-microvolt = <3300000>;
113+
regulator-max-microvolt = <3300000>;
114+
startup-delay-us = <100000>;
115+
vin-supply = <&vcc_io>;
116+
};
117+
118+
vcc_wifi: sdio-regulator {
119+
compatible = "regulator-fixed";
120+
enable-active-high;
121+
gpio = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
122+
pinctrl-0 = <&wifi_pwr>;
123+
pinctrl-names = "default";
124+
regulator-name = "vcc_wifi";
125+
regulator-min-microvolt = <3300000>;
126+
regulator-max-microvolt = <3300000>;
127+
startup-delay-us = <100000>;
128+
vin-supply = <&vcc_io>;
129+
};
130+
};
131+
132+
&hdmi {
133+
status = "okay";
134+
};
135+
136+
&hdmi_in_vop1 {
137+
status = "disabled";
138+
};
139+
140+
&hdmi_out {
141+
hdmi_out_con: endpoint {
142+
remote-endpoint = <&hdmi_con_in>;
143+
};
144+
};
145+
146+
&mmc0 {
147+
bus-width = <4>;
148+
cap-mmc-highspeed;
149+
cap-sd-highspeed;
150+
vmmc-supply = <&vcc_sd>;
151+
status = "okay";
152+
};
153+
154+
&mmc1 {
155+
bus-width = <4>;
156+
non-removable;
157+
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
158+
pinctrl-names = "default";
159+
vmmc-supply = <&vcc_wifi>;
160+
status = "okay";
161+
};
162+
163+
&pinctrl {
164+
usb-host {
165+
host_drv: host-drv {
166+
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_default>;
167+
};
168+
};
169+
170+
usb-otg {
171+
otg_drv: otg-drv {
172+
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_default>;
173+
};
174+
};
175+
176+
sdmmc {
177+
sdmmc_pwr: sdmmc-pwr {
178+
rockchip,pins = <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_default>;
179+
};
180+
};
181+
182+
sdio {
183+
wifi_pwr: wifi-pwr {
184+
rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
185+
};
186+
};
187+
};
188+
189+
&saradc {
190+
vref-supply = <&vcc_2v5>;
191+
status = "okay";
192+
};
193+
194+
&uart2 {
195+
status = "okay";
196+
};
197+
198+
&usb_host {
199+
status = "okay";
200+
};
201+
202+
&usb_otg {
203+
status = "okay";
204+
};
205+
206+
&usbphy {
207+
status = "okay";
208+
};
209+
210+
&vop0 {
211+
status = "okay";
212+
};
213+
214+
&wdt {
215+
status = "okay";
216+
};

‎arch/arm/dts/rk3066a-u-boot.dtsi

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0+
2+
3+
#include "rockchip-u-boot.dtsi"
4+
#include "rk3xxx-u-boot.dtsi"

0 commit comments

Comments
 (0)