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

Commit c3d3dbdd authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Renesas ARM Based SoC Updates for v4.3

* Add basic support for gose/r8a7793

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

:
  ARM: shmobile: gose: enable R-Car Gen2 regulator quirk
  ARM: shmobile: Basic r8a7793 SoC support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7bd1584b 765b5003

arch/arm/mach-shmobile/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ config ARCH_R8A7791 
	select ARCH_RCAR_GEN2

	select I2C



config ARCH_R8A7793

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

	select ARCH_RCAR_GEN2

	select I2C



config ARCH_R8A7794

	bool "R-Car E2 (R8A77940)"

	select ARCH_RCAR_GEN2

arch/arm/mach-shmobile/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o 
obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o pm-r8a7779.o

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o

obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o

obj-$(CONFIG_ARCH_R8A7793)	+= setup-r8a7793.o

obj-$(CONFIG_ARCH_R8A7794)	+= setup-r8a7794.o

obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o

obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o
@@ -34,6 +35,7 @@ obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y) 
CFLAGS_setup-rcar-gen2.o	+= -march=armv7-a

obj-$(CONFIG_ARCH_R8A7790)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7791)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7793)	+= regulator-quirk-rcar-gen2.o



# SMP objects

smp-y				:= $(cpu-y)

arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ static int __init rcar_gen2_regulator_quirk(void) 
	u32 mon;



	if (!of_machine_is_compatible("renesas,koelsch") &&

	    !of_machine_is_compatible("renesas,lager"))

	    !of_machine_is_compatible("renesas,lager") &&

	    !of_machine_is_compatible("renesas,gose"))

		return -ENODEV;



	irqc = ioremap(IRQC_BASE, PAGE_SIZE);

arch/arm/mach-shmobile/setup-r8a7793.c

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * r8a7793 processor support

 *

 * Copyright (C) 2015  Ulrich Hecht

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/init.h>

#include <asm/mach/arch.h>



#include "common.h"

#include "rcar-gen2.h"



static const char *r8a7793_boards_compat_dt[] __initconst = {

	"renesas,r8a7793",

	NULL,

};



DT_MACHINE_START(R8A7793_DT, "Generic R8A7793 (Flattened Device Tree)")

	.init_early	= shmobile_init_delay,

	.init_time	= rcar_gen2_timer_init,

	.init_late	= shmobile_init_late,

	.reserve	= rcar_gen2_reserve,

	.dt_compat	= r8a7793_boards_compat_dt,

MACHINE_END