OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renesas ARM Based SoC Cleanup for v4.1 

* Remove redundant cpu_disable implementation from r8a7779 SoC
 * Remove mach/{uncompress,clkdev,system}.h
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJU7rjNAAoJENfPZGlqN0++WqQP/1N4QZz3IMFdsDoAjQ+qPhx6
 r19mH19k7KpOcjl1Hznu2WuuCwSP7dG6vXiynHPbWIrgSb1tlrCIG5ttN2nYa1vJ
 E0IAOYX6piCUcQnVR0lOaaxlS6kWAJuWWwjcSEUneFJYHYDjqJ0yNTeaQYPv0G5z
 ejkbkrLLZpAkimJoOeGzSt0dW1lycEFkHL/PGL0g7P63ftpwh8UD9C3h+Q0FIzsc
 tO42tZZ9gkUGZ2oJlTm47nHzb/JcGKJAy0qBbL7KzpIhX5CCyzKgItcXUo4Fd3XF
 gqsM27RjDNSocWi2GafqaYpqfBrDNgh6b5Ruch+aeO0o68wUn9L4ownIw9zHxNFw
 G1IrV6K3EHjKYnvEkFwbYfjz2nMeUPPFN+KnoZ8tTqHCnPZRTpscnL/FCh6gQylO
 oZasAggbqZmxOEGX0+6wem68A9/ez7o4nEYuji0X1DkD3wuukN9QPwzFG9td1wIn
 owrJ1OIzUHYpNNVKGC4YXGcKJQ5R+jO0GJ/0iScDUtWx2Fw69LgbCpbo9yxz3EZe
 2uMNTNcsx6VJnuRY15p4zCc1LsNKeE6UbbjweCrLlsmtkwtTQkdEZiCz53IrSEJZ
 3EUwNGeu7PLZfo3wCaoay2QzLTsqQCVh3uKzxu2HKxQnTy8esxMhVuUerMu97HXA
 uUAilFhzJy+Jtbhp1dqB
 =YRjb
 -----END PGP SIGNATURE-----

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

Pull "Renesas ARM Based SoC Cleanup for v4.1" from Simon Horman:

* Remove redundant cpu_disable implementation from r8a7779 SoC
* Remove mach/{uncompress,clkdev,system}.h

* tag 'renesas-soc-cleanup-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation
  ARM: shmobile: Remove mach/uncompress.h
  ARM: shmobile: Remove mach/clkdev.h
  ARM: shmobile: Remove mach/system.h
This commit is contained in:
Arnd Bergmann 2015-03-04 22:51:35 +01:00
parent 13a7a6ac0a fd9454ab51
commit 756c08b068
7 changed files with 2 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -646,7 +646,6 @@ config ARCH_SHMOBILE_LEGACY
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select HAVE_MACH_CLKDEV
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select MULTI_IRQ_HANDLER

3
arch/arm/Kconfig.debug
View File

@ -1573,7 +1573,8 @@ config DEBUG_UNCOMPRESS
config UNCOMPRESS_INCLUDE
string
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
PLAT_SAMSUNG || ARCH_EFM32
PLAT_SAMSUNG || ARCH_EFM32 || \
ARCH_SHMOBILE_LEGACY
default "mach/uncompress.h"
config EARLY_PRINTK

11
arch/arm/mach-shmobile/clock.c
View File

@ -45,14 +45,3 @@ int __init shmobile_clk_init(void)
return 0;
}
int __clk_get(struct clk *clk)
{
return 1;
}
EXPORT_SYMBOL(__clk_get);
void __clk_put(struct clk *clk)
{
}
EXPORT_SYMBOL(__clk_put);

7
arch/arm/mach-shmobile/include/mach/clkdev.h
View File

@ -1,7 +0,0 @@
#ifndef __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
int __clk_get(struct clk *clk);
void __clk_put(struct clk *clk);
#endif /* __ASM_MACH_CLKDEV_H */

11
arch/arm/mach-shmobile/include/mach/system.h
View File

@ -1,11 +0,0 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
#include <asm/system_misc.h>
static inline void arch_reset(char mode, const char *cmd)
{
soft_restart(0);
}
#endif

19
arch/arm/mach-shmobile/include/mach/uncompress.h
View File

@ -1,19 +0,0 @@
#ifndef __ASM_MACH_UNCOMPRESS_H
#define __ASM_MACH_UNCOMPRESS_H
/*
* This does not append a newline
*/
static void putc(int c)
{
}
static inline void flush(void)
{
}
static void arch_decomp_setup(void)
{
}
#endif /* __ASM_MACH_UNCOMPRESS_H */

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

@ -124,19 +124,12 @@ static int r8a7779_cpu_kill(unsigned int cpu)
return 0;
}
static int r8a7779_cpu_disable(unsigned int cpu)
{
/* only CPU1->3 have power domains, do not allow hotplug of CPU0 */
return cpu == 0 ? -EPERM : 0;
}
#endif /* CONFIG_HOTPLUG_CPU */
struct smp_operations r8a7779_smp_ops __initdata = {
.smp_prepare_cpus = r8a7779_smp_prepare_cpus,
.smp_boot_secondary = r8a7779_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_disable = r8a7779_cpu_disable,
.cpu_die = shmobile_smp_scu_cpu_die,
.cpu_kill = r8a7779_cpu_kill,
#endif