UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renesas ARM Based SoC Updates for v4.9 

Clean-up:
 * Only use smp_init when SMP is selected
 
 Enablement:
 * Add debug-ll support for r8a7992
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXz8Q6AAoJENfPZGlqN0++mNgQAKxv/KqBfxtX3rpZ6dqrjCK3
 zIP8VtsWD7R12kdHizmYZKXqpRK2K7UzRhebEinIXcu2jXgqZROFRizxrDoYGUXL
 nQJVPnc4PrMASowZuwzVBMYMD8mWUjCIVG6/YMmPXJMNj7+DXAFdWC267mAavRhJ
 jxvSr0NAmPQBd8AQR1tLCkuZQ6Ms1xzG/lb4Prjc1uPuJH5gNwPfdZNzueFbcvtG
 OvB+SH9c7RjRu9pIm7nnWryJh7pBAULTdRDjq/BscQLBOCoS2XhUDFnsvKOwUmxs
 DlKdDSXEjsrMvzrVKAehK6VNGCFwJkn2RvF+wyIz1dnggVipP8PBrkXXQBuI+ky/
 MFrhKBV/qFkLjoJaC36DSW6asjyHfKT2ZnECueVjhW5oLWEEXJVBLEtveSHL0JYv
 Z/FNoXGZ9zWkr/7xf8pzYYJ1YqxXmzTWvpNLim8poVOTWNfH2vsAaa8rwGhlCbR/
 g2J3+7jVCpwVHFd6yAOCmHad3LXAU2wWzTwKUVAJ2jwIyvgxyrKWUeLkow98sBw3
 apTQBmSLMRwQ/nui3nBaPxG1gcOt76N2kW4VsmW8JgHwHEb9c/xKIPTNhz+fYwIn
 AsySm9UswhPfg/fE3QK/xU9o6CIFDQ9mtFteUqcXqOKklt0qRIFpstgBIqo0yKxL
 MiXIw1Z63Nd6Rin3MeY7
 =7Opm
 -----END PGP SIGNATURE-----

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

Pull "Renesas ARM Based SoC Updates for v4.9" from Simon Horman:

Clean-up:
* Only use smp_init when SMP is selected

Enablement:
* Add debug-ll support for r8a7992

* tag 'renesas-soc-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: only use smp_init when SMP is selected
  ARM: shmobile: r8a7790: only use smp_init when SMP is selected
  ARM: debug-ll: Add support for r8a7992
This commit is contained in:
Arnd Bergmann 2016-09-15 00:27:27 +02:00
parent ea58e97d66 82acc69402
commit f6b2dae76e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/Kconfig.debug
View File

@ -862,12 +862,12 @@ choice
via SCIF2 on Renesas R-Car H1 (R8A7779).
config DEBUG_RCAR_GEN2_SCIF0
bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793"
depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7793
bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7792/R8A7793"
depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7792 || ARCH_R8A7793
help
Say Y here if you want kernel low-level debugging support
via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), or
M2-N (R8A7793).
via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), V2H
(R8A7792), or M2-N (R8A7793).
config DEBUG_RCAR_GEN2_SCIF2
bool "Kernel low-level debugging messages via SCIF2 on R8A7794"

2
arch/arm/mach-shmobile/setup-r8a7790.c
View File

@ -28,7 +28,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = {
};
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
.smp_init = shmobile_smp_init_fallback_ops,
.smp_init = smp_init_ops(shmobile_smp_init_fallback_ops),
.smp = smp_ops(r8a7790_smp_ops),
.init_early = shmobile_init_delay,
.init_time = rcar_gen2_timer_init,

2
arch/arm/mach-shmobile/setup-r8a7791.c
View File

@ -29,7 +29,7 @@ static const char *const r8a7791_boards_compat_dt[] __initconst = {
};
DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
.smp_init = shmobile_smp_init_fallback_ops,
.smp_init = smp_init_ops(shmobile_smp_init_fallback_ops),
.smp = smp_ops(r8a7791_smp_ops),
.init_early = shmobile_init_delay,
.init_time = rcar_gen2_timer_init,