Merge tag 'nfs-for-4.13-4' of git://git.linux-nfs.org/projects/anna/linux-nfs

[karo-tx-linux.git] / arch / arm / boot / dts / gemini.dtsi

diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index b8d011bdcc76af5fb3f1843bf876f10956b35294..141d8d3a1d07bfab1c0df4e5f559ac2075828793 100644 (file)
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -25,8 +25,11 @@
                };
 
                syscon: syscon@40000000 {
-                       compatible = "cortina,gemini-syscon", "syscon", "simple-mfd";
+                       compatible = "cortina,gemini-syscon",
+                                    "syscon", "simple-mfd";
                        reg = <0x40000000 0x1000>;
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
 
                        syscon-reboot {
                                compatible = "syscon-reboot";
@@ -42,23 +45,30 @@
                        compatible = "cortina,gemini-watchdog";
                        reg = <0x41000000 0x1000>;
                        interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&syscon 23>;
+                       clocks = <&syscon 2>;
                };
 
                uart0: serial@42000000 {
                        compatible = "ns16550a";
                        reg = <0x42000000 0x100>;
-                       clock-frequency = <48000000>;
+                       resets = <&syscon 18>;
+                       clocks = <&syscon 6>;
                        interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;
                        reg-shift = <2>;
                };
 
                timer@43000000 {
-                       compatible = "cortina,gemini-timer";
+                       compatible = "faraday,fttmr010";
                        reg = <0x43000000 0x1000>;
                        interrupt-parent = <&intcon>;
                        interrupts = <14 IRQ_TYPE_EDGE_FALLING>, /* Timer 1 */
                                     <15 IRQ_TYPE_EDGE_FALLING>, /* Timer 2 */
                                     <16 IRQ_TYPE_EDGE_FALLING>; /* Timer 3 */
+                       resets = <&syscon 17>;
+                       /* APB clock or RTC clock */
+                       clocks = <&syscon 2>, <&syscon 0>;
+                       clock-names = "PCLK", "EXTCLK";
                        syscon = <&syscon>;
                };
 
@@ -66,11 +76,28 @@
                        compatible = "cortina,gemini-rtc";
                        reg = <0x45000000 0x100>;
                        interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&syscon 16>;
+                       clocks = <&syscon 2>, <&syscon 0>;
+                       clock-names = "PCLK", "EXTCLK";
+               };
+
+               sata: sata@46000000 {
+                       compatible = "cortina,gemini-sata-bridge";
+                       reg = <0x46000000 0x100>;
+                       resets = <&syscon 26>,
+                                <&syscon 27>;
+                       reset-names = "sata0", "sata1";
+                       clocks = <&syscon 10>,
+                                <&syscon 11>;
+                       clock-names = "SATA0_PCLK", "SATA1_PCLK";
+                       syscon = <&syscon>;
+                       status = "disabled";
                };
 
                intcon: interrupt-controller@48000000 {
                        compatible = "faraday,ftintc010";
                        reg = <0x48000000 0x1000>;
+                       resets = <&syscon 14>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                };
@@ -85,6 +112,8 @@
                        compatible = "cortina,gemini-gpio", "faraday,ftgpio010";
                        reg = <0x4d000000 0x100>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&syscon 20>;
+                       clocks = <&syscon 2>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;
@@ -95,6 +124,8 @@
                        compatible = "cortina,gemini-gpio", "faraday,ftgpio010";
                        reg = <0x4e000000 0x100>;
                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&syscon 21>;
+                       clocks = <&syscon 2>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;
@@ -105,6 +136,8 @@
                        compatible = "cortina,gemini-gpio", "faraday,ftgpio010";
                        reg = <0x4f000000 0x100>;
                        interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&syscon 22>;
+                       clocks = <&syscon 2>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;
@@ -118,6 +151,9 @@
                         * to configure the host bridge.
                         */
                        reg = <0x50000000 0x100>;
+                       resets = <&syscon 7>;
+                       clocks = <&syscon 15>, <&syscon 4>;
+                       clock-names = "PCLK", "PCICLK";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
@@ -152,5 +188,44 @@
                                #interrupt-cells = <1>;
                        };
                };
+
+               ata@63000000 {
+                       compatible = "cortina,gemini-pata", "faraday,ftide010";
+                       reg = <0x63000000 0x1000>;
+                       interrupts = <4 IRQ_TYPE_EDGE_RISING>;
+                       resets = <&syscon 2>;
+                       clocks = <&syscon 14>;
+                       clock-names = "PCLK";
+                       sata = <&sata>;
+                       status = "disabled";
+               };
+
+               ata@63400000 {
+                       compatible = "cortina,gemini-pata", "faraday,ftide010";
+                       reg = <0x63400000 0x1000>;
+                       interrupts = <5 IRQ_TYPE_EDGE_RISING>;
+                       resets = <&syscon 2>;
+                       clocks = <&syscon 14>;
+                       clock-names = "PCLK";
+                       sata = <&sata>;
+                       status = "disabled";
+               };
+
+               dma-controller@67000000 {
+                       compatible = "faraday,ftdma020", "arm,pl080", "arm,primecell";
+                       /* Faraday Technology FTDMAC020 variant */
+                       arm,primecell-periphid = <0x0003b080>;
+                       reg = <0x67000000 0x1000>;
+                       interrupts = <9 IRQ_TYPE_EDGE_RISING>;
+                       resets = <&syscon 10>;
+                       clocks = <&syscon 1>;
+                       clock-names = "apb_pclk";
+                       /* Bus interface AHB1 (AHB0) is totally tilted */
+                       lli-bus-interface-ahb2;
+                       mem-bus-interface-ahb2;
+                       memcpy-burst-size = <256>;
+                       memcpy-bus-width = <32>;
+                       #dma-cells = <2>;
+               };
        };
 };