Merge tag 'zynqmp-dt-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/arm64

arm: Xilinx ZynqMP dt patches for v4.3

- Add SATA, GPIO, CAN, SMMU, USB, SPI, I2C, watchdog and sdhci for zynqmp
- Sort nodes in dtsi

* tag 'zynqmp-dt-for-4.3' of https://github.com/Xilinx/linux-xlnx:
  ARM64: zynqmp: Move SPI nodes to the right location
  ARM64: zynqmp: Move uart and ttcs to the right location
  ARM64: zynqmp: Enable spi flashes on ep108
  ARM64: zynqmp: Add eeprom memories on i2c bus
  ARM64: zynqmp: Enable sdhci on ep108
  ARM64: zynqmp: Enable watchdog on ep108
  ARM64: zynqmp: Add DWC3 usb support
  ARM64: zynqmp: Add SMMU support
  ARM64: zynqmp: Add CANs node for platform
  ARM64: zynqmp: Use zynqmp specific compatible string for gpio
  devicetree: xilinx: zynqmp: add sata node

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 241 insertions, 81 deletions

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index 0a3f40ecd06d..ce5d848251fa 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -32,6 +32,10 @@
         };
 };
 
+&can0 {
+        status = "okay";
+};
+
 &gem0 {
         status = "okay";
         phy-handle = <&phy0>;
@@ -42,6 +46,91 @@
         };
 };
 
