* [PATCH 1/3] MAINTAINERS: Remove link to oss.renesas.com which is closed
2015-11-27 1:55 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.5 Simon Horman
@ 2015-11-27 1:55 ` Simon Horman
2015-11-27 1:55 ` [PATCH 2/3] ARM: shmobile: Introduce ARCH_RENESAS Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2015-11-27 1:55 UTC (permalink / raw)
To: linux-arm-kernel
There doesn't seem much value in keeping this link listed
in the MAINTAINERS file any more.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
MAINTAINERS | 1 -
1 file changed, 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index e9caa4b28828..bea4c8ba7a80 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1517,7 +1517,6 @@ ARM/SHMOBILE ARM ARCHITECTURE
M: Simon Horman <horms@verge.net.au>
M: Magnus Damm <magnus.damm@gmail.com>
L: linux-sh at vger.kernel.org
-W: http://oss.renesas.com
Q: http://patchwork.kernel.org/project/linux-sh/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
S: Supported
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] ARM: shmobile: Introduce ARCH_RENESAS
2015-11-27 1:55 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.5 Simon Horman
2015-11-27 1:55 ` [PATCH 1/3] MAINTAINERS: Remove link to oss.renesas.com which is closed Simon Horman
@ 2015-11-27 1:55 ` Simon Horman
2015-11-27 1:55 ` [PATCH 3/3] ARM: shmobile: Remove legacy mach/irqs.h Simon Horman
2015-12-11 23:21 ` [GIT PULL] Renesas ARM Based SoC Cleanup for v4.5 Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2015-11-27 1:55 UTC (permalink / raw)
To: linux-arm-kernel
The purpose of this patch is to start the process of replacing both
ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI with ARCH_RENESAS.
RENESAS seems to be a more appropriate name than SHMOBILE for the majority
of Renesas 32-bit ARM based SoCs. The name is conveniently also (newer)
ARM64 based SoCs.
This patches only addresses 32-bit ARM based SoCs. Proposed support for
the ARM64 based r8a7795 SoC already uses ARCH_RENESAS which selects
ARCH_SHMOBILE.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/configs/multi_v7_defconfig | 2 +-
arch/arm/configs/shmobile_defconfig | 2 +-
arch/arm/mach-shmobile/Kconfig | 10 +++++++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 69a22fdb52a5..2735bc73b285 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -75,7 +75,7 @@ CONFIG_MACH_SPEAR1340=y
CONFIG_ARCH_STI=y
CONFIG_ARCH_EXYNOS=y
CONFIG_EXYNOS5420_MCPM=y
-CONFIG_ARCH_SHMOBILE_MULTI=y
+CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_EMEV2=y
CONFIG_ARCH_R7S72100=y
CONFIG_ARCH_R8A73A4=y
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 3aef019c0de7..cc8ece33a7e3 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -9,7 +9,7 @@ CONFIG_SYSCTL_SYSCALL=y
CONFIG_EMBEDDED=y
CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
-CONFIG_ARCH_SHMOBILE_MULTI=y
+CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_EMEV2=y
CONFIG_ARCH_R7S72100=y
CONFIG_ARCH_R8A73A4=y
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 88734a5e10ca..4ed72b124235 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,6 +1,8 @@
config ARCH_SHMOBILE
bool
- select ZONE_DMA if ARM_LPAE
+
+config ARCH_SHMOBILE_MULTI
+ bool
config PM_RCAR
bool
@@ -29,10 +31,11 @@ config ARCH_RMOBILE
select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU
-menuconfig ARCH_SHMOBILE_MULTI
+menuconfig ARCH_RENESAS
bool "Renesas ARM SoCs" if ARCH_MULTI_V7
depends on MMU
select ARCH_SHMOBILE
+ select ARCH_SHMOBILE_MULTI
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select ARM_GIC
@@ -40,8 +43,9 @@ menuconfig ARCH_SHMOBILE_MULTI
select NO_IOPORT_MAP
select PINCTRL
select ARCH_REQUIRE_GPIOLIB
+ select ZONE_DMA if ARM_LPAE
-if ARCH_SHMOBILE_MULTI
+if ARCH_RENESAS
#comment "Renesas ARM SoCs System Type"
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: shmobile: Remove legacy mach/irqs.h
2015-11-27 1:55 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.5 Simon Horman
2015-11-27 1:55 ` [PATCH 1/3] MAINTAINERS: Remove link to oss.renesas.com which is closed Simon Horman
2015-11-27 1:55 ` [PATCH 2/3] ARM: shmobile: Introduce ARCH_RENESAS Simon Horman
@ 2015-11-27 1:55 ` Simon Horman
2015-12-11 23:21 ` [GIT PULL] Renesas ARM Based SoC Cleanup for v4.5 Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2015-11-27 1:55 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The header isn't needed anymore now that all SoCs use multiplatform
kernels. Remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/irqs.h | 10 ----------
arch/arm/mach-shmobile/irqs.h | 15 ---------------
arch/arm/mach-shmobile/setup-r8a7778.c | 1 -
3 files changed, 26 deletions(-)
delete mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h
delete mode 100644 arch/arm/mach-shmobile/irqs.h
diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h
deleted file mode 100644
index 5aee83f079e2..000000000000
--- a/arch/arm/mach-shmobile/include/mach/irqs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_MACH_IRQS_H
-#define __ASM_MACH_IRQS_H
-
-/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */
-
-/* External IRQ pins */
-#define IRQPIN_BASE 2000
-#define irq_pin(nr) ((nr) + IRQPIN_BASE)
-
-#endif /* __ASM_MACH_IRQS_H */
diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h
deleted file mode 100644
index 3070f6d887eb..000000000000
--- a/arch/arm/mach-shmobile/irqs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __SHMOBILE_IRQS_H
-#define __SHMOBILE_IRQS_H
-
-#include "include/mach/irqs.h"
-
-/* GIC */
-#define gic_spi(nr) ((nr) + 32)
-#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */
-
-/* GPIO IRQ */
-#define _GPIO_IRQ_BASE 2500
-#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x))
-#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y)
-
-#endif /* __SHMOBILE_IRQS_H */
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 0ab9d3272875..fab95d1271bc 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -22,7 +22,6 @@
#include <asm/mach/arch.h>
#include "common.h"
-#include "irqs.h"
#define MODEMR 0xffcc0020
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [GIT PULL] Renesas ARM Based SoC Cleanup for v4.5
2015-11-27 1:55 [GIT PULL] Renesas ARM Based SoC Cleanup for v4.5 Simon Horman
` (2 preceding siblings ...)
2015-11-27 1:55 ` [PATCH 3/3] ARM: shmobile: Remove legacy mach/irqs.h Simon Horman
@ 2015-12-11 23:21 ` Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2015-12-11 23:21 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 27 November 2015 10:55:47 Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC cleanup for v4.5.
>
> This pull request includes some minor cleanups and
> introduces ARCH_RENESAS as a firs step to migrating away
> from ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI.
>
>
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
>
> Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v4.5
>
> for you to fetch changes up to c8cd74a1468ffe20db3ddc6e6f408d5377f9be43:
>
> ARM: shmobile: Remove legacy mach/irqs.h (2015-11-19 16:28:01 -0800)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC Cleanup for v4.5
>
> * Remove now unnecessary header
> * Introduce ARCH_RENESAS
> * Remove unmaintened URL from MAINTAINERS
>
Pulled into next/cleanup, one conflict gone from linux-next.
Thanks,
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread