Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be32bcbb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc 



Move the pm-rcar driver from arch/arm/mach-shmobile/ to
drivers/soc/renesas/, and its header file to include/linux/soc/renesas/,
so it can be shared between arm32 (R-Car H1 and Gen2) and arm64 (R-Car
Gen3). Rename it to rcar-sysc as it's really a driver for the R-Car
System Controller (SYSC).

Kill the intermediate PM_RCAR config symbol, as it's not user
configurable anymore, and to prepare for SoC-specific make rules.

Add the missing #include <linux/types.h> to rcar-sysc.h, which was
exposed by different include order.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent a93fed09

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,8 @@ Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next

S:	Supported

F:	arch/arm64/boot/dts/renesas/

F:	drivers/soc/renesas/

F:	include/linux/soc/renesas/



ARM/RISCPC ARCHITECTURE

M:	Russell King <linux@arm.linux.org.uk>
@@ -1604,6 +1606,8 @@ F: arch/arm/configs/shmobile_defconfig 
F:	arch/arm/include/debug/renesas-scif.S

F:	arch/arm/mach-shmobile/

F:	drivers/sh/

F:	drivers/soc/renesas/

F:	include/linux/soc/renesas/



ARM/SOCFPGA ARCHITECTURE

M:	Dinh Nguyen <dinguyen@opensource.altera.com>

arch/arm/mach-shmobile/Kconfig

+4 −7
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ config ARCH_SHMOBILE 
config ARCH_SHMOBILE_MULTI

	bool



config PM_RCAR

	bool

	select PM

	select PM_GENERIC_DOMAINS



config PM_RMOBILE

	bool

	select PM
@@ -16,13 +11,15 @@ config PM_RMOBILE 


config ARCH_RCAR_GEN1

	bool

	select PM_RCAR

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_INTC_IRQPIN

	select SYS_SUPPORTS_SH_TMU



config ARCH_RCAR_GEN2

	bool

	select PM_RCAR

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_IRQC

	select SYS_SUPPORTS_SH_CMT

	select PCI_DOMAINS if PCI

arch/arm/mach-shmobile/Makefile

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

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o

obj-$(CONFIG_PM_RCAR)		+= pm-rcar.o

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

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

arch/arm/mach-shmobile/pm-r8a7779.c

+2 −1
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ 
 * for more details.

 */



#include <linux/soc/renesas/rcar-sysc.h>



#include <asm/io.h>



#include "pm-rcar.h"

#include "r8a7779.h"



/* SYSC */

arch/arm/mach-shmobile/pm-rcar-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/smp.h>

#include <linux/soc/renesas/rcar-sysc.h>

#include <asm/io.h>

#include "common.h"

#include "pm-rcar.h"

#include "rcar-gen2.h"



/* RST */