ARM: tegra: fdt: Add 'non-removable' property to all eMMC nodes

[u-boot] / arch / arm / dts / uniphier-ph1-sld3.dtsi

diff --git a/arch/arm/dts/uniphier-ph1-sld3.dtsi b/arch/arm/dts/uniphier-ph1-sld3.dtsi
index 91c9ba527f33da087c0e036702af513fc9f4c52a..a554b086e8164bd1fcb81119c94d5a0dbf56a0c7 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld3.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld3.dtsi
@@ -42,12 +42,6 @@
                        clock-frequency = <50000000>;
                };
 
-               uart_clk: uart_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-clock";
-                       clock-frequency = <36864000>;
-               };
-
                iobus_clk: iobus_clk {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
@@ -61,12 +55,7 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-
-               extbus: extbus {
-                       compatible = "simple-bus";
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-               };
+               u-boot,dm-pre-reloc;
 
                timer@20000200 {
                        compatible = "arm,cortex-a9-global-timer";
@@ -95,7 +84,8 @@
                        status = "disabled";
                        reg = <0x54006800 0x40>;
                        interrupts = <0 33 4>;
-                       clocks = <&uart_clk>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_uart0>;
                        clock-frequency = <36864000>;
                };
 
@@ -104,7 +94,8 @@
                        status = "disabled";
                        reg = <0x54006900 0x40>;
                        interrupts = <0 35 4>;
-                       clocks = <&uart_clk>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_uart1>;
                        clock-frequency = <36864000>;
                };
 
@@ -113,10 +104,123 @@
                        status = "disabled";
                        reg = <0x54006a00 0x40>;
                        interrupts = <0 37 4>;
-                       clocks = <&uart_clk>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_uart2>;
                        clock-frequency = <36864000>;
                };
 
+               port0x: gpio@55000008 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000008 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port1x: gpio@55000010 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000010 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port2x: gpio@55000018 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000018 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port3x: gpio@55000020 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000020 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port4: gpio@55000028 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000028 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port5x: gpio@55000030 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000030 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port6x: gpio@55000038 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000038 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port7x: gpio@55000040 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000040 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port8x: gpio@55000048 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000048 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port9x: gpio@55000050 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000050 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port10x: gpio@55000058 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000058 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port11x: gpio@55000060 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000060 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port12x: gpio@55000068 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000068 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port13x: gpio@55000070 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000070 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port14x: gpio@55000078 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000078 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
+               port16x: gpio@55000088 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000088 0x8>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+
                i2c0: i2c@58400000 {
                        compatible = "socionext,uniphier-i2c";
                        status = "disabled";
@@ -124,6 +228,8 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <0 41 1>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_i2c0>;
                        clocks = <&iobus_clk>;
                        clock-frequency = <100000>;
                };
@@ -172,18 +278,59 @@
                        clock-frequency = <400000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system_bus: system-bus@58c00000 {
+                       compatible = "socionext,uniphier-system-bus";
+                       reg = <0x58c00000 0x400>;
+                       #address-cells = <2>;
+                       #size-cells = <1>;
                };
 
