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

Commit 63862f14 authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'heads/soc2' into boards2-base

parents b77c6bce 2349199d

arch/arm/boot/dts/r7s72100.dtsi

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

 * Device Tree Source for the r7s72100 SoC

 *

 * Copyright (C) 2013 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.

 */



/ {

	compatible = "renesas,r7s72100";

	interrupt-parent = <&gic>;

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

		};

	};



	gic: interrupt-controller@e8201000 {

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

		#interrupt-cells = <3>;

		#address-cells = <0>;

		interrupt-controller;

		reg = <0xe8201000 0x1000>,

			<0xe8202000 0x1000>;

	};

};

arch/arm/mach-shmobile/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,12 @@ config ARCH_EMEV2 
	select ARM_GIC

	select CPU_V7



config ARCH_R7S72100

	bool "RZ/A1H (R7S72100)"

	select ARM_GIC

	select CPU_V7

	select SH_CLK_CPG



comment "SH-Mobile Board Type"



config MACH_APE6EVM

arch/arm/mach-shmobile/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o 
obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o

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

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o

obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o setup-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o setup-rcar-gen2.o

obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o

obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o



# Clock objects

ifndef CONFIG_COMMON_CLK
@@ -30,12 +32,15 @@ obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o 
obj-$(CONFIG_ARCH_R8A7790)	+= clock-r8a7790.o

obj-$(CONFIG_ARCH_R8A7791)	+= clock-r8a7791.o

obj-$(CONFIG_ARCH_EMEV2)	+= clock-emev2.o

obj-$(CONFIG_ARCH_R7S72100)	+= clock-r7s72100.o

endif



# SMP objects

smp-y				:= platsmp.o headsmp.o

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

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_R8A7790)	+= smp-r8a7790.o platsmp-apmu.o

smp-$(CONFIG_ARCH_R8A7791)	+= smp-r8a7791.o platsmp-apmu.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o headsmp-scu.o platsmp-scu.o



# IRQ objects

arch/arm/mach-shmobile/board-ape6evm-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_delay,

	.init_early	= r8a73a4_init_early,

	.init_machine	= ape6evm_add_standard_devices,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_delay,

	.init_early	= r8a73a4_init_early,

	.init_machine	= ape6evm_add_standard_devices,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END