hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renesas ARM Based SoC Clean-Ups for v3.15 

* Renesas SoCs (Global)
   - Remove duplicate shmobile_invalidate_start() declaration
 
 * emev2 SoC (Emma Mobile)
   - Use __initconst for const init definition
 
 * r8a7779 SoC (R-Car H1)
   - Remove unused clock constants
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS8udfAAoJENfPZGlqN0++3ZMP/2Xze31UmbIru0c2DwoRdV6W
 E8ljKy3/02JDOJktaq4Xskcn6Sog/PXSTsVHiz+c+gNzZkbQqn6KOmkmG+tCI4KC
 Rqn6D/rWneXr5pNWTFD+UEySZDS6+zsZOwD6p/2a1zMYDm9WBunG3vX2qvkwDDFy
 G1peyQY6KP+wDvsvpiA32xwW395tnqoJmEM4QscRjRth+e+3z2N/P0aTH05ik/MT
 5WGzjUyUJVa6LMm4ySmkRCnpUwwgemaJ+8iIVrGGxAGSdio0/IPObmi/Z9HLd97F
 N2+qN9G0Ei8qSaD9Mw2vl+P4JSuF0z2h4PciM9S68lqFA2awpZHPtMKEeai7dzi5
 aNSsTwp6a5lDcbw0R0+49buP5zCWiP7jeQ10DzrEOHiUvxEBV54AJ2kOJzklLCPb
 miUrEGLidnbdBC96E0Vt7hWO/cdTzGF81HnEut3iU24B0PeCxUMVKJE+DEgiF05X
 8TZkjbMPKk4ZKmZKHUt6g7c8Eq8wmvnuDySBw7Y1Zw7PVEGc2C1cxQVTwQvMKsGe
 VTh2l/R8d7vakIzcI5FrK/wAL0samme119iH+D50HojtByLkIz1qHX7agz5xrRG1
 JkowQ0hVOHk09pDytmLvBYHf/dONH20ZIsZoJUIDIS1af3a2InAvXUFqz6sRX+9x
 c4zwGUOXWfiAaXnBD8W+
 =qfHb
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Clean-Ups for v3.15" from Simon Horman:

* Renesas SoCs (Global)
  - Remove duplicate shmobile_invalidate_start() declaration

* emev2 SoC (Emma Mobile)
  - Use __initconst for const init definition

* r8a7779 SoC (R-Car H1)
  - Remove unused clock constants

* tag 'renesas-cleanup-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: emev2: Use __initconst for const init definition
  ARM: shmobile: r8a7779: Remove unused clock constants
  ARM: shmobile: Remove duplicate shmobile_invalidate_start() declaration

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-02-20 00:23:41 -08:00
parent 11d73c56b9 d24d1780c3
commit 4a179c1f37
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-shmobile/clock-r8a7779.c
View File

@ -47,17 +47,10 @@
#define MD(nr) BIT(nr)
#define FRQMR IOMEM(0xffc80014)
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)
#define MSTPCR3 IOMEM(0xffc8003c)
#define MSTPSR1 IOMEM(0xffc80044)
#define MSTPSR4 IOMEM(0xffc80048)
#define MSTPSR6 IOMEM(0xffc8004c)
#define MSTPCR4 IOMEM(0xffc80050)
#define MSTPCR5 IOMEM(0xffc80054)
#define MSTPCR6 IOMEM(0xffc80058)
#define MSTPCR7 IOMEM(0xffc80040)
#define MODEMR 0xffcc0020

1
arch/arm/mach-shmobile/include/mach/common.h
View File

@ -25,7 +25,6 @@ extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,
struct task_struct *idle);
extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);
extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);
extern void shmobile_invalidate_start(void);
struct clk;
extern int shmobile_clk_init(void);
extern void shmobile_handle_irq_intc(struct pt_regs *);

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

@ -58,7 +58,7 @@ static void __init emev2_add_standard_devices_dt(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
static const char *emev2_boards_compat_dt[] __initdata = {
static const char *emev2_boards_compat_dt[] __initconst = {
"renesas,emev2",
NULL,
};