Commit ef0a3402 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Nicolas Ferre:
Again some nice DT updates for AT91:
- DMA binding update with one patch shared with slave-dma tree
- more SPI DT activation
- enable the USB gadget HS for DT platforms

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91: sam9m10g45ek add udc DT support
  ARM: at91: sam9g45 add udc DT support
  ARM: at91: sam9x5ek add udc DT support
  ARM: at91: sam9x5 add udc DT support
  ARM: at91: dt: at91sam9x5: add SPI DMA client infos
  ARM: at91: dt: switch DMA DT bindings to pre-processor
  ARM: at91: dt: add header to define at_hdmac configuration
parents 37177fae 24ce10e1

arch/arm/boot/dts/at91sam9g45.dtsi

+65 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include "skeleton.dtsi"

#include <dt-bindings/dma/at91.h>

#include <dt-bindings/pinctrl/at91.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/gpio/gpio.h>
@@ -617,7 +618,7 @@ 
				compatible = "atmel,hsmci";

				reg = <0xfff80000 0x600>;

				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma 1 0>;

				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;

				dma-names = "rxtx";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -628,7 +629,7 @@ 
				compatible = "atmel,hsmci";

				reg = <0xfffd0000 0x600>;

				interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma 1 13>;

				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;

				dma-names = "rxtx";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -662,6 +663,68 @@ 
				pinctrl-0 = <&pinctrl_spi1>;

				status = "disabled";

			};



			usb2: gadget@fff78000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9rl-udc";

				reg = <0x00600000 0x80000

				       0xfff78000 0x400>;

				interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;

				status = "disabled";



				ep0 {

					reg = <0>;

					atmel,fifo-size = <64>;

					atmel,nb-banks = <1>;

				};



				ep1 {

					reg = <1>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <2>;

					atmel,can-dma;

					atmel,can-isoc;

				};



				ep2 {

					reg = <2>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <2>;

					atmel,can-dma;

					atmel,can-isoc;

				};



				ep3 {

					reg = <3>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

				};



				ep4 {

					reg = <4>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

				};



				ep5 {

					reg = <5>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

					atmel,can-isoc;

				};



				ep6 {

					reg = <6>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

					atmel,can-isoc;

				};

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9m10g45ek.dts

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ 
					reg = <0>;

				};

			};



			usb2: gadget@fff78000 {

				atmel,vbus-gpio = <&pioB 19 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9n12.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include "skeleton.dtsi"

#include <dt-bindings/dma/at91.h>

#include <dt-bindings/pinctrl/at91.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/gpio/gpio.h>
@@ -97,7 +98,7 @@ 
				compatible = "atmel,hsmci";

				reg = <0xf0008000 0x600>;

				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma 1 0>;

				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;

				dma-names = "rxtx";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -465,8 +466,8 @@ 
				compatible = "atmel,at91sam9x5-i2c";

				reg = <0xf8010000 0x100>;

				interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;

				dmas = <&dma 1 13>,

				       <&dma 1 14>;

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

				       <&dma 1 AT91_DMA_CFG_PER_ID(14)>;

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

				#address-cells = <1>;

				#size-cells = <0>;
@@ -477,8 +478,8 @@ 
				compatible = "atmel,at91sam9x5-i2c";

				reg = <0xf8014000 0x100>;

				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;

				dmas = <&dma 1 15>,

				       <&dma 1 16>;

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

				       <&dma 1 AT91_DMA_CFG_PER_ID(16)>;

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

				#address-cells = <1>;

				#size-cells = <0>;

arch/arm/boot/dts/at91sam9x5.dtsi

+77 −8
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include "skeleton.dtsi"

#include <dt-bindings/dma/at91.h>

#include <dt-bindings/pinctrl/at91.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/gpio/gpio.h>
@@ -550,7 +551,7 @@ 
				compatible = "atmel,hsmci";

				reg = <0xf0008000 0x600>;

				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma0 1 0>;

				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;

				dma-names = "rxtx";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -561,7 +562,7 @@ 
				compatible = "atmel,hsmci";

				reg = <0xf000c000 0x600>;

				interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma1 1 0>;

				dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;

				dma-names = "rxtx";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -624,8 +625,8 @@ 
				compatible = "atmel,at91sam9x5-i2c";

				reg = <0xf8010000 0x100>;

				interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;

				dmas = <&dma0 1 7>,

				       <&dma0 1 8>;

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

				       <&dma0 1 AT91_DMA_CFG_PER_ID(8)>;

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

				#address-cells = <1>;

				#size-cells = <0>;
@@ -638,8 +639,8 @@ 
				compatible = "atmel,at91sam9x5-i2c";

				reg = <0xf8014000 0x100>;

				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;

				dmas = <&dma1 1 5>,

				       <&dma1 1 6>;

				dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(5)>,

				       <&dma1 1 AT91_DMA_CFG_PER_ID(6)>;

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

				#address-cells = <1>;

				#size-cells = <0>;
@@ -652,8 +653,8 @@ 
				compatible = "atmel,at91sam9x5-i2c";

				reg = <0xf8018000 0x100>;

				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;

				dmas = <&dma0 1 9>,

				       <&dma0 1 10>;

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

				       <&dma0 1 AT91_DMA_CFG_PER_ID(10)>;

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

				#address-cells = <1>;

				#size-cells = <0>;
@@ -727,6 +728,9 @@ 
				compatible = "atmel,at91rm9200-spi";

				reg = <0xf0000000 0x100>;

				interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;

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

				       <&dma0 1 AT91_DMA_CFG_PER_ID(2)>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi0>;

				status = "disabled";
@@ -738,11 +742,76 @@ 
				compatible = "atmel,at91rm9200-spi";

				reg = <0xf0004000 0x100>;

				interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;

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

				       <&dma1 1 AT91_DMA_CFG_PER_ID(2)>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi1>;

				status = "disabled";

			};



			usb2: gadget@f803c000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9rl-udc";

				reg = <0x00500000 0x80000

				       0xf803c000 0x400>;

				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;

				status = "disabled";



				ep0 {

					reg = <0>;

					atmel,fifo-size = <64>;

					atmel,nb-banks = <1>;

				};



				ep1 {

					reg = <1>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <2>;

					atmel,can-dma;

					atmel,can-isoc;

				};



				ep2 {

					reg = <2>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <2>;

					atmel,can-dma;

					atmel,can-isoc;

				};



				ep3 {

					reg = <3>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

				};



				ep4 {

					reg = <4>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

				};



				ep5 {

					reg = <5>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

					atmel,can-isoc;

				};



				ep6 {

					reg = <6>;

					atmel,fifo-size = <1024>;

					atmel,nb-banks = <3>;

					atmel,can-dma;

					atmel,can-isoc;

				};

			};



			watchdog@fffffe40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffe40 0x10>;

arch/arm/boot/dts/at91sam9x5ek.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ 
				status = "okay";

			};



			usb2: gadget@f803c000 {

				atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};



			i2c0: i2c@f8010000 {

				status = "okay";

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE