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

Commit 0475e57f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc 

From Simon Horman, a series of SoC updates for shmobile.

* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a7779: scif .irqs used SCIx_IRQ_MUXED()
  ARM: mach-shmobile: sh73a0: Initialise MMCIF using DT
  ARM: mach-shmobile: sh73a0: Minimal setup using DT
  ARM: mach-shmobile: sh73a0: Allow initialisation of GIC by DT
  ARM: SH-Mobile: sh73a0: Add CPU Hotplug
  ARM: SH-Mobile: sh73a0: Secondary CPUs handle own SCU flags
  ARM: shmobile: r8a7740: Add CPU sleep suspend
  ARM: shmobile: sh73a0: Add CPU sleep suspend
  ARM: shmobile: add function declarations for sh7372 DT helper functions
  ARM: sh7372: fix cache clean / invalidate order
  ARM: sh7372: add clock lookup entries for DT-based devices
  ARM: mach-shmobile: sh73a0 external IRQ wake update
  ARM: shmobile: sh73a0: fixup div4_clks bitmap
  ARM: shmobile: r8a7740: add TMU timer support
  ARM: shmobile: Remove duplicate inclusion of dma-mapping.h in setup-r8a7740.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

Fix trivial conflict in board_bcm due to Simon resolving the same conflict
with one less line of whitespace. Keeping end result common with what
we already have in arm-soc.

Conflicts:
	arch/arm/mach-bcm/board_bcm.c
parents 2806683c ff8de98d

arch/arm/boot/dts/sh73a0-reference.dtsi

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the SH73A0 SoC

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "sh73a0.dtsi"



/ {

	compatible = "renesas,sh73a0";



	mmcif: mmcif@0x10010000 {

		compatible = "renesas,sh-mmcif";

		reg = <0xe6bd0000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 140 0x4

			      0 141 0x4>;

		reg-io-width = <4>;

	};

};

arch/arm/boot/dts/sh73a0.dtsi

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the SH73A0 SoC

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "skeleton.dtsi"



/ {

	compatible = "renesas,sh73a0";



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a9";

		};

		cpu@1 {

			compatible = "arm,cortex-a9";

		};

	};



	gic: interrupt-controller@f0001000 {

		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <1>;

		interrupt-controller;

		reg = <0xf0001000 0x1000>,

		      <0xf0000100 0x100>;

	};



	i2c0: i2c@0xe6820000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xe6820000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 167 0x4

			      0 168 0x4

			      0 169 0x4

			      0 170 0x4>;

	};



	i2c1: i2c@0xe6822000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xe6822000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 51 0x4

			      0 52 0x4

			      0 53 0x4

			      0 54 0x4>;

	};



	i2c2: i2c@0xe6824000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xe6824000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 171 0x4

			      0 172 0x4

			      0 173 0x4

			      0 174 0x4>;

	};



	i2c3: i2c@0xe6826000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xe6826000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 183 0x4

			      0 184 0x4

			      0 185 0x4

			      0 186 0x4>;

	};



	i2c4: i2c@0xe6828000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xe6828000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 187 0x4

			      0 188 0x4

			      0 189 0x4

			      0 190 0x4>;

	};

};

arch/arm/mach-shmobile/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o clock-emev2.o 
# SMP objects

smp-y				:= platsmp.o headsmp.o

smp-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-sh73a0.o

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o
@@ -37,6 +37,7 @@ obj-$(CONFIG_ARCH_SHMOBILE) += pm-rmobile.o 
obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o

obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740.o

obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o

obj-$(CONFIG_ARCH_SH73A0)	+= pm-sh73a0.o



# Board objects

obj-$(CONFIG_MACH_AP4EVB)	+= board-ap4evb.o

arch/arm/mach-shmobile/board-armadillo800eva.c

+2 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,8 @@ static void __init eva_init(void) 
	rmobile_add_device_to_domain("A4LC", &hdmi_lcdc_device);

	if (usb)

		rmobile_add_device_to_domain("A3SP", usb);



	r8a7740_pm_init();

}



static void __init eva_earlytimer_init(void)

arch/arm/mach-shmobile/board-kzm9g.c

+2 −0
Original line number Diff line number Diff line
@@ -772,6 +772,8 @@ static void __init kzm_init(void) 


	sh73a0_add_standard_devices();

	platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));



	sh73a0_pm_init();

}



static void kzm9g_restart(char mode, const char *cmd)