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

Commit ff83b377 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/dt

Merge "Second batch of DT changes for 4.7" from Nicolas Ferre:

- three low priority fixes:
  - sama5d2: one pin definition and dependency with the slow clock for watchdog
  - sama5d4: definition of watchdog IRQ property
- addition of the new shutdown controller to sama5d2 & sama5d2 Xplained

* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: dts: at91: sama5d2: add slow clock to watchdog node
  ARM: dts: at91: sama5d2: add shutdown controller node
  ARM: dts: at91: sama5d4: add watchdog interrupt property
  ARM: dts: at91: fix typo in sama5d2 PIN_PD24 description
parents b48e5aa6 51755007

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

+9 −0
Original line number Diff line number Diff line
@@ -234,6 +234,15 @@ 
				};

			};



			shdwc@f8048010 {

				atmel,shdwc-debouncer = <976>;



				input@0 {

					reg = <0>;

					atmel,wakeup-type = "low";

				};

			};



			watchdog@f8048040 {

				status = "okay";

			};

arch/arm/boot/dts/sama5d2-pinfunc.h

+2 −2
Original line number Diff line number Diff line
@@ -837,8 +837,8 @@ 
#define PIN_PD23__ISC_FIELD		PINMUX_PIN(PIN_PD23, 6, 4)

#define PIN_PD24			120

#define PIN_PD24__GPIO			PINMUX_PIN(PIN_PD24, 0, 0)

#define PIN_PD24__UTXD2			PINMUX_PIN(PIN_PD23, 1, 2)

#define PIN_PD24__FLEXCOM4_IO3		PINMUX_PIN(PIN_PD23, 3, 3)

#define PIN_PD24__UTXD2			PINMUX_PIN(PIN_PD24, 1, 2)

#define PIN_PD24__FLEXCOM4_IO3		PINMUX_PIN(PIN_PD24, 3, 3)

#define PIN_PD25			121

#define PIN_PD25__GPIO			PINMUX_PIN(PIN_PD25, 0, 0)

#define PIN_PD25__SPI1_SPCK		PINMUX_PIN(PIN_PD25, 1, 3)

arch/arm/boot/dts/sama5d2.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,15 @@ 
				clocks = <&clk32k>;

			};



			shdwc@f8048010 {

				compatible = "atmel,sama5d2-shdwc";

				reg = <0xf8048010 0x10>;

				clocks = <&clk32k>;

				#address-cells = <1>;

				#size-cells = <0>;

				atmel,wakeup-rtc-timer;

			};



			pit: timer@f8048030 {

				compatible = "atmel,at91sam9260-pit";

				reg = <0xf8048030 0x10>;
@@ -1041,6 +1050,7 @@ 
				compatible = "atmel,sama5d4-wdt";

				reg = <0xf8048040 0x10>;

				interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&clk32k>;

				status = "disabled";

			};

arch/arm/boot/dts/sama5d4.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,7 @@ 
			watchdog@fc068640 {

				compatible = "atmel,sama5d4-wdt";

				reg = <0xfc068640 0x10>;

				interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&clk32k>;

				status = "disabled";

			};