]> git.baikalelectronics.ru Git - uboot.git/commitdiff
arm: dts: rockchip: move all rk3288 u-boot specific properties in separate dtsi files
authorJohan Jonker <jbx6244@gmail.com>
Fri, 15 Apr 2022 21:21:39 +0000 (23:21 +0200)
committerKever Yang <kever.yang@rock-chips.com>
Mon, 18 Apr 2022 03:25:13 +0000 (11:25 +0800)
In order to sync rk3288.dtsi from Linux it needed to
move all u-boot specific properties in separate dtsi files.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
25 files changed:
arch/arm/dts/rk3288-evb-u-boot.dtsi
arch/arm/dts/rk3288-evb.dts
arch/arm/dts/rk3288-firefly-u-boot.dtsi
arch/arm/dts/rk3288-firefly.dts
arch/arm/dts/rk3288-firefly.dtsi
arch/arm/dts/rk3288-miqi-u-boot.dtsi
arch/arm/dts/rk3288-miqi.dts
arch/arm/dts/rk3288-miqi.dtsi
arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/rk3288-phycore-rdk.dts
arch/arm/dts/rk3288-phycore-som.dtsi
arch/arm/dts/rk3288-popmetal-u-boot.dtsi
arch/arm/dts/rk3288-popmetal.dts
arch/arm/dts/rk3288-rock2-square-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/rk3288-rock2-square.dts
arch/arm/dts/rk3288-u-boot.dtsi
arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/rk3288-veyron-jerry.dts
arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/rk3288-veyron-mickey.dts
arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/rk3288-veyron-minnie.dts
arch/arm/dts/rk3288-veyron-u-boot.dtsi
arch/arm/dts/rk3288-veyron.dtsi
arch/arm/dts/rk3288.dtsi

index 8ac7840f8f9bfad83eaa045bebada130ebed96f9..c8f51207116a988284d525f0fce5535cb551db1f 100644 (file)
@@ -5,6 +5,17 @@
 
 #include "rk3288-u-boot.dtsi"
 
+&dmc {
+       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+               0x8 0x1f4>;
+       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+               0x0 0xc3 0x6 0x2>;
+       rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
+};
+
 &pinctrl {
        u-boot,dm-pre-reloc;
 };
index eac91a873f2a0a5eca494713b0269f88e30e6b4b..bb24a96cddf733c71dd1711c548999b7eb1d1534 100644 (file)
        };
 };
 
-&dmc {
-       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-               0x8 0x1f4>;
-       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-               0x0 0xc3 0x6 0x2>;
-       rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
-};
-
 &pwm1 {
        status = "okay";
 };
index 8b9c38310fbb1d58981618ee6e48081eaac6972c..cc84d7c4ae167816131fc43aec01fafe72c12374 100644 (file)
@@ -5,6 +5,37 @@
 
 #include "rk3288-u-boot.dtsi"
 
