tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Arnd Bergmann ff83b377 b48e5aa6

+22 -2
+9
arch/arm/boot/dts/at91-sama5d2_xplained.dts
··· 234 234 }; 235 235 }; 236 236 237 + shdwc@f8048010 { 238 + atmel,shdwc-debouncer = <976>; 239 + 240 + input@0 { 241 + reg = <0>; 242 + atmel,wakeup-type = "low"; 243 + }; 244 + }; 245 + 237 246 watchdog@f8048040 { 238 247 status = "okay"; 239 248 };
+2 -2
arch/arm/boot/dts/sama5d2-pinfunc.h
··· 837 837 #define PIN_PD23__ISC_FIELD PINMUX_PIN(PIN_PD23, 6, 4) 838 838 #define PIN_PD24 120 839 839 #define PIN_PD24__GPIO PINMUX_PIN(PIN_PD24, 0, 0) 840 - #define PIN_PD24__UTXD2 PINMUX_PIN(PIN_PD23, 1, 2) 841 - #define PIN_PD24__FLEXCOM4_IO3 PINMUX_PIN(PIN_PD23, 3, 3) 840 + #define PIN_PD24__UTXD2 PINMUX_PIN(PIN_PD24, 1, 2) 841 + #define PIN_PD24__FLEXCOM4_IO3 PINMUX_PIN(PIN_PD24, 3, 3) 842 842 #define PIN_PD25 121 843 843 #define PIN_PD25__GPIO PINMUX_PIN(PIN_PD25, 0, 0) 844 844 #define PIN_PD25__SPI1_SPCK PINMUX_PIN(PIN_PD25, 1, 3)
+10
arch/arm/boot/dts/sama5d2.dtsi
··· 1030 1030 clocks = <&clk32k>; 1031 1031 }; 1032 1032 1033 + shdwc@f8048010 { 1034 + compatible = "atmel,sama5d2-shdwc"; 1035 + reg = <0xf8048010 0x10>; 1036 + clocks = <&clk32k>; 1037 + #address-cells = <1>; 1038 + #size-cells = <0>; 1039 + atmel,wakeup-rtc-timer; 1040 + }; 1041 + 1033 1042 pit: timer@f8048030 { 1034 1043 compatible = "atmel,at91sam9260-pit"; 1035 1044 reg = <0xf8048030 0x10>; ··· 1050 1041 compatible = "atmel,sama5d4-wdt"; 1051 1042 reg = <0xf8048040 0x10>; 1052 1043 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>; 1044 + clocks = <&clk32k>; 1053 1045 status = "disabled"; 1054 1046 }; 1055 1047
+1
arch/arm/boot/dts/sama5d4.dtsi
··· 1302 1302 watchdog@fc068640 { 1303 1303 compatible = "atmel,sama5d4-wdt"; 1304 1304 reg = <0xfc068640 0x10>; 1305 + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>; 1305 1306 clocks = <&clk32k>; 1306 1307 status = "disabled"; 1307 1308 };