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

Commit 6fe05f33 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Nicolas Ferre:
More DT material for AT91:

- conversion of watchdog to DT
- usart definition for evk-pro3 board

* tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/dts: evk-pro3: enable watchdog
  ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45
  watchdog: at91sam9_wdt: add device tree support
  ARM: at91: dt: evk-pro3: enable uart0 and uart2
parents 3fcdc055 824b4396

Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
* Atmel Watchdog Timers



** at91sam9-wdt



Required properties:

- compatible: must be "atmel,at91sam9260-wdt".

- reg: physical base address of the controller and length of memory mapped

  region.



Example:



	watchdog@fffffd40 {

		compatible = "atmel,at91sam9260-wdt";

		reg = <0xfffffd40 0x10>;

	};

arch/arm/boot/dts/at91sam9260.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -246,6 +246,12 @@ 
					trigger-external;

				};

			};



			watchdog@fffffd40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffd40 0x10>;

				status = "disabled";

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9263.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -195,6 +195,12 @@ 
				#size-cells = <0>;

				status = "disabled";

			};



			watchdog@fffffd40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffd40 0x10>;

				status = "disabled";

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9g45.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -262,6 +262,12 @@ 
					trigger-value = <0x6>;

				};

			};



			watchdog@fffffd40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffd40 0x10>;

				status = "disabled";

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/evk-pro3.dts

+12 −0
Original line number Diff line number Diff line
@@ -22,10 +22,22 @@ 
				status = "okay";

			};



			usart0: serial@fffb0000 {

				status = "okay";

			};



			usart2: serial@fffb8000 {

				status = "okay";

			};



			usb1: gadget@fffa4000 {

				atmel,vbus-gpio = <&pioC 5 0>;

				status = "okay";

			};



			watchdog@fffffd40 {

				status = "okay";

			};

		};



		usb0: ohci@00500000 {