* [PATCH 1/4] ARM: shmobile: Remove mach/system.h
2015-02-26 6:22 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
@ 2015-02-26 6:22 ` Simon Horman
2015-02-26 6:22 ` [PATCH 2/4] ARM: shmobile: Remove mach/clkdev.h Simon Horman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-02-26 6:22 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
The file <mach/system.h> is no longer included from anywhere so
clean up the code by removing mach-shmobile/include/mach/system.h
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/system.h | 11 -----------
1 file changed, 11 deletions(-)
delete mode 100644 arch/arm/mach-shmobile/include/mach/system.h
diff --git a/arch/arm/mach-shmobile/include/mach/system.h b/arch/arm/mach-shmobile/include/mach/system.h
deleted file mode 100644
index 540eaff..0000000
--- a/arch/arm/mach-shmobile/include/mach/system.h
+++ /dev/null
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: shmobile: Remove mach/clkdev.h
2015-02-26 6:22 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
2015-02-26 6:22 ` [PATCH 1/4] ARM: shmobile: Remove mach/system.h Simon Horman
@ 2015-02-26 6:22 ` Simon Horman
2015-02-26 6:22 ` [PATCH 3/4] ARM: shmobile: Remove mach/uncompress.h Simon Horman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-02-26 6:22 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Move over ARCH_SHMOBILE_LEGACY to use the default legacy ARM
implementations of __clk_get() and __clk_put() in <asm/clkdev.h>
by deselecting HAVE_MACH_CLKDEV. This has the nice side effect
that <mach/clkdev.h> is no longer used and can be removed.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/Kconfig | 1 -
arch/arm/mach-shmobile/clock.c | 11 -----------
arch/arm/mach-shmobile/include/mach/clkdev.h | 7 -------
3 files changed, 19 deletions(-)
delete mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9f1f09a..495fb7a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/arm/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c
index 34f056f..68c2d06 100644
--- a/arch/arm/mach-shmobile/clock.c
+++ b/arch/arm/mach-shmobile/clock.c
@@ -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);
diff --git a/arch/arm/mach-shmobile/include/mach/clkdev.h b/arch/arm/mach-shmobile/include/mach/clkdev.h
deleted file mode 100644
index 36d0163..0000000
--- a/arch/arm/mach-shmobile/include/mach/clkdev.h
+++ /dev/null
@@ -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 */
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: shmobile: Remove mach/uncompress.h
2015-02-26 6:22 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
2015-02-26 6:22 ` [PATCH 1/4] ARM: shmobile: Remove mach/system.h Simon Horman
2015-02-26 6:22 ` [PATCH 2/4] ARM: shmobile: Remove mach/clkdev.h Simon Horman
@ 2015-02-26 6:22 ` Simon Horman
2015-02-26 6:22 ` [PATCH 4/4] ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation Simon Horman
2015-03-04 21:54 ` [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1 Arnd Bergmann
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-02-26 6:22 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Convert ARCH_SHMOBILE_LEGACY to make use of <debug/uncompress.h>
and remove the now unused <mach/uncompress.h>.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/Kconfig.debug | 3 ++-
arch/arm/mach-shmobile/include/mach/uncompress.h | 19 -------------------
2 files changed, 2 insertions(+), 20 deletions(-)
delete mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 970de75..1ca8dc7 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -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
diff --git a/arch/arm/mach-shmobile/include/mach/uncompress.h b/arch/arm/mach-shmobile/include/mach/uncompress.h
deleted file mode 100644
index f1aee567..0000000
--- a/arch/arm/mach-shmobile/include/mach/uncompress.h
+++ /dev/null
@@ -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 */
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation
2015-02-26 6:22 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
` (2 preceding siblings ...)
2015-02-26 6:22 ` [PATCH 3/4] ARM: shmobile: Remove mach/uncompress.h Simon Horman
@ 2015-02-26 6:22 ` Simon Horman
2015-03-04 21:54 ` [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1 Arnd Bergmann
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-02-26 6:22 UTC (permalink / raw)
To: linux-arm-kernel
From: Stephen Boyd <sboyd@codeaurora.org>
By default only the non-boot CPUs can be hotplugged if the
smp_operations structure doesn't have the cpu_disable function
pointer set. r8a7779_cpu_disable() implements the same logic,
only non-boot CPUs can be hotplugged, so it's redundant to
override the default behavior.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/smp-r8a7779.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 9fc280e..01f792f 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1
2015-02-26 6:22 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
` (3 preceding siblings ...)
2015-02-26 6:22 ` [PATCH 4/4] ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation Simon Horman
@ 2015-03-04 21:54 ` Arnd Bergmann
4 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2015-03-04 21:54 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 26 February 2015 15:22:32 Simon Horman wrote:
> ----------------------------------------------------------------
> Renesas ARM Based SoC Cleanup for v4.1
>
> * Remove redundant cpu_disable implementation from r8a7779 SoC
> * Remove mach/{uncompress,clkdev,system}.h
>
We have a lot of work for multiplatform this time, with your changes,
at91 and the patches I send over the last week. I've decided to
create a next/multiplatform branch for this, and merge your patches
into that one.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread