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

Commit 18759462 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c3548b73 8a934ccb

arch/arm/boot/dts/at91sam9x5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 


			pmc: pmc@fffffc00 {

				compatible = "atmel,at91sam9x5-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				reg = <0xfffffc00 0x200>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupt-controller;

				#address-cells = <1>;

arch/arm/boot/dts/sama5d2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ 
			status = "disabled";



			nfc@c0000000 {

				compatible = "atmel,sama5d4-nfc";

				compatible = "atmel,sama5d3-nfc";

				#address-cells = <1>;

				#size-cells = <1>;

				reg = < /* NFC Command Registers */

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ menu "Platform selection" 


config ARCH_SUNXI

	bool "Allwinner sunxi 64-bit SoC Family"

	select GENERIC_IRQ_CHIP

	help

	  This enables support for Allwinner sunxi based SoCs like the A64.