qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: dts: rk322x: move dm-pre-reloc nodes to *-u-boot.dtsi 

it makes users easy to override their kernel dts when
CONFIG_USING_KERNEL_DTB is disabled.

Change-Id: I0537f3aa0232901c3f506fa86a94bf07881bb06e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2018-10-23 18:10:12 +08:00
parent 99484ec71f
commit a2815bda5f
4 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/dts/rk3229-evb.dts
View File

@ -7,21 +7,13 @@
/dts-v1/;
#include "rk322x.dtsi"
#include "rk322x-u-boot.dtsi"
#include <dt-bindings/input/input.h>
/ {
model = "Rockchip RK3229 Evaluation board";
compatible = "rockchip,rk3229-evb", "rockchip,rk3229";
chosen {
stdout-path = &uart2;
};
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x40000000>;
};
ext_gmac: ext_gmac {
compatible = "fixed-clock";
clock-frequency = <125000000>;
@ -68,7 +60,6 @@
};
&emmc {
u-boot,dm-pre-reloc;
status = "okay";
};
@ -84,7 +75,6 @@
};
&uart2 {
u-boot,dm-pre-reloc;
status = "okay";
};

3
arch/arm/dts/rk3229-gva.dts
View File

@ -7,6 +7,7 @@
/dts-v1/;
#include "rk322x.dtsi"
#include "rk322x-u-boot.dtsi"
#include <dt-bindings/input/input.h>
/ {
@ -288,12 +289,10 @@
};
&emmc {
u-boot,dm-pre-reloc;
status = "okay";
};
&uart2 {
u-boot,dm-pre-reloc;
status = "okay";
};

44
arch/arm/dts/rk322x-u-boot.dtsi Normal file
View File

@ -0,0 +1,44 @@
/*
* (C) Copyright 2018 Rockchip Electronics Co., Ltd
*
* SPDX-License-Identifier: GPL-2.0+
*/
/ {
aliases {
mmc0 = &emmc;
mmc1 = &sdmmc;
};
chosen {
stdout-path = &uart2;
};
};
&cru {
u-boot,dm-pre-reloc;
};
&dmc {
u-boot,dm-pre-reloc;
};
&grf {
u-boot,dm-pre-reloc;
};
&service_msch {
u-boot,dm-pre-reloc;
};
&emmc {
u-boot,dm-pre-reloc;
};
&sdmmc {
u-boot,dm-pre-reloc;
};
&uart2 {
u-boot,dm-pre-reloc;
};

9
arch/arm/dts/rk322x.dtsi
View File

@ -91,6 +91,11 @@
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
};
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x40000000>;
};
timer {
compatible = "arm,armv7-timer";
arm,cpu-registers-not-fw-configured;
@ -166,7 +171,6 @@
};
grf: syscon@11000000 {
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3228-grf", "syscon";
reg = <0x11000000 0x1000>;
#address-cells = <1>;
@ -380,7 +384,6 @@
};
cru: clock-controller@110e0000 {
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3228-cru";
reg = <0x110e0000 0x1000>;
rockchip,grf = <&grf>;
@ -835,7 +838,6 @@
};
dmc: dmc@11200000 {
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3228-dmc", "syscon";
rockchip,cru = <&cru>;
rockchip,grf = <&grf>;
@ -846,7 +848,6 @@
};
service_msch: syscon@31090000 {
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3228-msch", "syscon";
reg = <0x31090000 0x2000>;
};