ARM: dts: i.MX6QDL: icore-rqs: Fix eMMC detection during SPL

[oweals/u-boot.git] / arch / arm / dts / uniphier-pro4.dtsi

diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi
index 5f39972f67e9d3b11b3c6217696a8c46922c051c..9b3ce13499b82c8407eb4c40116e296b6f96a3bf 100644 (file)
--- a/arch/arm/dts/uniphier-pro4.dtsi
+++ b/arch/arm/dts/uniphier-pro4.dtsi
@@ -7,6 +7,8 @@
  * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
+#include <dt-bindings/gpio/uniphier-gpio.h>
+
 / {
        compatible = "socionext,uniphier-pro4";
        #address-cells = <1>;
@@ -45,7 +47,7 @@
                        clock-frequency = <25000000>;
                };
 
-               arm_timer_clk: arm_timer_clk {
+               arm_timer_clk: arm-timer {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
                        clock-frequency = <50000000>;
@@ -58,7 +60,6 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-               u-boot,dm-pre-reloc;
 
                l2: l2-cache@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
@@ -81,6 +82,7 @@
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
                        clock-frequency = <73728000>;
+                       resets = <&peri_rst 0>;
                };
 
                serial1: serial@54006900 {
@@ -92,6 +94,7 @@
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
                        clock-frequency = <73728000>;
+                       resets = <&peri_rst 1>;
                };
 
                serial2: serial@54006a00 {
@@ -103,6 +106,7 @@
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
                        clock-frequency = <73728000>;
+                       resets = <&peri_rst 2>;
                };
 
                serial3: serial@54006b00 {
@@ -114,6 +118,7 @@
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
                        clock-frequency = <73728000>;
+                       resets = <&peri_rst 3>;
                };
 
                gpio: gpio@55000000 {
@@ -127,6 +132,7 @@
                        gpio-ranges = <&pinctrl 0 0 0>;
                        gpio-ranges-group-names = "gpio_range";
                        ngpios = <248>;
+                       socionext,interrupt-ranges = <0 48 16>, <16 154 5>;
                };
 
                i2c0: i2c@58780000 {
@@ -139,6 +145,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c0>;
                        clocks = <&peri_clk 4>;
+                       resets = <&peri_rst 4>;
                        clock-frequency = <100000>;
                };
 
@@ -152,6 +159,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c1>;
                        clocks = <&peri_clk 5>;
+                       resets = <&peri_rst 5>;
                        clock-frequency = <100000>;
                };
 
@@ -165,6 +173,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c2>;
                        clocks = <&peri_clk 6>;
+                       resets = <&peri_rst 6>;
                        clock-frequency = <100000>;
                };
 
@@ -178,6 +187,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c3>;
                        clocks = <&peri_clk 7>;
+                       resets = <&peri_rst 7>;
                        clock-frequency = <100000>;
                };
 
@@ -191,6 +201,7 @@
                        #size-cells = <0>;
                        interrupts = <0 25 4>;
                        clocks = <&peri_clk 9>;
+                       resets = <&peri_rst 9>;
                        clock-frequency = <400000>;
                };
 
@@ -202,6 +213,7 @@
                        #size-cells = <0>;
                        interrupts = <0 26 4>;
                        clocks = <&peri_clk 10>;
+                       resets = <&peri_rst 10>;
                        clock-frequency = <400000>;
                };
 
@@ -224,7 +236,6 @@
                        compatible = "socionext,uniphier-pro4-mioctrl",
                                     "simple-mfd", "syscon";
                        reg = <0x59810000 0x800>;
-                       u-boot,dm-pre-reloc;
 
                        mio_clk: clock {
                                compatible = "socionext,uniphier-pro4-mio-clock";
@@ -312,7 +323,8 @@
                        interrupts = <0 80 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb2>;
-                       clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
+                       clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
+                                <&mio_clk 12>;
                        resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
                                 <&mio_rst 12>;
                };
@@ -324,7 +336,8 @@
                        interrupts = <0 81 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb3>;
-                       clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
+                       clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
+                                <&mio_clk 13>;
                        resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
                                 <&mio_rst 13>;
                };
@@ -333,11 +346,9 @@
                        compatible = "socionext,uniphier-pro4-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-pro4-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 
@@ -431,6 +442,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_nand>;
                        clocks = <&sys_clk 2>;
+                       resets = <&sys_rst 2>;
                };
        };
 };