| From 1776bdfa8e29fc8b5b839df57849ff420c69bec2 Mon Sep 17 00:00:00 2001 |
| From: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| Date: Tue, 15 May 2018 21:07:38 +0900 |
| Subject: [PATCH 1343/1795] soc: renesas: rcar-sysc: Add support for R-Car E3 |
| power areas |
| |
| This patch adds Cortex-A53 CPU{0,1}, Cortex-A53 SCU, Cortex-R7, A3VC, |
| A2VC1 and 3DG-{A,B} power domain areas for the R8A77990 SoC. |
| |
| Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| [shimoda: fix 3DG-{A,B} and add SPDX-License-Identifier] |
| Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| (cherry picked from commit 44b12d4311d7e296d178cbad019d0537de4f8890) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| .../bindings/power/renesas,rcar-sysc.txt | 1 + |
| drivers/soc/renesas/Kconfig | 5 +++ |
| drivers/soc/renesas/Makefile | 1 + |
| drivers/soc/renesas/r8a77990-sysc.c | 33 +++++++++++++++++++ |
| drivers/soc/renesas/rcar-sysc.c | 3 ++ |
| drivers/soc/renesas/rcar-sysc.h | 1 + |
| 6 files changed, 44 insertions(+) |
| create mode 100644 drivers/soc/renesas/r8a77990-sysc.c |
| |
| 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: |
| - "renesas,r8a77965-sysc" (R-Car M3-N) |
| - "renesas,r8a77970-sysc" (R-Car V3M) |
| - "renesas,r8a77980-sysc" (R-Car V3H) |
| + - "renesas,r8a77990-sysc" (R-Car E3) |
| - "renesas,r8a77995-sysc" (R-Car D3) |
| - reg: Address start and address range for the device. |
| - #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 |
| select SYSC_R8A77965 if ARCH_R8A77965 |
| select SYSC_R8A77970 if ARCH_R8A77970 |
| select SYSC_R8A77980 if ARCH_R8A77980 |
| + select SYSC_R8A77990 if ARCH_R8A77990 |
| select SYSC_R8A77995 if ARCH_R8A77995 |
| |
| if SOC_RENESAS |
| @@ -76,6 +77,10 @@ config SYSC_R8A77980 |
| bool "R-Car V3H System Controller support" if COMPILE_TEST |
| select SYSC_RCAR |
| |
| +config SYSC_R8A77990 |
| + bool "R-Car E3 System Controller support" if COMPILE_TEST |
| + select SYSC_RCAR |
| + |
| config SYSC_R8A77995 |
| bool "R-Car D3 System Controller support" if COMPILE_TEST |
| 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 |
| obj-$(CONFIG_SYSC_R8A77965) += r8a77965-sysc.o |
| obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o |
| obj-$(CONFIG_SYSC_R8A77980) += r8a77980-sysc.o |
| +obj-$(CONFIG_SYSC_R8A77990) += r8a77990-sysc.o |
| obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o |
| |
| # 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 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| +/* |
| + * Renesas R-Car E3 System Controller |
| + * |
| + * Copyright (C) 2018 Renesas Electronics Corp. |
| + */ |
| + |
| +#include <linux/bug.h> |
| +#include <linux/kernel.h> |
| + |
| +#include <dt-bindings/power/r8a77990-sysc.h> |
| + |
| +#include "rcar-sysc.h" |
| + |
| +static const struct rcar_sysc_area r8a77990_areas[] __initconst = { |
| + { "always-on", 0, 0, R8A77990_PD_ALWAYS_ON, -1, PD_ALWAYS_ON }, |
| + { "ca53-scu", 0x140, 0, R8A77990_PD_CA53_SCU, R8A77990_PD_ALWAYS_ON, |
| + PD_SCU }, |
| + { "ca53-cpu0", 0x200, 0, R8A77990_PD_CA53_CPU0, R8A77990_PD_CA53_SCU, |
| + PD_CPU_NOCR }, |
| + { "ca53-cpu1", 0x200, 1, R8A77990_PD_CA53_CPU1, R8A77990_PD_CA53_SCU, |
| + PD_CPU_NOCR }, |
| + { "cr7", 0x240, 0, R8A77990_PD_CR7, R8A77990_PD_ALWAYS_ON }, |
| + { "a3vc", 0x380, 0, R8A77990_PD_A3VC, R8A77990_PD_ALWAYS_ON }, |
| + { "a2vc1", 0x3c0, 1, R8A77990_PD_A2VC1, R8A77990_PD_A3VC }, |
| + { "3dg-a", 0x100, 0, R8A77990_PD_3DG_A, R8A77990_PD_ALWAYS_ON }, |
| + { "3dg-b", 0x100, 1, R8A77990_PD_3DG_B, R8A77990_PD_3DG_A }, |
| +}; |
| + |
| +const struct rcar_sysc_info r8a77990_sysc_info __initconst = { |
| + .areas = r8a77990_areas, |
| + .num_areas = ARRAY_SIZE(r8a77990_areas), |
| +}; |
| 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 = { |
| #ifdef CONFIG_SYSC_R8A77980 |
| { .compatible = "renesas,r8a77980-sysc", .data = &r8a77980_sysc_info }, |
| #endif |
| +#ifdef CONFIG_SYSC_R8A77990 |
| + { .compatible = "renesas,r8a77990-sysc", .data = &r8a77990_sysc_info }, |
| +#endif |
| #ifdef CONFIG_SYSC_R8A77995 |
| { .compatible = "renesas,r8a77995-sysc", .data = &r8a77995_sysc_info }, |
| #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; |
| extern const struct rcar_sysc_info r8a77965_sysc_info; |
| extern const struct rcar_sysc_info r8a77970_sysc_info; |
| extern const struct rcar_sysc_info r8a77980_sysc_info; |
| +extern const struct rcar_sysc_info r8a77990_sysc_info; |
| extern const struct rcar_sysc_info r8a77995_sysc_info; |
| |
| |
| -- |
| 2.19.0 |
| |