Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44086148 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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



Pull "More AT91 DT material for 3.18" from Nicolas Ferre:

- specify DMA channels for USART on sama5d3 and choose peripherals
  that will use them on the EK boards
- SSC update for audio on at91sam9rl and at91sam9g20
- addition of the NFC clock and new pinctrl compatible string
  to use enhancements that will land in drivers during this release
- several new nodes and fixes

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'at91-dt3' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: at91sam9m10g45ek add rtc node
  ARM: at91/dt: sama5d3: use new pinctrl compatible string
  ARM: at91/dt: sama5d3: add the nfc clock
  ARM: at91/dt: declare sckc node on at91sam9g45
  ARM: at91/dt: Fix typo regarding can0_clk
  ARM: at91/dt: at91sam9g20: switch ssc compatible string
  ARM: at91/dt: at91sam9rl: switch ssc compatible string
  ARM: at91: sama5d3xek: reserve dma channel for audio
  ARM: at91: sama5d3: add usart dma configurations
parents 41c9002a 4dd7933a

arch/arm/boot/dts/at91sam9g20.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ 
				compatible = "atmel,at91sam9g20-i2c";

			};



			ssc0: ssc@fffbc000 {

				compatible = "atmel,at91sam9rl-ssc";

			};



			adc0: adc@fffe0000 {

				atmel,adc-startup-time = <40>;

			};

arch/arm/boot/dts/at91sam9g45.dtsi

+35 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ 
					compatible = "atmel,at91rm9200-clk-master";

					#clock-cells = <0>;

					interrupts-extended = <&pmc AT91_PMC_MCKRDY>;

					clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>;

					clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>;

					atmel,clk-output-range = <0 133333333>;

					atmel,clk-divisors = <1 2 4 3>;

				};
@@ -181,7 +181,7 @@ 
					#address-cells = <1>;

					#size-cells = <0>;

					interrupt-parent = <&pmc>;

					clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>, <&mck>;

					clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>, <&mck>;



					prog0: prog0 {

						#clock-cells = <0>;
@@ -1165,6 +1165,39 @@ 
					atmel,can-isoc;

				};

			};



			sckc@fffffd50 {

				compatible = "atmel,at91sam9x5-sckc";

				reg = <0xfffffd50 0x4>;



				slow_osc: slow_osc {

					compatible = "atmel,at91sam9x5-clk-slow-osc";

					#clock-cells = <0>;

					atmel,startup-time-usec = <1200000>;

					clocks = <&slow_xtal>;

				};



				slow_rc_osc: slow_rc_osc {

					compatible = "atmel,at91sam9x5-clk-slow-rc-osc";

					#clock-cells = <0>;

					atmel,startup-time-usec = <75>;

					clock-frequency = <32768>;

					clock-accuracy = <50000000>;

				};



				clk32k: slck {

					compatible = "atmel,at91sam9x5-clk-slow";

					#clock-cells = <0>;

					clocks = <&slow_rc_osc &slow_osc>;

				};

			};



			rtc@fffffdb0 {

				compatible = "atmel,at91rm9200-rtc";

				reg = <0xfffffdb0 0x30>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				status = "disabled";

			};

		};



		fb0: fb@0x00500000 {

arch/arm/boot/dts/at91sam9m10g45ek.dts

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ 
				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_pwm_leds>;

			};



			rtc@fffffdb0 {

				status = "okay";

			};

		};



		fb0: fb@0x00500000 {

arch/arm/boot/dts/at91sam9rl.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ 
			};



			ssc0: ssc@fffc0000 {

				compatible = "atmel,at91rm9200-ssc";

				compatible = "atmel,at91sam9rl-ssc";

				reg = <0xfffc0000 0x4000>;

				interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;

				pinctrl-names = "default";
@@ -213,7 +213,7 @@ 
			};



			ssc1: ssc@fffc4000 {

				compatible = "atmel,at91rm9200-ssc";

				compatible = "atmel,at91sam9rl-ssc";

				reg = <0xfffc4000 0x4000>;

				interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;

				pinctrl-names = "default";

arch/arm/boot/dts/sama5d3.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf001c000 0x100>;

				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 5>;

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

				       <&dma0 2 (AT91_DMA_CFG_PER_ID(4) | AT91_DMA_CFG_FIFOCFG_ASAP)>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart0>;

				clocks = <&usart0_clk>;
@@ -188,6 +191,9 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf0020000 0x100>;

				interrupts = <13 IRQ_TYPE_LEVEL_HIGH 5>;

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

				       <&dma0 2 (AT91_DMA_CFG_PER_ID(6) | AT91_DMA_CFG_FIFOCFG_ASAP)>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart1>;

				clocks = <&usart1_clk>;
@@ -333,6 +339,9 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8020000 0x100>;

				interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;

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

				       <&dma1 2 (AT91_DMA_CFG_PER_ID(8) | AT91_DMA_CFG_FIFOCFG_ASAP)>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart2>;

				clocks = <&usart2_clk>;
@@ -344,6 +353,9 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8024000 0x100>;

				interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;

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

				       <&dma1 2 (AT91_DMA_CFG_PER_ID(10) | AT91_DMA_CFG_FIFOCFG_ASAP)>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart3>;

				clocks = <&usart3_clk>;
@@ -412,6 +424,9 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xffffee00 0x200>;

				interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;

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

				       <&dma1 2 (AT91_DMA_CFG_PER_ID(14) | AT91_DMA_CFG_FIFOCFG_ASAP)>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_dbgu>;

				clocks = <&dbgu_clk>;
@@ -430,7 +445,7 @@ 
			pinctrl@fffff200 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";

				compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus";

				ranges = <0xfffff200 0xfffff200 0xa00>;

				atmel,mux-mask = <

					/*   A          B          C  */
@@ -1005,6 +1020,11 @@ 
						reg = <2>;

					};



					hsmc_clk: hsmc_clk {

						#clock-cells = <0>;

						reg = <5>;

					};



					pioA_clk: pioA_clk {

						#clock-cells = <0>;

						reg = <6>;
@@ -1405,6 +1425,7 @@ 
					0xffffc000 0x00000070	/* NFC HSMC regs */

					0x00200000 0x00100000	/* NFC SRAM banks */

					>;

				clocks = <&hsmc_clk>;

			};

		};

	};