+/ {
+       config {
+               u-boot,dm-pre-reloc;
+               u-boot,boot-led = "firefly:green:power";
+       };
+
+       leds {
+               u-boot,dm-pre-reloc;
+
+               work {
+                       u-boot,dm-pre-reloc;
+               };
+
+               power {
+                       u-boot,dm-pre-reloc;
+               };
+       };
+};
+
+&dmc {
+       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+               0x5 0x0>;
+       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+               0xa60 0x40 0x10 0x0>;
+       /* Add a dummy value to cause of-platdata think this is bytes */
+       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
 &pinctrl {
        u-boot,dm-pre-reloc;
 };
index 1cff04e7c7bf364db772cd9a0a643b1ee8f7a548..72982efdf6df3b81f9fc5ac25d42093899df9920 100644 (file)
        chosen {
                stdout-path = &uart2;
        };
-
-       config {
-               u-boot,dm-pre-reloc;
-               u-boot,boot-led = "firefly:green:power";
-       };
-};
-
-&dmc {
-       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-               0x5 0x0>;
-       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-               0xa60 0x40 0x10 0x0>;
-       /* Add a dummy value to cause of-platdata think this is bytes */
-       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 
 &ir {
index b7f279f706f9601953fd77fdee89d0416712183b..1117d3913ed70ac17b56d6b3d998207056adfa6e 100644 (file)
        };
 
        leds {
-               u-boot,dm-pre-reloc;
                compatible = "gpio-leds";
 
                work {
-                       u-boot,dm-pre-reloc;
                        gpios = <&gpio8 1 GPIO_ACTIVE_LOW>;
                        label = "firefly:blue:user";
                        linux,default-trigger = "rc-feedback";
@@ -50,7 +48,6 @@
                };
 
                power {
-                       u-boot,dm-pre-reloc;
                        gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
                        label = "firefly:green:power";
                        linux,default-trigger = "default-on";
index 4f63fc9f13137ae368c34898fc91550a284861b7..2a74fdd15fb1c0d539b65dae1f36ac231e5edde3 100644 (file)
@@ -4,6 +4,26 @@
  */
 
 #include "rk3288-u-boot.dtsi"
+/ {
+       leds {
+               u-boot,dm-pre-reloc;
+
+               work {
+                       u-boot,dm-pre-reloc;
+               };
+       };
+};
+
+&dmc {
+       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+               0x5 0x0>;
+       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+               0xa60 0x40 0x10 0x0>;
+       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
 
 &pinctrl {
        u-boot,dm-pre-reloc;
index e47170c65306ab819946d81cdcb4489a0ecbcd90..4a2f249e1b1f76af9b6f39bb26a3f5c1bbe500b4 100644 (file)
                stdout-path = "serial2:115200n8";
        };
 };
-
-&dmc {
-       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-               0x5 0x0>;
-       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-               0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
index 432f744bebc2c8233acc517fd21989b19b8ac2b5..cb80cbf27dff72045ae271644b4fa7e8a868e21f 100644 (file)
 
 
        leds {
-               u-boot,dm-pre-reloc;
                compatible = "gpio-leds";
 
                work {
-                       u-boot,dm-pre-reloc;
                        gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
                        label = "miqi:green:user";
                        linux,default-trigger = "default-on";
diff --git a/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi b/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi
new file mode 100644 (file)
index 0000000..30f4cb1
--- /dev/null
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-u-boot.dtsi"
+
+&dmc {
+       rockchip,num-channels = <2>;
+       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+               0x5 0x0>;
+       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+               0xa60 0x40 0x10 0x0>;
+       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xe 0xe>;
+       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 5 1>;
+};
+
+&emmc {
+       u-boot,dm-pre-reloc;
+};
+
+&i2c0 {
+       u-boot,dm-pre-reloc;
+
+       rk818: pmic@1c {
+               u-boot,dm-pre-reloc;
+
+               regulators {
+                       u-boot,dm-pre-reloc;
+               };
+       };
+};
+
+&pinctrl {
+       u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+       u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+       u-boot,dm-pre-reloc;
+};
index cc3921095c3cbf7263e01d159d14dbf4c6e1e63e..ebea8e67ead3e882d8ac525de1aaffc3b8717e27 100644 (file)
        };
 };
 
-&dmc {
-       rockchip,num-channels = <2>;
-       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-               0x5 0x0>;
-       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-               0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xe 0xe>;
-       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 5 1>;
-};
-
 &gmac {
        status = "okay";
 };
 };
 
 &pinctrl {
-       u-boot,dm-pre-reloc;
-
        pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {
                bias-pull-up;
                drive-strength = <12>;
 };
 
 &sdmmc {
-       u-boot,dm-pre-reloc;
-
        bus-width = <4>;
        cap-mmc-highspeed;
        cap-sd-highspeed;
 };
 
 &uart2 {
-       u-boot,dm-pre-reloc;
        status = "okay";
 };
 
index 02d11968cb34d01d02142cc5a1acc5325ce28068..821525f7148077c25f7c6fbb7d83eee063d14614 100644 (file)
 
 &emmc {
        status = "okay";
-       u-boot,dm-pre-reloc;
-
        bus-width = <8>;
        cap-mmc-highspeed;
        disable-wp;
 
 &i2c0 {
        status = "okay";
-       u-boot,dm-pre-reloc;
-
        clock-frequency = <400000>;
 
        rk818: pmic@1c {
                rockchip,system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
-               u-boot,dm-pre-reloc;
 
                vcc1-supply = <&vdd_sys>;
                vcc2-supply = <&vdd_sys>;
                vddio-supply = <&vdd_3v3_io>;
 
                regulators {
-                       u-boot,dm-pre-reloc;
                        vdd_log: DCDC_REG1 {
                                regulator-name = "vdd_log";
                                regulator-always-on;
index 8ac7840f8f9bfad83eaa045bebada130ebed96f9..3782253c8aaa5c70247179e46c67897ff900c934 100644 (file)
@@ -5,6 +5,17 @@
 
 #include "rk3288-u-boot.dtsi"
 
+&dmc {
+       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+               0x5 0x0>;
+       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+               0xa60 0x40 0x10 0x0>;
+       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
 &pinctrl {
        u-boot,dm-pre-reloc;
 };
index 5c6d06f2fdbff926f0425518fc1f956108076be5..736dc51e2615f6e3b879fcaf7ec2c0f878ce86ae 100644 (file)
        };
 };
 
-&dmc {
-       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-               0x5 0x0>;
-       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-               0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
 &pwm1 {
        status = "okay";
 };
diff --git a/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi b/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi
new file mode 100644 (file)
index 0000000..509f789
--- /dev/null
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-u-boot.dtsi"
+
+&dmc {
+       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+               0x5 0x0>;
+       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+               0xa60 0x40 0x10 0x0>;
+       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
+&gpio7 {
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+       u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+       u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+       u-boot,dm-pre-reloc;
+};
index 11c580a0b56a34f9f19ded998d542fd671b22241..41676696ba333165ae11039699144b84ad6a75a5 100644 (file)
@@ -96,7 +96,6 @@
 };
 
 &sdmmc {
-       u-boot,dm-pre-reloc;
        bus-width = <4>;
        cap-mmc-highspeed;
        cap-sd-highspeed;
 };
 
 &pinctrl {
-       u-boot,dm-pre-reloc;
        ir {
                ir_int: ir-int {
                        rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_up>;
 
 &uart2 {
        status = "okay";
-       u-boot,dm-pre-reloc;
        reg-shift = <2>;
 };
 
 &usb_host0_ehci {
        status = "okay";
 };
-
-&dmc {
-       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-               0x5 0x0>;
-       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-               0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
-&gpio7 {
-       u-boot,dm-pre-reloc;
-};
index e3c6c10f130cb198d2ea770fc2531b56af35405f..9eb696b1411146e3399c5545415b17a7b1e93c65 100644 (file)
@@ -7,10 +7,53 @@
 #include "rockchip-optee.dtsi"
 
 / {
+       aliases {
+               gpio0 = &gpio0;
+               gpio1 = &gpio1;
+               gpio2 = &gpio2;
+               gpio3 = &gpio3;
+               gpio4 = &gpio4;
+               gpio5 = &gpio5;
+               gpio6 = &gpio6;
+               gpio7 = &gpio7;
+               gpio8 = &gpio8;
+               mmc0 = &emmc;
+               mmc1 = &sdmmc;
+               mmc2 = &sdio0;
+               mmc3 = &sdio1;
+       };
+
        chosen {
                u-boot,spl-boot-order = \
                        "same-as-spl", &emmc, &sdmmc;
        };
+
+       dmc: dmc@ff610000 {
+               compatible = "rockchip,rk3288-dmc", "syscon";
+               reg = <0xff610000 0x3fc
+                      0xff620000 0x294
+                      0xff630000 0x3fc
+                      0xff640000 0x294>;
+               clocks = <&cru PCLK_DDRUPCTL0>, <&cru PCLK_PUBL0>,
+                        <&cru PCLK_DDRUPCTL1>, <&cru PCLK_PUBL1>,
+                        <&cru ARMCLK>;
+               clock-names = "pclk_ddrupctl0", "pclk_publ0",
+                             "pclk_ddrupctl1", "pclk_publ1",
+                             "arm_clk";
+               rockchip,cru = <&cru>;
+               rockchip,grf = <&grf>;
+               rockchip,noc = <&noc>;
+               rockchip,pmu = <&pmu>;
+               rockchip,sgrf = <&sgrf>;
+               rockchip,sram = <&ddr_sram>;
+               u-boot,dm-pre-reloc;
+       };
+
+       noc: syscon@ffac0000 {
+               compatible = "rockchip,rk3288-noc", "syscon";
+               reg = <0xffac0000 0x2000>;
+               u-boot,dm-pre-reloc;
+       };
 };
 
 #ifdef CONFIG_ROCKCHIP_SPI_IMAGE
 };
 #endif
 
-&dmc {
-       u-boot,dm-pre-reloc;
+&bus_intmem {
+       ddr_sram: ddr-sram@1000 {
+               compatible = "rockchip,rk3288-ddr-sram";
+               reg = <0x1000 0x4000>;
+       };
 };
 
-&pmu {
+&cru {
        u-boot,dm-pre-reloc;
 };
 
-&sgrf {
+&gpio7 {
        u-boot,dm-pre-reloc;
 };
 
-&cru {
+&grf {
        u-boot,dm-pre-reloc;
 };
 
-&grf {
+&pmu {
        u-boot,dm-pre-reloc;
 };
 
-&vopb {
+&sgrf {
        u-boot,dm-pre-reloc;
 };
 
-&vopl {
-       u-boot,dm-pre-reloc;
+&uart0 {
+       clock-frequency = <24000000>;
+};
+
+&uart1 {
+       clock-frequency = <24000000>;
 };
 
-&noc {
+&uart2 {
+       clock-frequency = <24000000>;
+};
+
+&uart3 {
+       clock-frequency = <24000000>;
+};
+
+&vopb {
        u-boot,dm-pre-reloc;
 };
 
-&gpio7 {
+&vopl {
        u-boot,dm-pre-reloc;
 };
diff --git a/arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi
new file mode 100644 (file)
index 0000000..2cc6b09
--- /dev/null
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+       rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
+               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+               0x5 0x0>;
+       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+               0xa60 0x40 0x10 0x0>;
+       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
index c251d9d59424d5e40d98abec4623dfa45ce830aa..ff7669eba4d54df473cd2b6afe99d7cee52c7993 100644 (file)
        };
 };
 
-&dmc {
-       rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
-               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-               0x5 0x0>;
-       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-               0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
 &gpio_keys {
        power {
                gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi
new file mode 100644 (file)
index 0000000..213a46b
--- /dev/null
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+               0x8 0x1f4>;
+       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+               0x0 0xc3 0x6 0x2>;
+       rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 1>;
+};
index e0dc3620618bf1afae94ceaf9c075f88b2d3aa46..0521d9e0e9a28c2a052cd710ea803fbdfb4720f8 100644 (file)
        };
 };
 
-&dmc {
-       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-               0x8 0x1f4>;
-       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-               0x0 0xc3 0x6 0x2>;
-       rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 1>;
-};
-
 &emmc {
        /delete-property/mmc-hs200-1_8v;
 };
diff --git a/arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi
new file mode 100644 (file)
index 0000000..8211da4
--- /dev/null
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+               0x8 0x1f4>;
+       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+               0x0 0xc3 0x6 0x1>;
+       rockchip,sdram-params = <0x20d266a4 0x5b6 6 533000000 6 13 0>;
+};
index 646f6ae74240e18eebd7c0a41872766f8a168811..b56a3f4f51afbe58790fde24e107b8937b3b8577 100644 (file)
        power-supply = <&backlight_regulator>;
 };
 
-&dmc {
-       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-               0x8 0x1f4>;
-       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-               0x0 0xc3 0x6 0x1>;
-       rockchip,sdram-params = <0x20d266a4 0x5b6 6 533000000 6 13 0>;
-};
-
 &emmc {
        /delete-property/mmc-hs200-1_8v;
 };
index 899fe6e7a0489fcdcee035504b45cc04d31ae8ea..21e1aec29112bb7975978ca17b24742da54314d0 100644 (file)
@@ -5,7 +5,68 @@
 
 #include "rk3288-u-boot.dtsi"
 
+/ {
+       chosen {
+               u-boot,spl-boot-order = &spi_flash;
+       };
+};
+
+&dmc {
+       logic-supply = <&vdd_logic>;
+       rockchip,odt-disable-freq = <333000000>;
+       rockchip,dll-disable-freq = <333000000>;
+       rockchip,sr-enable-freq = <333000000>;
+       rockchip,pd-enable-freq = <666000000>;
+       rockchip,auto-self-refresh-cnt = <0>;
+       rockchip,auto-power-down-cnt = <64>;
+       rockchip,ddr-speed-bin = <21>;
+       rockchip,trcd = <10>;
+       rockchip,trp = <10>;
+       operating-points = <
+               /* KHz    uV */
+               200000 1050000
+               333000 1100000
+               533000 1150000
+               666000 1200000
+       >;
+};
+
+&gpio3 {
+       u-boot,dm-pre-reloc;
+};
+
 &gpio7 {
        u-boot,dm-pre-reloc;
 };
 
+&gpio8 {
+       u-boot,dm-pre-reloc;
+};
+
+&i2c0 {
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+       u-boot,dm-pre-reloc;
+};
+
+&rk808 {
+       u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+       u-boot,dm-pre-reloc;
+};
+
+&spi2 {
+       u-boot,dm-pre-reloc;
+};
+
+&spi_flash {
+       u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+       u-boot,dm-pre-reloc;
+};
index 8754043b9b37626dddd756b9a2e01371e09e5563..4a9c27a49e2bfe93a1dec95f3b4a78fc99a202e5 100644 (file)
@@ -16,7 +16,6 @@
 
        chosen {
                stdout-path = &uart2;
-               u-boot,spl-boot-order = &spi_flash;
        };
 
        firmware {
        cpu0-supply = <&vdd_cpu>;
 };
 
-&dmc {
-       logic-supply = <&vdd_logic>;
-       rockchip,odt-disable-freq = <333000000>;
-       rockchip,dll-disable-freq = <333000000>;
-       rockchip,sr-enable-freq = <333000000>;
-       rockchip,pd-enable-freq = <666000000>;
-       rockchip,auto-self-refresh-cnt = <0>;
-       rockchip,auto-power-down-cnt = <64>;
-       rockchip,ddr-speed-bin = <21>;
-       rockchip,trcd = <10>;
-       rockchip,trp = <10>;
-       operating-points = <
-               /* KHz    uV */
-               200000 1050000
-               333000 1100000
-               533000 1150000
-               666000 1200000
-       >;
-};
-
 &efuse {
        status = "okay";
 };
 
 &spi2 {
        status = "okay";
-       u-boot,dm-pre-reloc;
 
        spi_flash: spiflash@0 {
-               u-boot,dm-pre-reloc;
                compatible = "spidev", "jedec,spi-nor";
                spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */
                reg = <0>;
        clock-frequency = <400000>;
        i2c-scl-falling-time-ns = <50>;         /* 2.5ns measured */
        i2c-scl-rising-time-ns = <100>;         /* 45ns measured */
-       u-boot,dm-pre-reloc;
 
        rk808: pmic@1b {
                compatible = "rockchip,rk808";
                rockchip,system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
-               u-boot,dm-pre-reloc;
 
                vcc1-supply = <&vcc33_sys>;
                vcc2-supply = <&vcc33_sys>;
 
 &uart2 {
        status = "okay";
-       u-boot,dm-pre-reloc;
        reg-shift = <2>;
 };
 
 };
 
 &pinctrl {
-       u-boot,dm-pre-reloc;
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <
                /* Common for sleep and wake, but no owners */
        assigned-clocks = <&cru SCLK_USBPHY480M_SRC>;
        assigned-clock-parents = <&cru SCLK_OTGPHY0>;
 };
-
-&sdmmc {
-       u-boot,dm-pre-reloc;
-};
-
-&gpio3 {
-       u-boot,dm-pre-reloc;
-};
-
-&gpio8 {
-       u-boot,dm-pre-reloc;
-};
index 2086dbfda444355e8787c6c216d24cfad176ef34..c4abfa3702cc4021345be20fc4ddfe89061531c1 100644 (file)
 
        interrupt-parent = <&gic>;
        aliases {
-               gpio0 = &gpio0;
-               gpio1 = &gpio1;
-               gpio2 = &gpio2;
-               gpio3 = &gpio3;
-               gpio4 = &gpio4;
-               gpio5 = &gpio5;
-               gpio6 = &gpio6;
-               gpio7 = &gpio7;
-               gpio8 = &gpio8;
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
                i2c4 = &i2c4;
                i2c5 = &i2c5;
-               mmc0 = &emmc;
-               mmc1 = &sdmmc;
-               mmc2 = &sdio0;
-               mmc3 = &sdio1;
                mshc0 = &emmc;
                mshc1 = &sdmmc;
                mshc2 = &sdio0;
                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               clock-frequency = <24000000>;
                clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
                clock-names = "baudclk", "apb_pclk";
                pinctrl-names = "default";
                interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               clock-frequency = <24000000>;
                clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
                clock-names = "baudclk", "apb_pclk";
                pinctrl-names = "default";
                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               clock-frequency = <24000000>;
                clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
                clock-names = "baudclk", "apb_pclk";
                pinctrl-names = "default";
                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               clock-frequency = <24000000>;
                clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
                clock-names = "baudclk", "apb_pclk";
                pinctrl-names = "default";
                interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               clock-frequency = <24000000>;
                clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
                clock-names = "baudclk", "apb_pclk";
                pinctrl-names = "default";
                status = "disabled";
        };
 
-       dmc: dmc@ff610000 {
-               compatible = "rockchip,rk3288-dmc", "syscon";
-               rockchip,cru = <&cru>;
-               rockchip,grf = <&grf>;
-               rockchip,pmu = <&pmu>;
-               rockchip,sgrf = <&sgrf>;
-               rockchip,noc = <&noc>;
-               reg = <0xff610000 0x3fc
-                      0xff620000 0x294
-                      0xff630000 0x3fc
-                      0xff640000 0x294>;
-               rockchip,sram = <&ddr_sram>;
-               clocks = <&cru PCLK_DDRUPCTL0>, <&cru PCLK_PUBL0>,
-                        <&cru PCLK_DDRUPCTL1>, <&cru PCLK_PUBL1>,
-                        <&cru ARMCLK>;
-               clock-names = "pclk_ddrupctl0", "pclk_publ0",
-                             "pclk_ddrupctl1", "pclk_publ1",
-                             "arm_clk";
-       };
-
        i2c0: i2c@ff650000 {
                compatible = "rockchip,rk3288-i2c";
                reg = <0xff650000 0x1000>;
                status = "disabled";
        };
 
-       bus_intmem@ff700000 {
+       bus_intmem: bus_intmem@ff700000 {
                compatible = "mmio-sram";
                reg = <0xff700000 0x18000>;
                #address-cells = <1>;
                        compatible = "rockchip,rk3066-smp-sram";
                        reg = <0x00 0x10>;
                };
-               ddr_sram: ddr-sram@1000 {
-                       compatible = "rockchip,rk3288-ddr-sram";
-                       reg = <0x1000 0x4000>;
-               };
        };
 
        sram@ff720000 {
                status = "disabled";
        };
 
-       noc: syscon@ffac0000 {
-               compatible = "rockchip,rk3288-noc", "syscon";
-               reg = <0xffac0000 0x2000>;
-       };
-
        efuse: efuse@ffb40000 {
                compatible = "rockchip,rk3288-efuse";
                reg = <0xffb40000 0x10000>;