Merge tag 'spi-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

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

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index a98c0d50fbbe1ed80e6c29d5228716155f3399f5..347b438d47faf453dabaecf20d118af58f2f1504 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -343,6 +343,24 @@
                                        };
                                };
 
+                               spi0 {
+                                       pinctrl_spi0: spi0-0 {
+                                               atmel,pins =
+                                                       <0 11 0x1 0x0   /* PA11 periph A SPI0_MISO pin */
+                                                        0 12 0x1 0x0   /* PA12 periph A SPI0_MOSI pin */
+                                                        0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */
+                                       };
+                               };
+
+                               spi1 {
+                                       pinctrl_spi1: spi1-0 {
+                                               atmel,pins =
+                                                       <0 21 0x2 0x0   /* PA21 periph B SPI1_MISO pin */
+                                                        0 22 0x2 0x0   /* PA22 periph B SPI1_MOSI pin */
+                                                        0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */
+                                       };
+                               };
+
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
@@ -529,6 +547,28 @@
                                        trigger-value = <0x6>;
                                };
                        };
+
+                       spi0: spi@f0000000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "atmel,at91rm9200-spi";
+                               reg = <0xf0000000 0x100>;
+                               interrupts = <13 4 3>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_spi0>;
+                               status = "disabled";
+                       };
+
+                       spi1: spi@f0004000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "atmel,at91rm9200-spi";
+                               reg = <0xf0004000 0x100>;
+                               interrupts = <14 4 3>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_spi1>;
+                               status = "disabled";
+                       };
                };
 
                nand0: nand@40000000 {