+&gpio {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+        eeprom@54 {
+                compatible = "at,24c64";
+                reg = <0x54>;
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+        eeprom@55 {
+                compatible = "at,24c64";
+                reg = <0x55>;
+        };
+};
+
+&sata {
+        status = "okay";
+        ceva,broken-gen2;
+};
+
+&sdhci0 {
+        status = "okay";
+};
+
+&sdhci1 {
+        status = "okay";
+};
+
+&spi0 {
+        status = "okay";
+        num-cs = <1>;
+        spi0_flash0: spi0_flash0@0 {
+                compatible = "m25p80";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                spi-max-frequency = <50000000>;
+                reg = <0>;
+
+                spi0_flash0@00000000 {
+                        label = "spi0_flash0";
+                        reg = <0x0 0x100000>;
+                };
+        };
+};
+
+&spi1 {
+        status = "okay";
+        num-cs = <1>;
+        spi1_flash0: spi1_flash0@0 {
+                compatible = "m25p80";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                spi-max-frequency = <50000000>;
+                reg = <0>;
+
+                spi1_flash0@00000000 {
+                        label = "spi1_flash0";
+                        reg = <0x0 0x100000>;
+                };
+        };
+};
+
 &uart0 {
         status = "okay";
 };
+
+&usb0 {
+        status = "okay";
+        dr_mode = "peripheral";
+        maximum-speed = "high-speed";
+};
+
+&usb1 {
+        status = "okay";
+        dr_mode = "host";
+        maximum-speed = "high-speed";
+};
+
+&watchdog0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 11e0b00045cf..857eda5c7217 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -96,74 +96,38 @@
                 #size-cells = <1>;
                 ranges;
 
-                misc_clk: misc_clk {
-                        compatible = "fixed-clock";
-                        #clock-cells = <0>;
-                        clock-frequency = <25000000>;
-                };
-
-                ttc0: timer@ff110000 {
-                        compatible = "cdns,ttc";
-                        status = "disabled";
-                        interrupt-parent = <&gic>;
-                        interrupts = <0 36 4>, <0 37 4>, <0 38 4>;
-                        reg = <0x0 0xff110000 0x1000>;
-                        clocks = <&misc_clk>;
-                        timer-width = <32>;
-                };
-
-                ttc1: timer@ff120000 {
-                        compatible = "cdns,ttc";
-                        status = "disabled";
-                        interrupt-parent = <&gic>;
-                        interrupts = <0 39 4>, <0 40 4>, <0 41 4>;
-                        reg = <0x0 0xff120000 0x1000>;
-                        clocks = <&misc_clk>;
-                        timer-width = <32>;
-                };
-
-                ttc2: timer@ff130000 {
-                        compatible = "cdns,ttc";
-                        status = "disabled";
-                        interrupt-parent = <&gic>;
-                        interrupts = <0 42 4>, <0 43 4>, <0 44 4>;
-                        reg = <0x0 0xff130000 0x1000>;
-                        clocks = <&misc_clk>;
-                        timer-width = <32>;
-                };
-
-                ttc3: timer@ff140000 {
-                        compatible = "cdns,ttc";
+                can0: can@ff060000 {
+                        compatible = "xlnx,zynq-can-1.0";
                         status = "disabled";
+                        clocks = <&misc_clk &misc_clk>;
+                        clock-names = "can_clk", "pclk";
+                        reg = <0x0 0xff060000 0x1000>;
+                        interrupts = <0 23 4>;
                         interrupt-parent = <&gic>;
-                        interrupts = <0 45 4>, <0 46 4>, <0 47 4>;
-                        reg = <0x0 0xff140000 0x1000>;
-                        clocks = <&misc_clk>;
-                        timer-width = <32>;
+                        tx-fifo-depth = <0x40>;
+                        rx-fifo-depth = <0x40>;
                 };
 
-                uart0: serial@ff000000 {
-                        compatible = "cdns,uart-r1p8";
+                can1: can@ff070000 {
+                        compatible = "xlnx,zynq-can-1.0";
                         status = "disabled";
-                        interrupt-parent = <&gic>;
-                        interrupts = <0 21 4>;
-                        reg = <0x0 0xff000000 0x1000>;
-                        clock-names = "uart_clk", "pclk";
                         clocks = <&misc_clk &misc_clk>;
+                        clock-names = "can_clk", "pclk";
+                        reg = <0x0 0xff070000 0x1000>;
+                        interrupts = <0 24 4>;
+                        interrupt-parent = <&gic>;
+                        tx-fifo-depth = <0x40>;
+                        rx-fifo-depth = <0x40>;
                 };
 
-                uart1: serial@ff010000 {
-                        compatible = "cdns,uart-r1p8";
-                        status = "disabled";
-                        interrupt-parent = <&gic>;
-                        interrupts = <0 22 4>;
-                        reg = <0x0 0xff010000 0x1000>;
-                        clock-names = "uart_clk", "pclk";
-                        clocks = <&misc_clk &misc_clk>;
+                misc_clk: misc_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <25000000>;
                 };
 
                 gpio: gpio@ff0a0000 {
-                        compatible = "xlnx,zynq-gpio-1.0";
+                        compatible = "xlnx,zynqmp-gpio-1.0";
                         status = "disabled";
                         #gpio-cells = <0x2>;
                         clocks = <&misc_clk>;
@@ -220,30 +184,6 @@
                         #size-cells = <0>;
                 };
 
-                spi0: spi@ff040000 {
-                        compatible = "cdns,spi-r1p6";
-                        status = "disabled";
-                        interrupt-parent = <&gic>;
-                        interrupts = <0 19 4>;
-                        reg = <0x0 0xff040000 0x1000>;
-                        clock-names = "ref_clk", "pclk";
-                        clocks = <&misc_clk &misc_clk>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                };
-
-                spi1: spi@ff050000 {
-                        compatible = "cdns,spi-r1p6";
-                        status = "disabled";
-                        interrupt-parent = <&gic>;
-                        interrupts = <0 20 4>;
-                        reg = <0x0 0xff050000 0x1000>;
-                        clock-names = "ref_clk", "pclk";
-                        clocks = <&misc_clk &misc_clk>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                };
-
                 i2c_clk: i2c_clk {
                         compatible = "fixed-clock";
                         #clock-cells = <0x0>;
@@ -272,6 +212,21 @@
                         #size-cells = <0>;
                 };
 
+                sata_clk: sata_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <75000000>;
+                };
+
+                sata: ahci@fd0c0000 {
+                        compatible = "ceva,ahci-1v84";
+                        status = "disabled";
+                        reg = <0x0 0xfd0c0000 0x2000>;
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 133 4>;
+                        clocks = <&sata_clk>;
+                };
+
                 sdhci0: sdhci@ff160000 {
                         compatible = "arasan,sdhci-8.9a";
                         status = "disabled";
@@ -292,6 +247,122 @@
                         clocks = <&misc_clk>, <&misc_clk>;
                 };
 
+                smmu: smmu@fd800000 {
+                        compatible = "arm,mmu-500";
+                        reg = <0x0 0xfd800000 0x20000>;
+                        #global-interrupts = <1>;
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 157 4>,
+                                <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>,
+                                <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>,
+                                <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>,
+                                <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>;
+                };
+
+                spi0: spi@ff040000 {
+                        compatible = "cdns,spi-r1p6";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 19 4>;
+                        reg = <0x0 0xff040000 0x1000>;
+                        clock-names = "ref_clk", "pclk";
+                        clocks = <&misc_clk &misc_clk>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                spi1: spi@ff050000 {
+                        compatible = "cdns,spi-r1p6";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 20 4>;
+                        reg = <0x0 0xff050000 0x1000>;
+                        clock-names = "ref_clk", "pclk";
+                        clocks = <&misc_clk &misc_clk>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                ttc0: timer@ff110000 {
+                        compatible = "cdns,ttc";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 36 4>, <0 37 4>, <0 38 4>;
+                        reg = <0x0 0xff110000 0x1000>;
+                        clocks = <&misc_clk>;
+                        timer-width = <32>;
+                };
+
+                ttc1: timer@ff120000 {
+                        compatible = "cdns,ttc";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 39 4>, <0 40 4>, <0 41 4>;
+                        reg = <0x0 0xff120000 0x1000>;
+                        clocks = <&misc_clk>;
+                        timer-width = <32>;
+                };
+
+                ttc2: timer@ff130000 {
+                        compatible = "cdns,ttc";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 42 4>, <0 43 4>, <0 44 4>;
+                        reg = <0x0 0xff130000 0x1000>;
+                        clocks = <&misc_clk>;
+                        timer-width = <32>;
+                };
+
+                ttc3: timer@ff140000 {
+                        compatible = "cdns,ttc";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 45 4>, <0 46 4>, <0 47 4>;
+                        reg = <0x0 0xff140000 0x1000>;
+                        clocks = <&misc_clk>;
+                        timer-width = <32>;
+                };
+
+                uart0: serial@ff000000 {
+                        compatible = "cdns,uart-r1p8";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 21 4>;
+                        reg = <0x0 0xff000000 0x1000>;
+                        clock-names = "uart_clk", "pclk";
+                        clocks = <&misc_clk &misc_clk>;
+                };
+
+                uart1: serial@ff010000 {
+                        compatible = "cdns,uart-r1p8";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 22 4>;
+                        reg = <0x0 0xff010000 0x1000>;
+                        clock-names = "uart_clk", "pclk";
+                        clocks = <&misc_clk &misc_clk>;
+                };
+
+                usb0: usb@fe200000 {
+                        compatible = "snps,dwc3";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 65 4>;
+                        reg = <0x0 0xfe200000 0x40000>;
+                        clock-names = "clk_xin", "clk_ahb";
+                        clocks = <&misc_clk>, <&misc_clk>;
+                };
+
+                usb1: usb@fe300000 {
+                        compatible = "snps,dwc3";
+                        status = "disabled";
+                        interrupt-parent = <&gic>;
+                        interrupts = <0 70 4>;
+                        reg = <0x0 0xfe300000 0x40000>;
+                        clock-names = "clk_xin", "clk_ahb";
+                        clocks = <&misc_clk>, <&misc_clk>;
+                };
+
                 watchdog0: watchdog@fd4d0000 {
                         compatible = "cdns,wdt-r1p2";
                         status = "disabled";