Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 00:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renesas ARM Based SoC Cleanup for v4.5

Browse Source 
* Remove now unnecessary header
 * Introduce ARCH_RENESAS
 * Remove unmaintened URL from MAINTAINERS
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWV6mGAAoJENfPZGlqN0++6dsP/R5ttzNOwgdQrFC7WTio5De3
 /u4oIjXtsDqKFUFF78ohlBPwNIiwzO/JJOg2fX23ECdgFIh09H1FHUG9RhZLDGSN
 ZyyJac/lsQPMEaqFkzN2HB/U7vcuTZfyV7KqiQYJgJpfeliNZ+TFuYm78KLaG1O7
 hceY2EytiGWaHDFA7wWK48s+YjT19Ojz+cKOt4+hJAvzV1qVkRRZU4Q/FsVZQmVf
 kZj5IKft3HnzY0k4U21L4YiVh3SQbnTRs69PSPqcUAHtexkB7uggFNQQQOWc0bI9
 VKGesB1PUVLP+ZR41cC+jH+z6awNwYdo/yA6VYaDne+0lDvpkQYsQ0iu+KIUdUQc
 sUUnTY6qvPAyW2/sNIkIi7Iv86umz3TYvcHvsM0enZcetbJWOykUDO+jrB9fK2iX
 FSgD/PNeF7apHYlzNHFNRXu35sg8TWbh9AXt0iES3IWnSjefv3YcHnJoc9ugoYqe
 /6b1voMghu7ZNepuKk3AKFKp5TkzI5rbZfyVVAk+z/LrVJkB+hwm/7SYxUROTUSz
 QLU1+QaSBYpeVcsOW3VCK+CQj+A/ANwDWos6dDNldKd6AfSPgxGvSppGN2v3yEdD
 fmcaCirJ1Q9rVX+ul8hBM7JGgXubs8OjYzo25iMGKKP/fDdMHySg/nqbo2uwSRQr
 hk80KzqPnSWAREhV5JCb
 =qeBx
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Cleanup for v4.5" from Simon Horman:

* Remove now unnecessary header
* Introduce ARCH_RENESAS
* Remove unmaintened URL from MAINTAINERS

* tag 'renesas-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove legacy mach/irqs.h
  ARM: shmobile: Introduce ARCH_RENESAS
  MAINTAINERS: Remove link to oss.renesas.com which is closed
This commit is contained in:
Arnd Bergmann 2015-12-12 00:20:43 +01:00
commit 60f929730a
7 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -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@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
arch/arm/configs/multi_v7_defconfig
View File

@ -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

2
arch/arm/configs/shmobile_defconfig
View File

@ -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

10
arch/arm/mach-shmobile/Kconfig
View File

@ -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"
depends on ARCH_MULTI_V7 && 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"

10
arch/arm/mach-shmobile/include/mach/irqs.h
View File

@ -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 */

15
arch/arm/mach-shmobile/irqs.h
View File

@ -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 */

1
arch/arm/mach-shmobile/setup-r8a7778.c
View File

@ -22,7 +22,6 @@
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
#define MODEMR 0xffcc0020