colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: rockchip: update rk3188-radxarock.dts

Browse Source 
In the Linux DT the file rk3xxx.dtsi is shared between
rk3066 and rk3188. Both rk3xxx.dtsi and rk3188.dtsi have recently
had some updates.
For a future rk3066 support in U-boot this file must also update.
Move U-boot specific things in a rk3188-radxarock-u-boot.dtsi file.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Johan Jonker
2021-06-25 15:26:33 +02:00
committed by Kever Yang
parent 7d4b5a850e
commit d2a74ec91b
2 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
arch/arm/dts/rk3188-radxarock-u-boot.dtsi
View File

@@ -5,12 +5,36 @@
#include "rk3188-u-boot.dtsi" #include "rk3188-u-boot.dtsi"
/ {
chosen {
/* stdout-path = &uart2; */
stdout-path = "serial2:115200n8";
};
config {
u-boot,boot-led = "rock:red:power";
u-boot,dm-pre-reloc;
};
};
&cru { &cru {
u-boot,dm-spl; u-boot,dm-spl;
}; };
&pinctrl { &dmc {
u-boot,dm-spl; rockchip,pctl-timing = <0x12c 0xc8 0x1f4 0x1e 0x4e 0x4 0x69 0x6
0x3 0x0 0x6 0x5 0xc 0x10 0x6 0x4
0x4 0x5 0x4 0x200 0x3 0xa 0x40 0x0
0x1 0x5 0x5 0x3 0xc 0x1e 0x100 0x0
0x4 0x0>;
rockchip,phy-timing = <0x208c6690 0x690878 0x10022a00
0x220 0x40 0x0 0x0>;
rockchip,sdram-params = <0x24716310 0 2 300000000 3 9 0>;
};
&emmc {
fifo-mode;
max-frequency = <16000000>;
}; };
&mmc0 { &mmc0 {
@@ -23,18 +47,16 @@
max-frequency = <16000000>; max-frequency = <16000000>;
}; };
&emmc { &pinctrl {
fifo-mode;
max-frequency = <16000000>;
};
&uart2 {
status = "okay";
u-boot,dm-spl; u-boot,dm-spl;
}; };
&timer3 { &timer3 {
compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer"; compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer";
u-boot,dm-spl;
clock-frequency = <24000000>; clock-frequency = <24000000>;
u-boot,dm-spl;
};
&uart2 {
u-boot,dm-spl;
}; };

88
arch/arm/dts/rk3188-radxarock.dts
View File

@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0+ OR X11 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/* /*
* Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de> * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>
*/ */
@@ -16,17 +16,7 @@
mmc0 = &mmc0; mmc0 = &mmc0;
}; };
chosen { memory@60000000 {
/* stdout-path = &uart2; */
stdout-path = "serial2:115200n8";
};
config {
u-boot,dm-pre-reloc;
u-boot,boot-led = "rock:red:power";
};
memory {
device_type = "memory"; device_type = "memory";
reg = <0x60000000 0x80000000>; reg = <0x60000000 0x80000000>;
}; };
@@ -36,7 +26,7 @@
autorepeat; autorepeat;
power { power {
gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
@@ -48,21 +38,21 @@
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
green { green_led: led-0 {
label = "rock:green:user1"; label = "rock:green:user1";
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
blue { blue_led: led-1 {
label = "rock:blue:user2"; label = "rock:blue:user2";
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
sleep { sleep_led: led-2 {
label = "rock:red:power"; label = "rock:red:power";
gpios = <&gpio0 15 0>; gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
}; };
@@ -84,7 +74,7 @@
ir_recv: gpio-ir-receiver { ir_recv: gpio-ir-receiver {
compatible = "gpio-ir-receiver"; compatible = "gpio-ir-receiver";
gpios = <&gpio0 10 1>; gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_recv_pin>; pinctrl-0 = <&ir_recv_pin>;
}; };
@@ -92,7 +82,7 @@
vcc_otg: usb-otg-regulator { vcc_otg: usb-otg-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PD7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&otg_vbus_drv>; pinctrl-0 = <&otg_vbus_drv>;
regulator-name = "otg-vbus"; regulator-name = "otg-vbus";
@@ -107,7 +97,7 @@
regulator-name = "sdmmc-supply"; regulator-name = "sdmmc-supply";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio3 1 GPIO_ACTIVE_LOW>; gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_pwr>; pinctrl-0 = <&sdmmc_pwr>;
startup-delay-us = <100000>; startup-delay-us = <100000>;
@@ -117,7 +107,7 @@
vcc_host: usb-host-regulator { vcc_host: usb-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 3 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&host_vbus_drv>; pinctrl-0 = <&host_vbus_drv>;
regulator-name = "host-pwr"; regulator-name = "host-pwr";
@@ -136,17 +126,6 @@
}; };
}; };
&dmc {
rockchip,pctl-timing = <0x12c 0xc8 0x1f4 0x1e 0x4e 0x4 0x69 0x6
0x3 0x0 0x6 0x5 0xc 0x10 0x6 0x4
0x4 0x5 0x4 0x200 0x3 0xa 0x40 0x0
0x1 0x5 0x5 0x3 0xc 0x1e 0x100 0x0
0x4 0x0>;
rockchip,phy-timing = <0x208c6690 0x690878 0x10022a00
0x220 0x40 0x0 0x0>;
rockchip,sdram-params = <0x24716310 0 2 300000000 3 9 0>;
};
&emac { &emac {
status = "okay"; status = "okay";
@@ -159,12 +138,28 @@
phy0: ethernet-phy@0 { phy0: ethernet-phy@0 {
reg = <0>; reg = <0>;
interrupt-parent = <&gpio3>; interrupt-parent = <&gpio3>;
interrupts = <26 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
}; };
}; };
&cpu0 { &cpu0 {
cpu0-supply = <&vdd_arm>; cpu-supply = <&vdd_arm>;
};
&cpu1 {
cpu-supply = <&vdd_arm>;
};
&cpu2 {
cpu-supply = <&vdd_arm>;
};
&cpu3 {
cpu-supply = <&vdd_arm>;
};
&gpu {
status = "okay";
}; };
&i2c1 { &i2c1 {
@@ -175,7 +170,7 @@
compatible = "haoyu,hym8563"; compatible = "haoyu,hym8563";
reg = <0x51>; reg = <0x51>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PB5 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rtc_int>; pinctrl-0 = <&rtc_int>;
#clock-cells = <0>; #clock-cells = <0>;
@@ -287,7 +282,6 @@
}; };
&mmc0 { &mmc0 {
num-slots = <1>;
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>; pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
@@ -318,40 +312,40 @@
act8846 { act8846 {
act8846_dvs0_ctl: act8846-dvs0-ctl { act8846_dvs0_ctl: act8846-dvs0-ctl {
rockchip,pins = <RK_GPIO3 27 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <3 RK_PD3 RK_FUNC_GPIO &pcfg_output_low>;
}; };
}; };
hym8563 { hym8563 {
rtc_int: rtc-int { rtc_int: rtc-int {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
lan8720a { lan8720a {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <RK_GPIO3 26 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
ir-receiver { ir-receiver {
ir_recv_pin: ir-recv-pin { ir_recv_pin: ir-recv-pin {
rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sd0 { sd0 {
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <RK_GPIO3 1 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <2 31 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
@@ -368,6 +362,10 @@
status = "okay"; status = "okay";
}; };
&uart2 {
status = "okay";
};
&uart3 { &uart3 {
status = "okay"; status = "okay";
}; };