-               mio: mioctrl@59810000 {
-                       compatible = "socionext,ph1-sld3-mioctrl";
+               smpctrl@59800000 {
+                       compatible = "socionext,uniphier-smpctrl";
+                       reg = <0x59801000 0x400>;
+               };
+
+               mioctrl@59810000 {
+                       compatible = "socionext,uniphier-mioctrl",
+                                    "simple-mfd", "syscon";
                        reg = <0x59810000 0x800>;
-                       #clock-cells = <1>;
-                       clock-names = "stdmac", "ehci";
-                       clocks = <&sysctrl 10>, <&sysctrl 18>;
+                       u-boot,dm-pre-reloc;
+
+                       mio_clk: clock {
+                               compatible = "socionext,uniphier-sld3-mio-clock";
+                               #clock-cells = <1>;
+                               u-boot,dm-pre-reloc;
+                       };
+
+                       mio_rst: reset {
+                               compatible = "socionext,uniphier-sld3-mio-reset";
+                               #reset-cells = <1>;
+                       };
+               };
+
+               emmc: sdhc@5a400000 {
+                       compatible = "socionext,uniphier-sdhc";
+                       status = "disabled";
+                       reg = <0x5a400000 0x200>;
+                       interrupts = <0 78 4>;
+                       pinctrl-names = "default", "1.8v";
+                       pinctrl-0 = <&pinctrl_emmc>;
+                       pinctrl-1 = <&pinctrl_emmc_1v8>;
+                       clocks = <&mio_clk 1>;
+                       bus-width = <8>;
+                       non-removable;
+               };
+
+               sd: sdhc@5a500000 {
+                       compatible = "socionext,uniphier-sdhc";
+                       status = "disabled";
+                       reg = <0x5a500000 0x200>;
+                       interrupts = <0 76 4>;
+                       pinctrl-names = "default", "1.8v";
+                       pinctrl-0 = <&pinctrl_sd>;
+                       pinctrl-1 = <&pinctrl_sd_1v8>;
+                       clocks = <&mio_clk 0>;
+                       bus-width = <4>;
                };
 
                usb0: usb@5a800100 {
@@ -191,6 +338,9 @@
                        status = "disabled";
                        reg = <0x5a800100 0x100>;
                        interrupts = <0 80 4>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb0>;
+                       clocks = <&mio_clk 3>, <&mio_clk 6>;
                };
 
                usb1: usb@5a810100 {
@@ -198,6 +348,9 @@
                        status = "disabled";
                        reg = <0x5a810100 0x100>;
                        interrupts = <0 81 4>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb1>;
+                       clocks = <&mio_clk 4>, <&mio_clk 6>;
                };
 
                usb2: usb@5a820100 {
@@ -205,6 +358,9 @@
                        status = "disabled";
                        reg = <0x5a820100 0x100>;
                        interrupts = <0 82 4>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb2>;
+                       clocks = <&mio_clk 5>, <&mio_clk 6>;
                };
 
                usb3: usb@5a830100 {
@@ -212,14 +368,41 @@
                        status = "disabled";
                        reg = <0x5a830100 0x100>;
                        interrupts = <0 83 4>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb3>;
+                       clocks = <&mio_clk 7>, <&mio_clk 6>;
                };
 
-               sysctrl: sysctrl@f1840000 {
-                       compatible = "socionext,ph1-sld3-sysctrl";
+               soc-glue@5f800000 {
+                       compatible = "simple-mfd", "syscon";
+                       reg = <0x5f800000 0x2000>;
+                       u-boot,dm-pre-reloc;
+
+                       pinctrl: pinctrl {
+                               compatible = "socionext,uniphier-sld3-pinctrl";
+                               u-boot,dm-pre-reloc;
+                       };
+               };
+
+               aidet@f1830000 {
+                       compatible = "simple-mfd", "syscon";
+                       reg = <0xf1830000 0x200>;
+               };
+
+               sysctrl@f1840000 {
+                       compatible = "socionext,uniphier-sysctrl",
+                                    "simple-mfd", "syscon";
                        reg = <0xf1840000 0x4000>;
-                       #clock-cells = <1>;
-                       clock-names = "ref";
-                       clocks = <&refclk>;
+
+                       sys_clk: clock {
+                               compatible = "socionext,uniphier-sld3-clock";
+                               #clock-cells = <1>;
+                       };
+
+                       sys_rst: reset {
+                               compatible = "socionext,uniphier-sld3-reset";
+                               #reset-cells = <1>;
+                       };
                };
 
                nand: nand@f8000000 {
@@ -229,3 +412,5 @@
                };
        };
 };
+
+/include/ "uniphier-pinctrl.dtsi"