Commit 9686bb66 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt 

From Nicolas Ferre:

- more SPI DT activation for rm9200
- SPI DMA for at91sam9n12/sama5d3
And one little fix for SPI compatibility string

* tag 'at91-dt' of git://github.com/at91linux/linux-at91

:
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string

Conflicts:
	arch/arm/boot/dts/sama5d3.dtsi

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f7bea65b 26e3326c

arch/arm/boot/dts/at91rm9200.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -478,6 +478,15 @@ 
					};

				};



				spi0 {

					pinctrl_spi0: spi0-0 {

						atmel,pins =

							<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA0 periph A SPI0_MISO pin */

							 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA1 periph A SPI0_MOSI pin */

							 AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PA2 periph A SPI0_SPCK pin */

					};

				};



				pioA: gpio@fffff400 {

					compatible = "atmel,at91rm9200-gpio";

					reg = <0xfffff400 0x200>;
@@ -578,6 +587,17 @@ 
				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;

				status = "disabled";

			};



			spi0: spi@fffe0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91rm9200-spi";

				reg = <0xfffe0000 0x200>;

				interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi0>;

				status = "disabled";

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91rm9200ek.dts

+10 −0
Original line number Diff line number Diff line
@@ -53,6 +53,16 @@ 
				atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};



			spi0: spi@fffe0000 {

				status = "okay";

				cs-gpios = <&pioA 3 0>, <0>, <0>, <0>;

				mtd_dataflash@0 {

					compatible = "atmel,at45", "atmel,dataflash";

					spi-max-frequency = <15000000>;

					reg = <0>;

				};

			};

		};



		usb0: ohci@00300000 {

arch/arm/boot/dts/at91sam9n12.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -492,6 +492,9 @@ 
				compatible = "atmel,at91rm9200-spi";

				reg = <0xf0000000 0x100>;

				interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;

				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(1)>,

				       <&dma 1 AT91_DMA_CFG_PER_ID(2)>;

				dma-names = "tx", "rx";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi0>;

				status = "disabled";
@@ -503,6 +506,9 @@ 
				compatible = "atmel,at91rm9200-spi";

				reg = <0xf0004000 0x100>;

				interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;

				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(3)>,

				       <&dma 1 AT91_DMA_CFG_PER_ID(4)>;

				dma-names = "tx", "rx";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi1>;

				status = "disabled";

arch/arm/boot/dts/sama5d3.dtsi

+8 −2
Original line number Diff line number Diff line
@@ -80,9 +80,12 @@ 
			spi0: spi@f0004000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9x5-spi";

				compatible = "atmel,at91rm9200-spi";

				reg = <0xf0004000 0x100>;

				interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;

				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(1)>,

				       <&dma0 2 AT91_DMA_CFG_PER_ID(2)>;

				dma-names = "tx", "rx";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi0>;

				status = "disabled";
@@ -203,9 +206,12 @@ 
			spi1: spi@f8008000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9x5-spi";

				compatible = "atmel,at91rm9200-spi";

				reg = <0xf8008000 0x100>;

				interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;

				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(15)>,

				       <&dma1 2 AT91_DMA_CFG_PER_ID(16)>;

				dma-names = "tx", "rx";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi1>;

				status = "disabled";

CRA Git | Maintained and supported by SUSTech CRA and CCSE