aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--drivers/soc/renesas/Makefile3
-rw-r--r--drivers/soc/renesas/rcar-sysc.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index 96463c05ee59..c6c4ce7ef8a1 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,5 +1,6 @@
obj-$(CONFIG_ARCH_R8A7779) += rcar-sysc.o r8a7779-sysc.o
obj-$(CONFIG_ARCH_R8A7790) += rcar-sysc.o r8a7790-sysc.o
obj-$(CONFIG_ARCH_R8A7791) += rcar-sysc.o r8a7791-sysc.o
-obj-$(CONFIG_ARCH_R8A7793) += rcar-sysc.o
+# R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
+obj-$(CONFIG_ARCH_R8A7793) += rcar-sysc.o r8a7791-sysc.o
obj-$(CONFIG_ARCH_R8A7794) += rcar-sysc.o
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 5b70b93a2aa7..d8eaf8b2ee20 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -293,6 +293,10 @@ static const struct of_device_id rcar_sysc_matches[] = {
#ifdef CONFIG_ARCH_R8A7791
{ .compatible = "renesas,r8a7791-sysc", .data = &r8a7791_sysc_info },
#endif
+#ifdef CONFIG_ARCH_R8A7793
+ /* R-Car M2-N is identical to R-Car M2-W w.r.t. power domains. */
+ { .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info },
+#endif
{ /* sentinel */ }
};
.c?id=60fce36afa9c77c7ccbf980c4f670f3be3651fce&follow=1'>mm/compaction.c: correct zone boundary handling when isolating pages from a p...Mel Gorman1-2/+2 2019-05-18mm/vmap: add DEBUG_AUGMENT_LOWEST_MATCH_CHECK macroUladzislau Rezki (Sony)1-0/+43 2019-05-18mm/vmap: add DEBUG_AUGMENT_PROPAGATE_CHECK macroUladzislau Rezki (Sony)1-0/+48 2019-05-18mm/vmalloc.c: keep track of free blocks for vmap allocationUladzislau Rezki (Sony)2-247/+763 2019-05-18kbuild: check uniqueness of module namesMasahiro Yamada2-0/+17 2019-05-18kconfig: Terminate menu blocks with a comment in the generated configAlexander Popov1-1/+12 2019-05-18kbuild: add LICENSES to KBUILD_ALLDIRSMasahiro Yamada1-1/+1 2019-05-18kbuild: remove 'addtree' and 'flags' magic for header search pathsMasahiro Yamada3-33/+13 2019-05-18treewide: prefix header search paths with $(srctree)/Masahiro Yamada17-26/+25 2019-05-18media: prefix header search paths with $(srctree)/Masahiro Yamada30-49/+47 2019-05-18media: remove unneeded header search pathsMasahiro Yamada7-11/+0 2019-05-18alpha: move arch/alpha/defconfig to arch/alpha/configs/defconfigMasahiro Yamada2-0/+2 2019-05-18kbuild: terminate Kconfig when $(CC) or $(LD) is missingMasahiro Yamada2-1/+9 2019-05-18kbuild: turn auto.conf.cmd into a mandatory include fileMasahiro Yamada1-1/+1 2019-05-18.gitignore: exclude .get_maintainer.ignore and .gitattributesMasahiro Yamada1-3/+5 2019-05-18kbuild: add all Clang-specific flags unconditionallyMasahiro Yamada2-11/+11 2019-05-18kbuild: Don't try to add '-fcatch-undefined-behavior' flagNathan Chancellor1-1/+0 2019-05-18kbuild: add some extra warning flags unconditionallyMasahiro Yamada1-6/+7 2019-05-18kbuild: add -Wvla flag unconditionallyMasahiro Yamada1-1/+1 2019-05-18arch: remove dangling asm-generic wrappersMasahiro Yamada5-13/+0 2019-05-18samples: guard sub-directories with CONFIG optionsMasahiro Yamada3-6/+22 2019-05-18kbuild: re-enable int-in-bool-context warningMasahiro Yamada1-1/+0 2019-05-18MAINTAINERS: kbuild: Add pattern for scripts/*vmlinux*Krzysztof Kozlowski1-0/+1 2019-05-18sh: exclude vmlinux.scr from .gitignore patternMasahiro Yamada1-0/+1 2019-05-18sh: vsyscall: drop unnecessary cc-ldoptionNick Desaulniers1-2/+1 2019-05-18ia64: require -Wl,--hash-style=sysvNick Desaulniers1-1/+1 2019-05-18csky: remove deprecated arch/csky/boot/dts/include/dt-bindingsMasahiro Yamada1-1/+0 2019-05-17ext4: avoid panic during forced reboot due to aborted journalJan Kara1-1/+1 2019-05-17i2c: core: add device-managed version of i2c_new_dummyHeiner Kallweit3-0/+50 2019-05-17i2c: core: improve return value handling of i2c_new_device and i2c_new_dummyHeiner Kallweit1-13/+61 2019-05-17powerpc/cacheinfo: Remove double freeTobin C. Harding1-1/+0 2019-05-17powerpc/mm/hash: Fix get_region_id() for invalid addressesAneesh Kumar K.V1-0/+4 2019-05-17kvm: fix compilation on aarch64Paolo Bonzini1-1/+1 2019-05-17objtool: Allow AR to be overridden with HOSTARNathan Chancellor1-1/+2 2019-05-17fbdev/efifb: Ignore framebuffer memmap entries that lack any memory typesArd Biesheuvel1-2/+6 2019-05-16riscv: fix locking violation in page fault handlerAndreas Schwab1-1/+2 2019-05-16RISC-V: sifive_l2_cache: Add L2 cache controller driver for SiFive SoCsYash Shah3-0/+192