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

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

Merge tag 'at91-dt2' of... 

Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt2

Pull "Second DT batch for 3.19" from Nicolas Ferre:

- some trivial fixes: macro for IRQ, license wording
- DMA description for sama5d4
- RTT as RTC driver definition plus associated GPBR for several SoCs
- addition of missing nodes: rtc for at91sam9rl, isi for at91sam9g45

* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91/dt: at91sam9g45: add ISI node
  ARM: at91/dt: enable the RTT block on the at91sam9m10g45ek board
  ARM: at91/dt: enable the RTT block on the sam9g20ek board
  ARM: at91/dt: add GPBR nodes
  ARM: at91/dt: add RTT nodes to at91 dtsis
  ARM: at91/dt: at91sam9rl: add rtc
  ARM: at91: fix GPLv2 wording
  ARM: at91/dt: sama5d4: add DMA support
  ARM: at91/dt: sama5d4: use macro instead of numeric value

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1097b88b accda273

arch/arm/boot/dts/at91-sama5d4ek.dts

+2 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

arch/arm/boot/dts/at91sam9260.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -956,6 +956,14 @@ 
				};

			};



			rtc@fffffd20 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd20 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&clk32k>;

				status = "disabled";

			};



			watchdog@fffffd40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffd40 0x10>;
@@ -966,6 +974,12 @@ 
				atmel,idle-halt;

				status = "disabled";

			};



			gpbr: syscon@fffffd50 {

				compatible = "atmel,at91sam9260-gpbr", "syscon";

				reg = <0xfffffd50 0x10>;

				status = "disabled";

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9261.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -828,12 +828,26 @@ 
				clocks = <&mck>;

			};



			rtc@fffffd20 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd20 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&slow_xtal>;

				status = "disabled";

			};



			watchdog@fffffd40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffd40 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				status = "disabled";

			};



			gpbr: syscon@fffffd50 {

				compatible = "atmel,at91sam9260-gpbr", "syscon";

				reg = <0xfffffd50 0x10>;

				status = "disabled";

			};

		};

	};

arch/arm/boot/dts/at91sam9263.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -922,6 +922,27 @@ 
				pinctrl-0 = <&pinctrl_can_rx_tx>;

				clocks = <&can_clk>;

				clock-names = "can_clk";

			};



			rtc@fffffd20 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd20 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&slow_xtal>;

				status = "disabled";

			};



			rtc@fffffd50 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd50 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&slow_xtal>;

				status = "disabled";

			};



			gpbr: syscon@fffffd60 {

				compatible = "atmel,at91sam9260-gpbr", "syscon";

				reg = <0xfffffd60 0x50>;

				status = "disabled";

			};

		};

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -112,9 +112,23 @@ 
				};

			};



			shdwc@fffffd10 {

				atmel,wakeup-counter = <10>;

				atmel,wakeup-rtt-timer;

			};



			rtc@fffffd20 {

				atmel,rtt-rtc-time-reg = <&gpbr 0x0>;

				status = "okay";

			};



			watchdog@fffffd40 {

				status = "okay";

			};



			gpbr: syscon@fffffd50 {

				status = "okay";

			};

		};



		nand0: nand@40000000 {