]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: shmobile: gose: enable R-Car Gen2 regulator quirk
authorUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Mon, 1 Jun 2015 14:22:57 +0000 (16:22 +0200)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 6 Jul 2015 00:37:24 +0000 (09:37 +0900)
Regulator setup seems identical to Koelsch.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c

index c59d75eff7a42e5f009f767e7e5215ed46a946c8..429157d437f518c4ffaa232cd140925f0112811d 100644 (file)
@@ -83,6 +83,7 @@ config ARCH_R8A7791
 config ARCH_R8A7793
        bool "R-Car M2-N (R8A7793)"
        select ARCH_RCAR_GEN2
+       select I2C
 
 config ARCH_R8A7794
        bool "R-Car E2 (R8A77940)"
index e4b8fdbf6c962cbf0f12f0e5475f2fc402e1f215..def7a093d99cfaf90626be6420d96a11c13a5371 100644 (file)
@@ -35,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)
index 384e6e934b876528ae9290f175978fea7f1663bd..62437b57813eab3c1cff4fc275386b37378dc9d8 100644 (file)
@@ -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);