projects / oweals / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge git://git.denx.de/u-boot-usb
[oweals/u-boot.git] / arch / arm / dts / uniphier-ld4.dtsi
diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi
index b81603820a828c02ddb9979fd96efebb6af6b221..1eebc7fa3bee50971ea303bdbedca951d9afa8e3 100644 (file)
--- a/arch/arm/dts/uniphier-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ld4.dtsi
@@ -1,11 +1,11 @@
-/*
- * Device Tree Source for UniPhier LD4 SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD4 SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+#include <dt-bindings/gpio/uniphier-gpio.h>
 
 / {
        compatible = "socionext,uniphier-ld4";
@@ -37,7 +37,7 @@
                        clock-frequency = <24576000>;
                };
 
-               arm_timer_clk: arm_timer_clk {
+               arm_timer_clk: arm-timer {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
                        clock-frequency = <50000000>;
@@ -50,9 +50,8 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-               u-boot,dm-pre-reloc;
 
-               l2: l2-cache@500c0000 {
+               l2: cache-controller@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
                        reg = <0x500c0000 0x2000>, <0x503c0100 0x4>,
                              <0x506c0000 0x400>;
@@ -64,6 +63,17 @@
                        cache-level = <2>;
                };
 
+               spi: spi@54006000 {
+                       compatible = "socionext,uniphier-scssi";
+                       status = "disabled";
+                       reg = <0x54006000 0x100>;
+                       interrupts = <0 39 4>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_spi0>;
+                       clocks = <&peri_clk 11>;
+                       resets = <&peri_rst 11>;
+               };
+
                serial0: serial@54006800 {
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
@@ -72,7 +82,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <36864000>;
+                       resets = <&peri_rst 0>;
                };
 
                serial1: serial@54006900 {
@@ -83,7 +93,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <36864000>;
+                       resets = <&peri_rst 1>;
                };
 
                serial2: serial@54006a00 {
@@ -94,7 +104,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <36864000>;
+                       resets = <&peri_rst 2>;
                };
 
                serial3: serial@54006b00 {
@@ -105,7 +115,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <36864000>;
+                       resets = <&peri_rst 3>;
                };
 
                gpio: gpio@55000000 {
@@ -119,6 +129,7 @@
                        gpio-ranges = <&pinctrl 0 0 0>;
                        gpio-ranges-group-names = "gpio_range";
                        ngpios = <136>;
+                       socionext,interrupt-ranges = <0 48 13>, <14 62 2>;
                };
 
                i2c0: i2c@58400000 {
@@ -131,6 +142,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c0>;
                        clocks = <&peri_clk 4>;
+                       resets = <&peri_rst 4>;
                        clock-frequency = <100000>;
                };
 
@@ -144,6 +156,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c1>;
                        clocks = <&peri_clk 5>;
+                       resets = <&peri_rst 5>;
                        clock-frequency = <100000>;
                };
 
@@ -157,6 +170,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c2>;
                        clocks = <&peri_clk 6>;
+                       resets = <&peri_rst 6>;
                        clock-frequency = <400000>;
                };
 
@@ -170,6 +184,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c3>;
                        clocks = <&peri_clk 7>;
+                       resets = <&peri_rst 7>;
                        clock-frequency = <100000>;
                };
 
@@ -220,17 +235,29 @@
                        };
                };
 
-               sd: sdhc@5a400000 {
-                       compatible = "socionext,uniphier-sdhc";
+               dmac: dma-controller@5a000000 {
+                       compatible = "socionext,uniphier-mio-dmac";
+                       reg = <0x5a000000 0x1000>;
+                       interrupts = <0 68 4>, <0 68 4>, <0 69 4>, <0 70 4>,
+                                    <0 71 4>, <0 72 4>, <0 73 4>;
+                       clocks = <&mio_clk 7>;
+                       resets = <&mio_rst 7>;
+                       #dma-cells = <1>;
+               };
+
+               sd: mmc@5a400000 {
+                       compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a400000 0x200>;
                        interrupts = <0 76 4>;
-                       pinctrl-names = "default", "1.8v";
+                       pinctrl-names = "default", "uhs";
                        pinctrl-0 = <&pinctrl_sd>;
-                       pinctrl-1 = <&pinctrl_sd_1v8>;
+                       pinctrl-1 = <&pinctrl_sd_uhs>;
                        clocks = <&mio_clk 0>;
                        reset-names = "host", "bridge";
                        resets = <&mio_rst 0>, <&mio_rst 3>;
+                       dma-names = "rx-tx";
+                       dmas = <&dmac 4>;
                        bus-width = <4>;
                        cap-sd-highspeed;
                        sd-uhs-sdr12;
@@ -238,21 +265,22 @@
                        sd-uhs-sdr50;
                };
 
-               emmc: sdhc@5a500000 {
-                       compatible = "socionext,uniphier-sdhc";
+               emmc: mmc@5a500000 {
+                       compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a500000 0x200>;
                        interrupts = <0 78 4>;
-                       pinctrl-names = "default", "1.8v";
+                       pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_emmc>;
-                       pinctrl-1 = <&pinctrl_emmc_1v8>;
                        clocks = <&mio_clk 1>;
-                       reset-names = "host", "bridge";
-                       resets = <&mio_rst 1>, <&mio_rst 4>;
+                       reset-names = "host", "bridge", "hw";
+                       resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
+                       dma-names = "rx-tx";
+                       dmas = <&dmac 6>;
                        bus-width = <8>;
-                       non-removable;
                        cap-mmc-highspeed;
                        cap-mmc-hw-reset;
+                       non-removable;
                };
 
                usb0: usb@5a800100 {
@@ -262,9 +290,11 @@
                        interrupts = <0 80 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>;
-                       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>;
+                       has-transaction-translator;
                };
 
                usb1: usb@5a810100 {
@@ -274,9 +304,11 @@
                        interrupts = <0 81 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb1>;
-                       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>;
+                       has-transaction-translator;
                };
 
                usb2: usb@5a820100 {
@@ -286,20 +318,38 @@
                        interrupts = <0 82 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb2>;
-                       clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
+                       clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
+                                <&mio_clk 14>;
                        resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
                                 <&mio_rst 14>;
+                       has-transaction-translator;
                };
 
                soc-glue@5f800000 {
                        compatible = "socionext,uniphier-ld4-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-ld4-pinctrl";
-                               u-boot,dm-pre-reloc;
+                       };
+               };
+
+               soc-glue@5f900000 {
+                       compatible = "socionext,uniphier-ld4-soc-glue-debug",
+                                    "simple-mfd";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0x5f900000 0x2000>;
+
+                       efuse@100 {
+                               compatible = "socionext,uniphier-efuse";
+                               reg = <0x100 0x28>;
+                       };
+
+                       efuse@130 {
+                               compatible = "socionext,uniphier-efuse";
+                               reg = <0x130 0x8>;
                        };
                };
 
@@ -325,7 +375,7 @@
                        interrupt-controller;
                };
 
-               aidet: aidet@61830000 {
+               aidet: interrupt-controller@61830000 {
                        compatible = "socionext,uniphier-ld4-aidet";
                        reg = <0x61830000 0x200>;
                        interrupt-controller;
@@ -348,7 +398,7 @@
                        };
                };
 
-               nand: nand@68000000 {
+               nand: nand-controller@68000000 {
                        compatible = "socionext,uniphier-denali-nand-v5a";
                        status = "disabled";
                        reg-names = "nand_data", "denali_reg";
@@ -356,7 +406,10 @@
                        interrupts = <0 65 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_nand2cs>;
-                       clocks = <&sys_clk 2>;
+                       clock-names = "nand", "nand_x", "ecc";
+                       clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
+                       reset-names = "nand", "reg";
+                       resets = <&sys_rst 2>, <&sys_rst 2>;
                };
        };
 };
Unnamed repository; edit this file 'description' to name the repository.