diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2018-02-16 13:28:02 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2018-02-19 14:50:44 -0500 |
commit | 41d6d8bd8ae94ca9ee53720cd530168aca557db7 (patch) | |
tree | 03cac34457bd056b515aab7c8e69d5abb3290259 /drivers/soc | |
parent | 7755b40d07a8dba723aadcb9a1d2828331f3f1b3 (diff) |
soc: renesas: rcar-sysc: add R8A77980 support
Add support for R-Car V3H (R8A77980) SoC power areas to the R-Car SYSC
driver.
Based on the original (and large) patch by Vladimir Barinov.
Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/soc')
-rw-r--r-- | drivers/soc/renesas/Kconfig | 5 | ||||
-rw-r--r-- | drivers/soc/renesas/Makefile | 1 | ||||
-rw-r--r-- | drivers/soc/renesas/r8a77980-sysc.c | 52 | ||||
-rw-r--r-- | drivers/soc/renesas/rcar-sysc.c | 3 | ||||
-rw-r--r-- | drivers/soc/renesas/rcar-sysc.h | 1 |
5 files changed, 62 insertions, 0 deletions
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index 6efd7bef8577..6caa393e3a2d 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig | |||
@@ -15,6 +15,7 @@ config SOC_RENESAS | |||
15 | select SYSC_R8A7795 if ARCH_R8A7795 | 15 | select SYSC_R8A7795 if ARCH_R8A7795 |
16 | select SYSC_R8A7796 if ARCH_R8A7796 | 16 | select SYSC_R8A7796 if ARCH_R8A7796 |
17 | select SYSC_R8A77970 if ARCH_R8A77970 | 17 | select SYSC_R8A77970 if ARCH_R8A77970 |
18 | select SYSC_R8A77980 if ARCH_R8A77980 | ||
18 | select SYSC_R8A77995 if ARCH_R8A77995 | 19 | select SYSC_R8A77995 if ARCH_R8A77995 |
19 | 20 | ||
20 | if SOC_RENESAS | 21 | if SOC_RENESAS |
@@ -60,6 +61,10 @@ config SYSC_R8A77970 | |||
60 | bool "R-Car V3M System Controller support" if COMPILE_TEST | 61 | bool "R-Car V3M System Controller support" if COMPILE_TEST |
61 | select SYSC_RCAR | 62 | select SYSC_RCAR |
62 | 63 | ||
64 | config SYSC_R8A77980 | ||
65 | bool "R-Car V3H System Controller support" if COMPILE_TEST | ||
66 | select SYSC_RCAR | ||
67 | |||
63 | config SYSC_R8A77995 | 68 | config SYSC_R8A77995 |
64 | bool "R-Car D3 System Controller support" if COMPILE_TEST | 69 | bool "R-Car D3 System Controller support" if COMPILE_TEST |
65 | select SYSC_RCAR | 70 | select SYSC_RCAR |
diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile index 845d62a08ce1..d3b7bb3284c0 100644 --- a/drivers/soc/renesas/Makefile +++ b/drivers/soc/renesas/Makefile | |||
@@ -13,6 +13,7 @@ obj-$(CONFIG_SYSC_R8A7794) += r8a7794-sysc.o | |||
13 | obj-$(CONFIG_SYSC_R8A7795) += r8a7795-sysc.o | 13 | obj-$(CONFIG_SYSC_R8A7795) += r8a7795-sysc.o |
14 | obj-$(CONFIG_SYSC_R8A7796) += r8a7796-sysc.o | 14 | obj-$(CONFIG_SYSC_R8A7796) += r8a7796-sysc.o |
15 | obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o | 15 | obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o |
16 | obj-$(CONFIG_SYSC_R8A77980) += r8a77980-sysc.o | ||
16 | obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o | 17 | obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o |
17 | 18 | ||
18 | # Family | 19 | # Family |
diff --git a/drivers/soc/renesas/r8a77980-sysc.c b/drivers/soc/renesas/r8a77980-sysc.c new file mode 100644 index 000000000000..9265fb525ef3 --- /dev/null +++ b/drivers/soc/renesas/r8a77980-sysc.c | |||
@@ -0,0 +1,52 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
2 | /* | ||
3 | * Renesas R-Car V3H System Controller | ||
4 | * | ||
5 | * Copyright (C) 2018 Renesas Electronics Corp. | ||
6 | * Copyright (C) 2018 Cogent Embedded, Inc. | ||
7 | */ | ||
8 | |||
9 | #include <linux/bug.h> | ||
10 | #include <linux/kernel.h> | ||
11 | |||
12 | #include <dt-bindings/power/r8a77980-sysc.h> | ||
13 | |||
14 | #include "rcar-sysc.h" | ||
15 | |||
16 | static const struct rcar_sysc_area r8a77980_areas[] __initconst = { | ||
17 | { "always-on", 0, 0, R8A77980_PD_ALWAYS_ON, -1, PD_ALWAYS_ON }, | ||
18 | { "ca53-scu", 0x140, 0, R8A77980_PD_CA53_SCU, R8A77980_PD_ALWAYS_ON, | ||
19 | PD_SCU }, | ||
20 | { "ca53-cpu0", 0x200, 0, R8A77980_PD_CA53_CPU0, R8A77980_PD_CA53_SCU, | ||
21 | PD_CPU_NOCR }, | ||
22 | { "ca53-cpu1", 0x200, 1, R8A77980_PD_CA53_CPU1, R8A77980_PD_CA53_SCU, | ||
23 | PD_CPU_NOCR }, | ||
24 | { "ca53-cpu2", 0x200, 2, R8A77980_PD_CA53_CPU2, R8A77980_PD_CA53_SCU, | ||
25 | PD_CPU_NOCR }, | ||
26 | { "ca53-cpu3", 0x200, 3, R8A77980_PD_CA53_CPU3, R8A77980_PD_CA53_SCU, | ||
27 | PD_CPU_NOCR }, | ||
28 | { "cr7", 0x240, 0, R8A77980_PD_CR7, R8A77980_PD_ALWAYS_ON }, | ||
29 | { "a3ir", 0x180, 0, R8A77980_PD_A3IR, R8A77980_PD_ALWAYS_ON }, | ||
30 | { "a2ir0", 0x400, 0, R8A77980_PD_A2IR0, R8A77980_PD_A3IR }, | ||
31 | { "a2ir1", 0x400, 1, R8A77980_PD_A2IR1, R8A77980_PD_A3IR }, | ||
32 | { "a2ir2", 0x400, 2, R8A77980_PD_A2IR2, R8A77980_PD_A3IR }, | ||
33 | { "a2ir3", 0x400, 3, R8A77980_PD_A2IR3, R8A77980_PD_A3IR }, | ||
34 | { "a2ir4", 0x400, 4, R8A77980_PD_A2IR4, R8A77980_PD_A3IR }, | ||
35 | { "a2ir5", 0x400, 5, R8A77980_PD_A2IR5, R8A77980_PD_A3IR }, | ||
36 | { "a2sc0", 0x400, 6, R8A77980_PD_A2SC0, R8A77980_PD_A3IR }, | ||
37 | { "a2sc1", 0x400, 7, R8A77980_PD_A2SC1, R8A77980_PD_A3IR }, | ||
38 | { "a2sc2", 0x400, 8, R8A77980_PD_A2SC2, R8A77980_PD_A3IR }, | ||
39 | { "a2sc3", 0x400, 9, R8A77980_PD_A2SC3, R8A77980_PD_A3IR }, | ||
40 | { "a2sc4", 0x400, 10, R8A77980_PD_A2SC4, R8A77980_PD_A3IR }, | ||
41 | { "a2pd0", 0x400, 11, R8A77980_PD_A2PD0, R8A77980_PD_A3IR }, | ||
42 | { "a2pd1", 0x400, 12, R8A77980_PD_A2PD1, R8A77980_PD_A3IR }, | ||
43 | { "a2cn", 0x400, 13, R8A77980_PD_A2CN, R8A77980_PD_A3IR }, | ||
44 | { "a3vip", 0x2c0, 0, R8A77980_PD_A3VIP, R8A77980_PD_ALWAYS_ON }, | ||
45 | { "a3vip1", 0x300, 0, R8A77980_PD_A3VIP1, R8A77980_PD_A3VIP }, | ||
46 | { "a3vip2", 0x280, 0, R8A77980_PD_A3VIP2, R8A77980_PD_A3VIP }, | ||
47 | }; | ||
48 | |||
49 | const struct rcar_sysc_info r8a77980_sysc_info __initconst = { | ||
50 | .areas = r8a77980_areas, | ||
51 | .num_areas = ARRAY_SIZE(r8a77980_areas), | ||
52 | }; | ||
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c index 636872bc2416..72b0f4a9ad4e 100644 --- a/drivers/soc/renesas/rcar-sysc.c +++ b/drivers/soc/renesas/rcar-sysc.c | |||
@@ -287,6 +287,9 @@ static const struct of_device_id rcar_sysc_matches[] __initconst = { | |||
287 | #ifdef CONFIG_SYSC_R8A77970 | 287 | #ifdef CONFIG_SYSC_R8A77970 |
288 | { .compatible = "renesas,r8a77970-sysc", .data = &r8a77970_sysc_info }, | 288 | { .compatible = "renesas,r8a77970-sysc", .data = &r8a77970_sysc_info }, |
289 | #endif | 289 | #endif |
290 | #ifdef CONFIG_SYSC_R8A77980 | ||
291 | { .compatible = "renesas,r8a77980-sysc", .data = &r8a77980_sysc_info }, | ||
292 | #endif | ||
290 | #ifdef CONFIG_SYSC_R8A77995 | 293 | #ifdef CONFIG_SYSC_R8A77995 |
291 | { .compatible = "renesas,r8a77995-sysc", .data = &r8a77995_sysc_info }, | 294 | { .compatible = "renesas,r8a77995-sysc", .data = &r8a77995_sysc_info }, |
292 | #endif | 295 | #endif |
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h index 9d9daf9eb91b..974b18619c08 100644 --- a/drivers/soc/renesas/rcar-sysc.h +++ b/drivers/soc/renesas/rcar-sysc.h | |||
@@ -59,6 +59,7 @@ extern const struct rcar_sysc_info r8a7794_sysc_info; | |||
59 | extern const struct rcar_sysc_info r8a7795_sysc_info; | 59 | extern const struct rcar_sysc_info r8a7795_sysc_info; |
60 | extern const struct rcar_sysc_info r8a7796_sysc_info; | 60 | extern const struct rcar_sysc_info r8a7796_sysc_info; |
61 | extern const struct rcar_sysc_info r8a77970_sysc_info; | 61 | extern const struct rcar_sysc_info r8a77970_sysc_info; |
62 | extern const struct rcar_sysc_info r8a77980_sysc_info; | ||
62 | extern const struct rcar_sysc_info r8a77995_sysc_info; | 63 | extern const struct rcar_sysc_info r8a77995_sysc_info; |
63 | 64 | ||
64 | 65 | ||