diff options
-rw-r--r-- | Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt | 1 | ||||
-rw-r--r-- | drivers/soc/renesas/Kconfig | 5 | ||||
-rw-r--r-- | drivers/soc/renesas/Makefile | 1 | ||||
-rw-r--r-- | drivers/soc/renesas/r8a77990-sysc.c | 33 | ||||
-rw-r--r-- | drivers/soc/renesas/rcar-sysc.c | 3 | ||||
-rw-r--r-- | drivers/soc/renesas/rcar-sysc.h | 1 |
6 files changed, 44 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt b/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt index 3e91d2032253..180ae65be753 100644 --- a/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt +++ b/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt | |||
@@ -21,6 +21,7 @@ Required properties: | |||
21 | - "renesas,r8a77965-sysc" (R-Car M3-N) | 21 | - "renesas,r8a77965-sysc" (R-Car M3-N) |
22 | - "renesas,r8a77970-sysc" (R-Car V3M) | 22 | - "renesas,r8a77970-sysc" (R-Car V3M) |
23 | - "renesas,r8a77980-sysc" (R-Car V3H) | 23 | - "renesas,r8a77980-sysc" (R-Car V3H) |
24 | - "renesas,r8a77990-sysc" (R-Car E3) | ||
24 | - "renesas,r8a77995-sysc" (R-Car D3) | 25 | - "renesas,r8a77995-sysc" (R-Car D3) |
25 | - reg: Address start and address range for the device. | 26 | - reg: Address start and address range for the device. |
26 | - #power-domain-cells: Must be 1. | 27 | - #power-domain-cells: Must be 1. |
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index c0e0286a2360..1d824cbd462d 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig | |||
@@ -19,6 +19,7 @@ config SOC_RENESAS | |||
19 | select SYSC_R8A77965 if ARCH_R8A77965 | 19 | select SYSC_R8A77965 if ARCH_R8A77965 |
20 | select SYSC_R8A77970 if ARCH_R8A77970 | 20 | select SYSC_R8A77970 if ARCH_R8A77970 |
21 | select SYSC_R8A77980 if ARCH_R8A77980 | 21 | select SYSC_R8A77980 if ARCH_R8A77980 |
22 | select SYSC_R8A77990 if ARCH_R8A77990 | ||
22 | select SYSC_R8A77995 if ARCH_R8A77995 | 23 | select SYSC_R8A77995 if ARCH_R8A77995 |
23 | 24 | ||
24 | if SOC_RENESAS | 25 | if SOC_RENESAS |
@@ -76,6 +77,10 @@ config SYSC_R8A77980 | |||
76 | bool "R-Car V3H System Controller support" if COMPILE_TEST | 77 | bool "R-Car V3H System Controller support" if COMPILE_TEST |
77 | select SYSC_RCAR | 78 | select SYSC_RCAR |
78 | 79 | ||
80 | config SYSC_R8A77990 | ||
81 | bool "R-Car E3 System Controller support" if COMPILE_TEST | ||
82 | select SYSC_RCAR | ||
83 | |||
79 | config SYSC_R8A77995 | 84 | config SYSC_R8A77995 |
80 | bool "R-Car D3 System Controller support" if COMPILE_TEST | 85 | bool "R-Car D3 System Controller support" if COMPILE_TEST |
81 | select SYSC_RCAR | 86 | select SYSC_RCAR |
diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile index a86ece7b84d1..7dc0f20d7907 100644 --- a/drivers/soc/renesas/Makefile +++ b/drivers/soc/renesas/Makefile | |||
@@ -16,6 +16,7 @@ obj-$(CONFIG_SYSC_R8A7796) += r8a7796-sysc.o | |||
16 | obj-$(CONFIG_SYSC_R8A77965) += r8a77965-sysc.o | 16 | obj-$(CONFIG_SYSC_R8A77965) += r8a77965-sysc.o |
17 | obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o | 17 | obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o |
18 | obj-$(CONFIG_SYSC_R8A77980) += r8a77980-sysc.o | 18 | obj-$(CONFIG_SYSC_R8A77980) += r8a77980-sysc.o |
19 | obj-$(CONFIG_SYSC_R8A77990) += r8a77990-sysc.o | ||
19 | obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o | 20 | obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o |
20 | 21 | ||
21 | # Family | 22 | # Family |
diff --git a/drivers/soc/renesas/r8a77990-sysc.c b/drivers/soc/renesas/r8a77990-sysc.c new file mode 100644 index 000000000000..a8c6417fcd2b --- /dev/null +++ b/drivers/soc/renesas/r8a77990-sysc.c | |||
@@ -0,0 +1,33 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
2 | /* | ||
3 | * Renesas R-Car E3 System Controller | ||
4 | * | ||
5 | * Copyright (C) 2018 Renesas Electronics Corp. | ||
6 | */ | ||
7 | |||
8 | #include <linux/bug.h> | ||
9 | #include <linux/kernel.h> | ||
10 | |||
11 | #include <dt-bindings/power/r8a77990-sysc.h> | ||
12 | |||
13 | #include "rcar-sysc.h" | ||
14 | |||
15 | static const struct rcar_sysc_area r8a77990_areas[] __initconst = { | ||
16 | { "always-on", 0, 0, R8A77990_PD_ALWAYS_ON, -1, PD_ALWAYS_ON }, | ||
17 | { "ca53-scu", 0x140, 0, R8A77990_PD_CA53_SCU, R8A77990_PD_ALWAYS_ON, | ||
18 | PD_SCU }, | ||
19 | { "ca53-cpu0", 0x200, 0, R8A77990_PD_CA53_CPU0, R8A77990_PD_CA53_SCU, | ||
20 | PD_CPU_NOCR }, | ||
21 | { "ca53-cpu1", 0x200, 1, R8A77990_PD_CA53_CPU1, R8A77990_PD_CA53_SCU, | ||
22 | PD_CPU_NOCR }, | ||
23 | { "cr7", 0x240, 0, R8A77990_PD_CR7, R8A77990_PD_ALWAYS_ON }, | ||
24 | { "a3vc", 0x380, 0, R8A77990_PD_A3VC, R8A77990_PD_ALWAYS_ON }, | ||
25 | { "a2vc1", 0x3c0, 1, R8A77990_PD_A2VC1, R8A77990_PD_A3VC }, | ||
26 | { "3dg-a", 0x100, 0, R8A77990_PD_3DG_A, R8A77990_PD_ALWAYS_ON }, | ||
27 | { "3dg-b", 0x100, 1, R8A77990_PD_3DG_B, R8A77990_PD_3DG_A }, | ||
28 | }; | ||
29 | |||
30 | const struct rcar_sysc_info r8a77990_sysc_info __initconst = { | ||
31 | .areas = r8a77990_areas, | ||
32 | .num_areas = ARRAY_SIZE(r8a77990_areas), | ||
33 | }; | ||
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c index 99203bdc333a..95120acc4d80 100644 --- a/drivers/soc/renesas/rcar-sysc.c +++ b/drivers/soc/renesas/rcar-sysc.c | |||
@@ -296,6 +296,9 @@ static const struct of_device_id rcar_sysc_matches[] __initconst = { | |||
296 | #ifdef CONFIG_SYSC_R8A77980 | 296 | #ifdef CONFIG_SYSC_R8A77980 |
297 | { .compatible = "renesas,r8a77980-sysc", .data = &r8a77980_sysc_info }, | 297 | { .compatible = "renesas,r8a77980-sysc", .data = &r8a77980_sysc_info }, |
298 | #endif | 298 | #endif |
299 | #ifdef CONFIG_SYSC_R8A77990 | ||
300 | { .compatible = "renesas,r8a77990-sysc", .data = &r8a77990_sysc_info }, | ||
301 | #endif | ||
299 | #ifdef CONFIG_SYSC_R8A77995 | 302 | #ifdef CONFIG_SYSC_R8A77995 |
300 | { .compatible = "renesas,r8a77995-sysc", .data = &r8a77995_sysc_info }, | 303 | { .compatible = "renesas,r8a77995-sysc", .data = &r8a77995_sysc_info }, |
301 | #endif | 304 | #endif |
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h index 9b24e3af288f..a22e7cf25e30 100644 --- a/drivers/soc/renesas/rcar-sysc.h +++ b/drivers/soc/renesas/rcar-sysc.h | |||
@@ -62,6 +62,7 @@ extern const struct rcar_sysc_info r8a7796_sysc_info; | |||
62 | extern const struct rcar_sysc_info r8a77965_sysc_info; | 62 | extern const struct rcar_sysc_info r8a77965_sysc_info; |
63 | extern const struct rcar_sysc_info r8a77970_sysc_info; | 63 | extern const struct rcar_sysc_info r8a77970_sysc_info; |
64 | extern const struct rcar_sysc_info r8a77980_sysc_info; | 64 | extern const struct rcar_sysc_info r8a77980_sysc_info; |
65 | extern const struct rcar_sysc_info r8a77990_sysc_info; | ||
65 | extern const struct rcar_sysc_info r8a77995_sysc_info; | 66 | extern const struct rcar_sysc_info r8a77995_sysc_info; |
66 | 67 | ||
67 | 68 | ||