Commit 60f92973 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-cleanup-for-v4.5' of... 

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
parents 80f7273c c8cd74a1

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/shmobile_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-shmobile/Kconfig

+7 −3
Original line number Diff line number Diff line 
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"

arch/arm/mach-shmobile/include/mach/irqs.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
#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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE