Commit 5083c542 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull ARM SoC cleanups from Olof Johansson:
 "A smallish number of general cleanup commits this release cycle.  Some
  of these are minor tweaks:

   - shmobile change of binding for their GIC (using arm,pl390 now)
   - ARCH_RENESAS introduction
   - Misc other renesas updates

  There's also a couple of treewide commits from Masahiro Yamada
  cleaning up const/__initconst for SMP operation structs and a switch
  to using "depends on" instead of if-constructs on most of the Kconfig
  platform targets"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  staging: board: armadillo800eva: Use "arm,pl390"
  staging: board: kzm9d: Use "arm,pl390"
  ARM: shmobile: r8a7778 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: emev2 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: r8a7740 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: r7s72100 dtsi: Use "arm,pl390" for GIC
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures
  ARM: mvebu: remove unused mach/gpio.h
  ARM: shmobile: Remove legacy mach/irqs.h
  ARM: shmobile: Introduce ARCH_RENESAS
  MAINTAINERS: Remove link to oss.renesas.com which is closed
parents 0c582826 0ef917f4
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -1532,7 +1532,6 @@ ARM/SHMOBILE ARM ARCHITECTURE
M:	Simon Horman <horms@verge.net.au>
M:	Magnus Damm <magnus.damm@gmail.com>
L:	linux-renesas-soc@vger.kernel.org
W:	http://oss.renesas.com
Q:	http://patchwork.kernel.org/project/linux-renesas-soc/list/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
S:	Supported
+2 −1
Original line number Diff line number Diff line
@@ -806,7 +806,8 @@ config ARCH_MULTI_CPU_AUTO
endmenu

config ARCH_VIRT
	bool "Dummy Virtual Machine" if ARCH_MULTI_V7
	bool "Dummy Virtual Machine"
	depends on ARCH_MULTI_V7
	select ARM_AMBA
	select ARM_GIC
	select ARM_GIC_V2M if PCI_MSI
+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@
	};

	gic: interrupt-controller@e0020000 {
		compatible = "arm,cortex-a9-gic";
		compatible = "arm,pl390";
		interrupt-controller;
		#interrupt-cells = <3>;
		reg = <0xe0028000 0x1000>,
+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@
	};

	gic: interrupt-controller@e8201000 {
		compatible = "arm,cortex-a9-gic";
		compatible = "arm,pl390";
		#interrupt-cells = <3>;
		#address-cells = <0>;
		interrupt-controller;
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
	};

	gic: interrupt-controller@c2800000 {
		compatible = "arm,cortex-a9-gic";
		compatible = "arm,pl390";
		#interrupt-cells = <3>;
		interrupt-controller;
		reg = <0xc2800000 0x1000>,
Loading