redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Third Round of Renesas ARM Based Soc Updates for v3.19

Browse source 
* Always build rcar setup for armv7
   - Fixes allmodconfig build fauilre caused by
     "ARM: shmobile: always build rcar setup for armv7"
 * Add restart callback to sh73a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUZAalAAoJENfPZGlqN0++VREP/3y7uJB/lLTr1u0tXiBHGAUX
 ElNcUR7JgDnfWyhVwh9Nyo91kx3A95Z72PzouGQQVVmZc1ZuhIU/XKCjDRRGuTHY
 JiWNacLNVHXCm4tQ//T7MjTEt7jXeUKciSLlq4vSHk4Wn0uUYEWibYDIrrysm0d/
 7JAxJL+D59AUfGcL9rTiuolCtBLgB6V099WE0WNTFeWxktfCORQiiuck3yv54Ar7
 djxLAsjDQgtWszUzaVlLJjeI/X9bRCO1yWzCmSRR4Kek0A/ZTCH5UrpWlc3fkUyz
 zdmRv0IherWn/PB1NTdVlgSDDeDOmIPu9K2JIvaVbfRyRAKehkqjqdEbUYWc+F88
 gICU8y2qBBl1/F8xVhS1dPMyGlTkebzFPAXbUCPVrtfVJdmhAMKoWZ5cGG3gap9L
 nvhaj7CxU3hCfBUUYz7AtmpCBXN6WY/HNldR4JK9rw+eW+NZVOM+P5xnjvyYwhb6
 2oua8RL99qzWxaXbWdIisLK9/YgDQFCF3id/f21Wvawb+uoNJjiyFIOiTJ0SLj9H
 02EX7rrbwm9eVNGgNUJnjPWpW7YcUUPJFk4qv1VLCsHwNyvBfLbs3A6hxG7fJF7x
 HKmMK8FRCtYTWHIUqMkCJ3SQ3ineK6rrmf1HyrNa0rBdr1uhgAVAAsX/LDKDY1Fe
 o9pWDKsfYjNN8KARepBN
 =H86n
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Pull "Third Round of Renesas ARM Based Soc Updates for v3.19" from Simon Horman:

* Always build rcar setup for armv7
  - Fixes allmodconfig build fauilre caused by
    "ARM: shmobile: always build rcar setup for armv7"
* Add restart callback to sh73a0

* tag 'renesas-soc3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: always build rcar setup for armv7
  ARM: shmobile: sh73a0: Add restart callback

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2014-11-19 22:11:03 +01:00
parent 0a1d643450 e3d1633297
commit b4e2c4bf4f
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-shmobile/Makefile
View file

@ -36,6 +36,7 @@ cpu-y := platsmp.o headsmp.o
# Shared SoC family objects
obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)
CFLAGS_setup-rcar-gen2.o += -march=armv7-a
# SMP objects
smp-y := $(cpu-y)

8
arch/arm/mach-shmobile/setup-sh73a0.c
View file

@ -775,6 +775,13 @@ void __init sh73a0_add_standard_devices_dt(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
#define RESCNT2 IOMEM(0xe6188020)
static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
{
/* Do soft power on reset */
writel((1 << 31), RESCNT2);
}
static const char *sh73a0_boards_compat_dt[] __initdata = {
"renesas,sh73a0",
NULL,
@ -786,6 +793,7 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.init_early = sh73a0_init_delay,
.init_machine = sh73a0_add_standard_devices_dt,
.init_late = shmobile_init_late,
.restart = sh73a0_restart,
.dt_compat = sh73a0_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */