rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi
PATCH 1/3 rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi
The u-boot specific pieces in the dts files should be in u-boot.dtsi not the main files, this allows easier sync with upstream. The rk3399.dtsi has a mix of both so move them all for consistency.
--- arch/arm/dts/rk3399-u-boot.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/rk3399.dtsi | 11 --------- 2 files changed, 44 insertions(+), 11 deletions(-)
arch/arm/dts/rk3399-u-boot.dtsi +44 -0
@@ -3,10 +3,46 @@ * Copyright (C) 2019 Jagan Teki <[email protected]> */ +&cic { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&pmu { + u-boot,dm-pre-reloc; +}; + &pmu { u-boot,dm-pre-reloc; }; +&pmucrc { + u-boot,dm-pre-reloc; +}; + +&pmusgrf { + u-boot,dm-pre-reloc; +}; + +&sdhci { + u-boot,dm-pre-reloc; +}; + &sdmmc { u-boot,dm-pre-reloc; };
@@ -22,3 +58,11 @@ &uart2 { u-boot,dm-pre-reloc; }; + +&vopb { + u-boot,dm-pre-reloc; +}; + +&vopl { + u-boot,dm-pre-reloc; +};
arch/arm/dts/rk3399.dtsi +0 -11
@@ -275,7 +275,6 @@ }; sdhci: sdhci at fe330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; reg = <0x0 0xfe330000 0x0 0x10000>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1072,7 +1071,6 @@ }; pmugrf: syscon at ff320000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xff320000 0x0 0x1000>;
@@ -1083,7 +1081,6 @@ }; pmusgrf: syscon at ff330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmusgrf", "syscon"; reg = <0x0 0xff330000 0x0 0xe3d4>; };
@@ -1204,7 +1201,6 @@ }; cic: syscon at ff620000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cic", "syscon"; reg = <0x0 0xff620000 0x0 0x100>; };
@@ -1219,7 +1215,6 @@ }; dmc: dmc { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc"; devfreq-events = <&dfi>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1268,7 +1263,6 @@ }; pmucru: pmu-clock-controller at ff750000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmucru"; reg = <0x0 0xff750000 0x0 0x1000>; rockchip,grf = <&pmugrf>;
@@ -1279,7 +1273,6 @@ }; cru: clock-controller at ff760000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cru"; reg = <0x0 0xff760000 0x0 0x1000>; rockchip,grf = <&grf>;
@@ -1310,7 +1303,6 @@ }; grf: syscon at ff770000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0x0 0xff770000 0x0 0x10000>; #address-cells = <1>;
@@ -1520,7 +1512,6 @@ }; vopl: vop at ff8f0000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-lit"; reg = <0x0 0xff8f0000 0x0 0x3efc>; interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1578,7 +1569,6 @@ }; vopb: vop at ff900000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-big"; reg = <0x0 0xff900000 0x0 0x3efc>; interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1818,7 +1808,6 @@ }; pinctrl: pinctrl { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pinctrl"; rockchip,grf = <&grf>; rockchip,pmu = <&pmugrf>;
Signature · 1 line
2.23.0
PATCH 2/3 rockchip: dts: rk3399-evb: move u-boot, spl-boot-order to to the u-boot.dtsi
The u-boot specific device tree directives should be in u-boot.dtsi
--- arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-evb.dts | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/dts/rk3399-evb-u-boot.dtsi +6 -0
@@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = &sdhci, &sdmmc; + }; +};
arch/arm/dts/rk3399-evb.dts +0 -2
@@ -15,8 +15,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = \ - &sdhci, &sdmmc; }; vdd_center: vdd-center {
Signature · 1 line
2.23.0
PATCH 2/3 rockchip: dts: rk3399-evb: move u-boot, spl-boot-order to to the u-boot.dtsi
Quoted 3 lines · Peter Robinson
The u-boot specific device tree directives should be in
u-boot.dtsiSigned-off-by Peter Robinson <[email protected]>
Thanks,
- Kever
Quoted 32 lines
--- arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-evb.dts | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-)arch/arm/dts/rk3399-evb-u-boot.dtsi +6
-0@@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = &sdhci, &sdmmc; + }; +};arch/arm/dts/rk3399-evb.dts +0
-2@@ -15,8 +15,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = \ - &sdhci, &sdmmc; }; vdd_center: vdd-center {
PATCH 2/3 rockchip: dts: rk3399-evb: move u-boot, spl-boot-order to to the u-boot.dtsi【请注意,邮件由[email protected]代发】
Quoted 7 lines · Kever Yang
Quoted 3 lines · Peter Robinson
The u-boot specific device tree directives should be in
u-boot.dtsiSigned-off-by Peter Robinson <[email protected]>Reviewed-by Kever Yang <[email protected]>
Applied to u-boot-rockchip master.
Thanks,
- Kever
Quoted 39 lines
Thanks,
- KeverQuoted 24 lines
---
arch/arm/dts/rk3399-evb-u-boot.dtsi| 6 ++++++
arch/arm/dts/rk3399-evb.dts | 2 --2 files changed, 6 insertions(+), 2 deletions(-)arch/arm/dts/rk3399-evb-u-boot.dtsi +6
-0@@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = &sdhci, &sdmmc; + }; +};arch/arm/dts/rk3399-evb.dts +0
-0arch/arm/dts/rk3399-evb.dts line 18
Quoted 6 lines
arch/arm/dts/rk3399-evb.dts +0
-2@@ -15,8 +15,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = \ - &sdhci, &sdmmc; }; vdd_center: vdd-center {_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 3/3 rockchip: dts: rk3399-firefly: move u-boot, spl-boot-order to to the u-boot.dtsi
In reply to Peter RobinsonThe u-boot specific device tree directives should be in u-boot.dtsi
--- arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-firefly.dts | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/dts/rk3399-firefly-u-boot.dtsi +6 -0
@@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; + }; +};
arch/arm/dts/rk3399-firefly.dts +0 -1
@@ -14,7 +14,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; backlight: backlight {
Signature · 1 line
2.23.0
PATCH 3/3 rockchip: dts: rk3399-firefly: move u-boot, spl-boot-order to to the u-boot.dtsi
Quoted 3 lines · Peter Robinson
The u-boot specific device tree directives should be in
u-boot.dtsiSigned-off-by Peter Robinson <[email protected]>
Thanks,
- Kever
Quoted 31 lines
--- arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-firefly.dts | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)arch/arm/dts/rk3399-firefly-u-boot.dtsi +6
-0@@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; + }; +};arch/arm/dts/rk3399-firefly.dts +0
-1@@ -14,7 +14,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; backlight: backlight {
PATCH 3/3 rockchip: dts: rk3399-firefly: move u-boot, spl-boot-order to to the u-boot.dtsi【请注意,邮件由[email protected]代发】
Quoted 7 lines · Kever Yang
Quoted 3 lines · Peter Robinson
The u-boot specific device tree directives should be in
u-boot.dtsiSigned-off-by Peter Robinson <[email protected]>Reviewed-by Kever Yang <[email protected]>
Applied to u-boot-rockchip master.
Thanks,
- Kever
Quoted 39 lines
Thanks,
- KeverQuoted 25 lines
---
arch/arm/dts/rk3399-firefly-u-boot.dtsi| 6 ++++++ arch/arm/dts/rk3399-firefly.dts | 1 -2 files changed, 6 insertions(+), 1 deletion(-)arch/arm/dts/rk3399-firefly-u-boot.dtsi +6
-0@@ -5,3 +5,9 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" + +/ { + chosen { + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; + }; +};arch/arm/dts/rk3399-firefly.dts +0
-0arch/arm/dts/rk3399-firefly.dts line 17
Quoted 5 lines
arch/arm/dts/rk3399-firefly.dts +0
-1@@ -14,7 +14,6 @@ chosen { stdout-path = &uart2; - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; backlight: backlight {_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 1/3 rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi
In reply to Peter RobinsonQuoted 5 lines · Peter Robinson
The u-boot specific pieces in the dts files should be in
u-boot.dtsinot the main files, this allows easier sync with upstream. Therk3399.dtsihas a mix of both so move them all for consistency.Signed-off-by Peter Robinson <[email protected]>
Thanks,
- Kever
Quoted 160 lines
--- arch/arm/dts/rk3399-u-boot.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/rk3399.dtsi | 11 --------- 2 files changed, 44 insertions(+), 11 deletions(-)arch/arm/dts/rk3399-u-boot.dtsi +44
-0@@ -3,10 +3,46 @@ * Copyright (C) 2019 Jagan Teki <[email protected]> */ +&cic { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&pmu { + u-boot,dm-pre-reloc; +}; + &pmu { u-boot,dm-pre-reloc; }; +&pmucrc { + u-boot,dm-pre-reloc; +}; + +&pmusgrf { + u-boot,dm-pre-reloc; +}; + +&sdhci { + u-boot,dm-pre-reloc; +}; + &sdmmc { u-boot,dm-pre-reloc; };@@ -22,3 +58,11 @@ &uart2 { u-boot,dm-pre-reloc; }; + +&vopb { + u-boot,dm-pre-reloc; +}; + +&vopl { + u-boot,dm-pre-reloc; +};arch/arm/dts/rk3399.dtsi +0
-11@@ -275,7 +275,6 @@ }; sdhci: sdhci at fe330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; reg = <0x0 0xfe330000 0x0 0x10000>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1072,7 +1071,6 @@ }; pmugrf: syscon at ff320000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xff320000 0x0 0x1000>;@@ -1083,7 +1081,6 @@ }; pmusgrf: syscon at ff330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmusgrf", "syscon"; reg = <0x0 0xff330000 0x0 0xe3d4>; };@@ -1204,7 +1201,6 @@ }; cic: syscon at ff620000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cic", "syscon"; reg = <0x0 0xff620000 0x0 0x100>; };@@ -1219,7 +1215,6 @@ }; dmc: dmc { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc"; devfreq-events = <&dfi>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1268,7 +1263,6 @@ }; pmucru: pmu-clock-controller at ff750000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmucru"; reg = <0x0 0xff750000 0x0 0x1000>; rockchip,grf = <&pmugrf>;@@ -1279,7 +1273,6 @@ }; cru: clock-controller at ff760000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cru"; reg = <0x0 0xff760000 0x0 0x1000>; rockchip,grf = <&grf>;@@ -1310,7 +1303,6 @@ }; grf: syscon at ff770000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0x0 0xff770000 0x0 0x10000>; #address-cells = <1>;@@ -1520,7 +1512,6 @@ }; vopl: vop at ff8f0000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-lit"; reg = <0x0 0xff8f0000 0x0 0x3efc>; interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1578,7 +1569,6 @@ }; vopb: vop at ff900000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-big"; reg = <0x0 0xff900000 0x0 0x3efc>; interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1818,7 +1808,6 @@ }; pinctrl: pinctrl { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pinctrl"; rockchip,grf = <&grf>; rockchip,pmu = <&pmugrf>;
PATCH 1/3 rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi
Quoted 10 lines · Kever Yang
Quoted 5 lines · Peter Robinson
The u-boot specific pieces in the dts files should be in
u-boot.dtsinot the main files, this allows easier sync with upstream. Therk3399.dtsihas a mix of both so move them all for consistency.Signed-off-by Peter Robinson <[email protected]>Reviewed-by Kever Yang <[email protected]>
This has a typo in it, it's a simple fix (see below), do you want me to send another version or can you fix it up inline?
Quoted 43 lines
Thanks,
- KeverQuoted 41 lines
--- arch/arm/dts/rk3399-u-boot.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/rk3399.dtsi | 11 --------- 2 files changed, 44 insertions(+), 11 deletions(-)arch/arm/dts/rk3399-u-boot.dtsi +24
-0@@ -3,10 +3,46 @@ * Copyright (C) 2019 Jagan Teki <[email protected]> */ +&cic { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&pmu { + u-boot,dm-pre-reloc; +}; + &pmu { u-boot,dm-pre-reloc; };
Quoted 1 line
arch/arm/dts/rk3399-u-boot.dtsi line 34
Quoted 1 line
arch/arm/dts/rk3399-u-boot.dtsi +1
-0+&pmucrc {
The above should be &pmucru not crc. Basically s/pmucrc/pmucru/
Quoted 120 lines
Quoted 118 lines
arch/arm/dts/rk3399-u-boot.dtsi +19
-0+ u-boot,dm-pre-reloc; +}; + +&pmusgrf { + u-boot,dm-pre-reloc; +}; + +&sdhci { + u-boot,dm-pre-reloc; +}; + &sdmmc { u-boot,dm-pre-reloc; };@@ -22,3 +58,11 @@ &uart2 { u-boot,dm-pre-reloc; }; + +&vopb { + u-boot,dm-pre-reloc; +}; + +&vopl { + u-boot,dm-pre-reloc; +};arch/arm/dts/rk3399.dtsi +0
-11@@ -275,7 +275,6 @@ }; sdhci: sdhci at fe330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; reg = <0x0 0xfe330000 0x0 0x10000>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1072,7 +1071,6 @@ }; pmugrf: syscon at ff320000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xff320000 0x0 0x1000>;@@ -1083,7 +1081,6 @@ }; pmusgrf: syscon at ff330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmusgrf", "syscon"; reg = <0x0 0xff330000 0x0 0xe3d4>; };@@ -1204,7 +1201,6 @@ }; cic: syscon at ff620000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cic", "syscon"; reg = <0x0 0xff620000 0x0 0x100>; };@@ -1219,7 +1215,6 @@ }; dmc: dmc { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc"; devfreq-events = <&dfi>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1268,7 +1263,6 @@ }; pmucru: pmu-clock-controller at ff750000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmucru"; reg = <0x0 0xff750000 0x0 0x1000>; rockchip,grf = <&pmugrf>;@@ -1279,7 +1273,6 @@ }; cru: clock-controller at ff760000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cru"; reg = <0x0 0xff760000 0x0 0x1000>; rockchip,grf = <&grf>;@@ -1310,7 +1303,6 @@ }; grf: syscon at ff770000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0x0 0xff770000 0x0 0x10000>; #address-cells = <1>;@@ -1520,7 +1512,6 @@ }; vopl: vop at ff8f0000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-lit"; reg = <0x0 0xff8f0000 0x0 0x3efc>; interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1578,7 +1569,6 @@ }; vopb: vop at ff900000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-big"; reg = <0x0 0xff900000 0x0 0x3efc>; interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1818,7 +1808,6 @@ }; pinctrl: pinctrl { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pinctrl"; rockchip,grf = <&grf>; rockchip,pmu = <&pmugrf>;
PATCH 1/3 rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi
Quoted 11 lines · Peter Robinson
Quoted 8 lines · Kever Yang
Quoted 5 lines · Peter Robinson
The u-boot specific pieces in the dts files should be in
u-boot.dtsinot the main files, this allows easier sync with upstream. Therk3399.dtsihas a mix of both so move them all for consistency.Signed-off-by Peter Robinson <[email protected]>Reviewed-by Kever Yang <[email protected]>This has a typo in it, it's a simple fix (see below), do you want me to send another version or can you fix it up inline?
Applied to u-boot-rockchip master with typo fix.
Thanks,
- Kever
Quoted 166 lines
Quoted 44 lines
Thanks,
- KeverQuoted 41 lines
--- arch/arm/dts/rk3399-u-boot.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/rk3399.dtsi | 11 --------- 2 files changed, 44 insertions(+), 11 deletions(-)arch/arm/dts/rk3399-u-boot.dtsi +24
-0@@ -3,10 +3,46 @@ * Copyright (C) 2019 Jagan Teki <[email protected]> */ +&cic { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&pmu { + u-boot,dm-pre-reloc; +}; + &pmu { u-boot,dm-pre-reloc; };Quoted 1 line
arch/arm/dts/rk3399-u-boot.dtsi line 34
Quoted 1 line
arch/arm/dts/rk3399-u-boot.dtsi +1
-0+&pmucrc {The above should be &pmucru not crc. Basically s/pmucrc/pmucru/
Quoted 119 lines
Quoted 118 lines
arch/arm/dts/rk3399-u-boot.dtsi +19
-0+ u-boot,dm-pre-reloc; +}; + +&pmusgrf { + u-boot,dm-pre-reloc; +}; + +&sdhci { + u-boot,dm-pre-reloc; +}; + &sdmmc { u-boot,dm-pre-reloc; };@@ -22,3 +58,11 @@ &uart2 { u-boot,dm-pre-reloc; }; + +&vopb { + u-boot,dm-pre-reloc; +}; + +&vopl { + u-boot,dm-pre-reloc; +};arch/arm/dts/rk3399.dtsi +0
-11@@ -275,7 +275,6 @@ }; sdhci: sdhci at fe330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; reg = <0x0 0xfe330000 0x0 0x10000>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1072,7 +1071,6 @@ }; pmugrf: syscon at ff320000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xff320000 0x0 0x1000>;@@ -1083,7 +1081,6 @@ }; pmusgrf: syscon at ff330000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmusgrf", "syscon"; reg = <0x0 0xff330000 0x0 0xe3d4>; };@@ -1204,7 +1201,6 @@ }; cic: syscon at ff620000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cic", "syscon"; reg = <0x0 0xff620000 0x0 0x100>; };@@ -1219,7 +1215,6 @@ }; dmc: dmc { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc"; devfreq-events = <&dfi>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1268,7 +1263,6 @@ }; pmucru: pmu-clock-controller at ff750000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmucru"; reg = <0x0 0xff750000 0x0 0x1000>; rockchip,grf = <&pmugrf>;@@ -1279,7 +1273,6 @@ }; cru: clock-controller at ff760000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-cru"; reg = <0x0 0xff760000 0x0 0x1000>; rockchip,grf = <&grf>;@@ -1310,7 +1303,6 @@ }; grf: syscon at ff770000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0x0 0xff770000 0x0 0x10000>; #address-cells = <1>;@@ -1520,7 +1512,6 @@ }; vopl: vop at ff8f0000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-lit"; reg = <0x0 0xff8f0000 0x0 0x3efc>; interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1578,7 +1569,6 @@ }; vopb: vop at ff900000 { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-vop-big"; reg = <0x0 0xff900000 0x0 0x3efc>; interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;@@ -1818,7 +1808,6 @@ }; pinctrl: pinctrl { - u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pinctrl"; rockchip,grf = <&grf>; rockchip,pmu = <&pmugrf>;