Commit 50ba3700 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-soc-for-v4.21' of... 

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

Renesas ARM Based SoC Updates for v4.21

* pm-rmobile driver
  - Move to drivers/soc/renesas/
  - Clean up struct rmobile_pm_domain
* Renesas SoC Kconfig Symbols
  - Move symbols for ARM and SoCs to drivers/soc/renesas/
  - Hide ARCH_RZN1 to improve consistency
* SH-Mobile AG5 (sh73a0) SoC: Remove obsolete inclusion of <asm/smp_twd.h>
* Restrict TWD and SCU to Renesas ARM based SoCs where they are present
* Enable GPIOLIB on Renesas arm64 based SoCs to allow GPIO driver selection

* tag 'renesas-soc-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/
  ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain
  ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/
  arm64: renesas: Move SoC Kconfig symbols to drivers/soc/renesas/
  ARM: shmobile: Hide ARCH_RZN1 to improve consistency
  ARM: shmobile: sh73a0: Remove obsolete inclusion of <asm/smp_twd.h>
  ARM: shmobile: Restrict TWD support to SoCs that have it
  ARM: shmobile: Restrict SCU support to SoCs that have it
  arm64: renesas: Enable GPIOLIB to allow GPIO driver selection

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ac21e9af 2ed29e15

arch/arm/mach-shmobile/Kconfig

+0 −129
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config PM_RMOBILE

	bool

	select PM

	select PM_GENERIC_DOMAINS



config ARCH_RCAR_GEN1

	bool

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_INTC_IRQPIN

	select SYS_SUPPORTS_SH_TMU



config ARCH_RCAR_GEN2

	bool

	select HAVE_ARM_ARCH_TIMER

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_IRQC

	select SYS_SUPPORTS_SH_CMT



config ARCH_RMOBILE

	bool

	select PM_RMOBILE

	select SYS_SUPPORTS_SH_CMT

	select SYS_SUPPORTS_SH_TMU



menuconfig ARCH_RENESAS

	bool "Renesas ARM SoCs"

	depends on ARCH_MULTI_V7 && MMU

	select ARM_GIC

	select GPIOLIB

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select NO_IOPORT_MAP

	select PINCTRL

	select SOC_BUS

	select ZONE_DMA if ARM_LPAE
 


if ARCH_RENESAS



#comment "Renesas ARM SoCs System Type"



config ARCH_EMEV2

	bool "Emma Mobile EV2"

	select SYS_SUPPORTS_EM_STI



config ARCH_R7S72100

	bool "RZ/A1H (R7S72100)"

	select PM

	select PM_GENERIC_DOMAINS

	select SYS_SUPPORTS_SH_MTU2

	select RENESAS_OSTM



config ARCH_R7S9210

	bool "RZ/A2 (R7S9210)"

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM



config ARCH_R8A73A4

	bool "R-Mobile APE6 (R8A73A40)"

	select ARCH_RMOBILE

	select ARM_ERRATA_798181 if SMP

	select HAVE_ARM_ARCH_TIMER

	select RENESAS_IRQC



config ARCH_R8A7740

	bool "R-Mobile A1 (R8A77400)"

	select ARCH_RMOBILE

	select RENESAS_INTC_IRQPIN



config ARCH_R8A7743

	bool "RZ/G1M (R8A77430)"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP



config ARCH_R8A7744

	bool "RZ/G1N (R8A77440)"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP



config ARCH_R8A7745

	bool "RZ/G1E (R8A77450)"

	select ARCH_RCAR_GEN2



config ARCH_R8A77470

	bool "RZ/G1C (R8A77470)"

	select ARCH_RCAR_GEN2



config ARCH_R8A7778

	bool "R-Car M1A (R8A77781)"

	select ARCH_RCAR_GEN1



config ARCH_R8A7779

	bool "R-Car H1 (R8A77790)"

	select ARCH_RCAR_GEN1



config ARCH_R8A7790

	bool "R-Car H2 (R8A77900)"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select I2C



config ARCH_R8A7791

	bool "R-Car M2-W (R8A77910)"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select I2C



config ARCH_R8A7792

	bool "R-Car V2H (R8A77920)"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP



config ARCH_R8A7793

	bool "R-Car M2-N (R8A7793)"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select I2C



config ARCH_R8A7794

	bool "R-Car E2 (R8A77940)"

	select ARCH_RCAR_GEN2



config ARCH_R9A06G032

	bool "RZ/N1D (R9A06G032)"

	select ARCH_RZN1



config ARCH_RZN1

	bool "RZ/N1 (R9A06G0xx) Family"

	select ARM_AMBA

	select CPU_V7



config ARCH_SH73A0

	bool "SH-Mobile AG5 (R8A73A00)"

	select ARCH_RMOBILE

	select RENESAS_INTC_IRQPIN

endif

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o 


# PM objects

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o



# Framework support

arch/arm/mach-shmobile/pm-rmobile.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * Kuninori Morimoto <morimoto.kuninori@renesas.com>

 */

#ifndef PM_RMOBILE_H

#define PM_RMOBILE_H



#include <linux/pm_domain.h>



struct rmobile_pm_domain {

	struct generic_pm_domain genpd;

	struct dev_power_governor *gov;

	int (*suspend)(void);

	void (*resume)(void);

	void __iomem *base;

	unsigned int bit_shift;

	bool no_debug;

};



#endif /* PM_RMOBILE_H */

arch/arm/mach-shmobile/smp-sh73a0.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/delay.h>



#include <asm/smp_plat.h>

#include <asm/smp_twd.h>



#include "common.h"

#include "sh73a0.h"

arch/arm64/Kconfig.platforms

+1 −59
Original line number Diff line number Diff line
@@ -157,70 +157,12 @@ config ARCH_REALTEK 


config ARCH_RENESAS

	bool "Renesas SoC Platforms"

	select GPIOLIB

	select PINCTRL

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_IRQC

	select SOC_BUS

	select SYS_SUPPORTS_SH_CMT

	select SYS_SUPPORTS_SH_TMU

	help

	  This enables support for the ARMv8 based Renesas SoCs.



config ARCH_R8A774A1

	bool "Renesas RZ/G2M SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas RZ/G2M SoC.



config ARCH_R8A774C0

	bool "Renesas RZ/G2E SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas RZ/G2E SoC.



config ARCH_R8A7795

	bool "Renesas R-Car H3 SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car H3 SoC.



config ARCH_R8A7796

	bool "Renesas R-Car M3-W SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car M3-W SoC.



config ARCH_R8A77965

	bool "Renesas R-Car M3-N SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car M3-N SoC.



config ARCH_R8A77970

	bool "Renesas R-Car V3M SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car V3M SoC.



config ARCH_R8A77980

	bool "Renesas R-Car V3H SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car V3H SoC.



config ARCH_R8A77990

	bool "Renesas R-Car E3 SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car E3 SoC.



config ARCH_R8A77995

	bool "Renesas R-Car D3 SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car D3 SoC.



config ARCH_ROCKCHIP

	bool "Rockchip Platforms"

	select ARCH_HAS_RESET_CONTROLLER

CRA Git | Maintained and supported by SUSTech CRA and CCSE