Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi
index a66d0a278a87b8ad7f6af857ec69eff0139ace9f..41ac1f164c86fe722a334bc98f3fd110e92357b1 100644 (file)
--- a/arch/arm/dts/sam9x60.dtsi
+++ b/arch/arm/dts/sam9x60.dtsi
@@ -22,6 +22,8 @@
                serial0 = &dbgu;
                gpio0 = &pioA;
                gpio1 = &pioB;
+               gpio3 = &pioD;
+               spi0 = &qspi;
        };
 
        clocks {
@@ -60,6 +62,27 @@
                        #size-cells = <1>;
                        ranges;
 
+                       qspi: spi@f0014000 {
+                               compatible = "microchip,sam9x60-qspi";
+                               reg = <0xf0014000 0x100>, <0x70000000 0x10000000>;
+                               reg-names = "qspi_base", "qspi_mmap";
+                               clocks =  <&qspi_clk>, <&qspick>;
+                               clock-names = "pclk", "qspick";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
+                       flx0: flexcom@f801c600 {
+                               compatible = "atmel,sama5d2-flexcom";
+                               reg = <0xf801c000 0x200>;
+                               clocks = <&flx0_clk>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0x0 0xf801c000 0x800>;
+                               status = "disabled";
+                       };
+
                        macb0: ethernet@f802c000 {
                                compatible = "cdns,sam9x60-macb", "cdns,macb";
                                reg = <0xf802c000 0x100>;
@@ -143,6 +166,14 @@
                                clocks = <&pioB_clk>;
                        };
 
+                       pioD: gpio@fffffa00 {
+                               compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
+                               reg = <0xfffffa00 0x200>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               clocks = <&pioD_clk>;
+                       };
+
                        pmc: pmc@fffffc00 {
                                compatible = "atmel,at91sam9x5-pmc";
                                reg = <0xfffffc00 0x200>;
@@ -172,6 +203,18 @@
                                        atmel,clk-divisors = <1 2 4 6>;
                                };
 
+                               system: systemck {
+                                       compatible = "atmel,at91rm9200-clk-system";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       qspick: qspick {
+                                               #clock-cells = <0>;
+                                               reg = <19>;
+                                               clocks = <&mck>;
+                                       };
+                               };
+
                                periph: periphck {
                                        compatible = "microchip,sam9x60-clk-peripheral";
                                        #address-cells = <1>;
@@ -188,6 +231,16 @@
                                                reg = <3>;
                                        };
 
+                                       flx0_clk: flx0_clk {
+                                               #clock-cells = <0>;
+                                               reg = <5>;
+                                       };
+
+                                       pioD_clk: pioD_clk {
+                                               #clock-cells = <0>;
+                                               reg = <44>;
+                                       };
+
                                        sdhci0_clk: sdhci0_clk {
                                                #clock-cells = <0>;
                                                reg = <12>;
@@ -202,6 +255,11 @@
                                                #clock-cells = <0>;
                                                reg = <24>;
                                        };
+
+                                       qspi_clk: qspi_clk {
+                                               #clock-cells = <0>;
+                                               reg = <35>;
+                                       };
                                };
 
                                generic: gck {
@@ -253,4 +311,9 @@
                        };
                };
        };
+
+       onewire_tm: onewire {
+               compatible = "w1-gpio";
+               status = "disabled";
+       };
 };