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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
"Three more bug fixes for ARM SoCs this week:

- The Atmel sama5d2 was registering the wrong NFC device type

- On Atmel sam9x5, the power management controller had an incorrect
register area size

- On ARM64 Allwinner machine was not secting the generic irqchip
code, causing build errors in some configurations"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: at91: sam9x5: Fix the memory range assigned to the PMC
arm64/sunxi: 4.6-rc1: Add dependency on generic irq chip
ARM: dts: at91: sama5d2: use "atmel,sama5d3-nfc" compatible for nfc

Linus Torvalds 18759462 c3548b73

+3 -2
+1 -1
arch/arm/boot/dts/at91sam9x5.dtsi
··· 106 106 107 107 pmc: pmc@fffffc00 { 108 108 compatible = "atmel,at91sam9x5-pmc", "syscon"; 109 - reg = <0xfffffc00 0x100>; 109 + reg = <0xfffffc00 0x200>; 110 110 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; 111 111 interrupt-controller; 112 112 #address-cells = <1>;
+1 -1
arch/arm/boot/dts/sama5d2.dtsi
··· 280 280 status = "disabled"; 281 281 282 282 nfc@c0000000 { 283 - compatible = "atmel,sama5d4-nfc"; 283 + compatible = "atmel,sama5d3-nfc"; 284 284 #address-cells = <1>; 285 285 #size-cells = <1>; 286 286 reg = < /* NFC Command Registers */
+1
arch/arm64/Kconfig.platforms
··· 2 2 3 3 config ARCH_SUNXI 4 4 bool "Allwinner sunxi 64-bit SoC Family" 5 + select GENERIC_IRQ_CHIP 5 6 help 6 7 This enables support for Allwinner sunxi based SoCs like the A64. 7 8