| From f8ec6a0a42bce4d4d067225f38c11a00b82398c3 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Tue, 12 Sep 2017 23:37:20 +0300 |
| Subject: [PATCH 0283/1795] soc: renesas: rcar-sysc: add R8A77970 support |
| |
| Add support for R-Car V3M (R8A77970) SoC power areas to the R-Car SYSC |
| driver. |
| |
| Based on the original (and large) patch by Daisuke Matsushita |
| <daisuke.matsushita.ns@hitachi.com>. |
| |
| 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> |
| (cherry picked from commit bab9b2a74fe9da96e895e0919f625679a0a8c964) |
| 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/r8a77970-sysc.c | 39 +++++++++++++++++++ |
| drivers/soc/renesas/rcar-sysc.c | 3 ++ |
| drivers/soc/renesas/rcar-sysc.h | 1 + |
| 6 files changed, 50 insertions(+) |
| create mode 100644 drivers/soc/renesas/r8a77970-sysc.c |
| |
| diff --git a/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt b/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt |
| index 98cc8c09d02d..8690f10426a3 100644 |
| --- a/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt |
| +++ b/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt |
| @@ -17,6 +17,7 @@ Required properties: |
| - "renesas,r8a7794-sysc" (R-Car E2) |
| - "renesas,r8a7795-sysc" (R-Car H3) |
| - "renesas,r8a7796-sysc" (R-Car M3-W) |
| + - "renesas,r8a77970-sysc" (R-Car V3M) |
| - "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 f0d562a7c4d3..09550b1da56d 100644 |
| --- a/drivers/soc/renesas/Kconfig |
| +++ b/drivers/soc/renesas/Kconfig |
| @@ -14,6 +14,7 @@ config SOC_RENESAS |
| select SYSC_R8A7794 if ARCH_R8A7794 |
| select SYSC_R8A7795 if ARCH_R8A7795 |
| select SYSC_R8A7796 if ARCH_R8A7796 |
| + select SYSC_R8A77970 if ARCH_R8A77970 |
| select SYSC_R8A77995 if ARCH_R8A77995 |
| |
| if SOC_RENESAS |
| @@ -55,6 +56,10 @@ config SYSC_R8A7796 |
| bool "R-Car M3-W System Controller support" if COMPILE_TEST |
| select SYSC_RCAR |
| |
| +config SYSC_R8A77970 |
| + bool "R-Car V3M 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 763c03d80436..845d62a08ce1 100644 |
| --- a/drivers/soc/renesas/Makefile |
| +++ b/drivers/soc/renesas/Makefile |
| @@ -12,6 +12,7 @@ obj-$(CONFIG_SYSC_R8A7792) += r8a7792-sysc.o |
| obj-$(CONFIG_SYSC_R8A7794) += r8a7794-sysc.o |
| obj-$(CONFIG_SYSC_R8A7795) += r8a7795-sysc.o |
| obj-$(CONFIG_SYSC_R8A7796) += r8a7796-sysc.o |
| +obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o |
| obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o |
| |
| # Family |
| diff --git a/drivers/soc/renesas/r8a77970-sysc.c b/drivers/soc/renesas/r8a77970-sysc.c |
| new file mode 100644 |
| index 000000000000..8c614164718e |
| --- /dev/null |
| +++ b/drivers/soc/renesas/r8a77970-sysc.c |
| @@ -0,0 +1,39 @@ |
| +/* |
| + * Renesas R-Car V3M System Controller |
| + * |
| + * Copyright (C) 2017 Cogent Embedded Inc. |
| + * |
| + * This program is free software; you can redistribute it and/or modify |
| + * it under the terms of the GNU General Public License version 2 as |
| + * published by the Free Software Foundation. |
| + */ |
| + |
| +#include <linux/bug.h> |
| +#include <linux/kernel.h> |
| + |
| +#include <dt-bindings/power/r8a77970-sysc.h> |
| + |
| +#include "rcar-sysc.h" |
| + |
| +static const struct rcar_sysc_area r8a77970_areas[] __initconst = { |
| + { "always-on", 0, 0, R8A77970_PD_ALWAYS_ON, -1, PD_ALWAYS_ON }, |
| + { "ca53-scu", 0x140, 0, R8A77970_PD_CA53_SCU, R8A77970_PD_ALWAYS_ON, |
| + PD_SCU }, |
| + { "ca53-cpu0", 0x200, 0, R8A77970_PD_CA53_CPU0, R8A77970_PD_CA53_SCU, |
| + PD_CPU_NOCR }, |
| + { "ca53-cpu1", 0x200, 1, R8A77970_PD_CA53_CPU1, R8A77970_PD_CA53_SCU, |
| + PD_CPU_NOCR }, |
| + { "cr7", 0x240, 0, R8A77970_PD_CR7, R8A77970_PD_ALWAYS_ON }, |
| + { "a3ir", 0x180, 0, R8A77970_PD_A3IR, R8A77970_PD_ALWAYS_ON }, |
| + { "a2ir0", 0x400, 0, R8A77970_PD_A2IR0, R8A77970_PD_ALWAYS_ON }, |
| + { "a2ir1", 0x400, 1, R8A77970_PD_A2IR1, R8A77970_PD_A2IR0 }, |
| + { "a2ir2", 0x400, 2, R8A77970_PD_A2IR2, R8A77970_PD_A2IR0 }, |
| + { "a2ir3", 0x400, 3, R8A77970_PD_A2IR3, R8A77970_PD_A2IR0 }, |
| + { "a2sc0", 0x400, 4, R8A77970_PD_A2SC0, R8A77970_PD_ALWAYS_ON }, |
| + { "a2sc1", 0x400, 5, R8A77970_PD_A2SC1, R8A77970_PD_A2SC0 }, |
| +}; |
| + |
| +const struct rcar_sysc_info r8a77970_sysc_info __initconst = { |
| + .areas = r8a77970_areas, |
| + .num_areas = ARRAY_SIZE(r8a77970_areas), |
| +}; |
| diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c |
| index c8406e81640f..55a47e509e49 100644 |
| --- a/drivers/soc/renesas/rcar-sysc.c |
| +++ b/drivers/soc/renesas/rcar-sysc.c |
| @@ -284,6 +284,9 @@ static const struct of_device_id rcar_sysc_matches[] = { |
| #ifdef CONFIG_SYSC_R8A7796 |
| { .compatible = "renesas,r8a7796-sysc", .data = &r8a7796_sysc_info }, |
| #endif |
| +#ifdef CONFIG_SYSC_R8A77970 |
| + { .compatible = "renesas,r8a77970-sysc", .data = &r8a77970_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 2f524922c4d2..9d9daf9eb91b 100644 |
| --- a/drivers/soc/renesas/rcar-sysc.h |
| +++ b/drivers/soc/renesas/rcar-sysc.h |
| @@ -58,6 +58,7 @@ extern const struct rcar_sysc_info r8a7792_sysc_info; |
| extern const struct rcar_sysc_info r8a7794_sysc_info; |
| extern const struct rcar_sysc_info r8a7795_sysc_info; |
| extern const struct rcar_sysc_info r8a7796_sysc_info; |
| +extern const struct rcar_sysc_info r8a77970_sysc_info; |
| extern const struct rcar_sysc_info r8a77995_sysc_info; |
| |
| |
| -- |
| 2.19.0 |
| |
