Re: [PATCH 03/15] soc: renesas: Add R-Car M3-N support
Hi Geert, On Wed, Feb 14, 2018 at 01:48:27PM +0100, Geert Uytterhoeven wrote: > Hi Jacopo, > > Thanks for your patch! > > On Tue, Feb 13, 2018 at 10:45 AM, Jacopo Mondi >wrote: > > Add support for R-Car M3-N (r8a77965) power areas and reset. > > M3-N power areas are identical to M3-W ones, so just copy and rename > > them. > > They are not identical: > - M3-N does not have the CA53-related areas, > - M3-W does not have A3VP, > - M3-N does not have A2VC0 (M3-W also doesn't, according to latest > datasheet?). > > The datasheet also mentions A3SH, without further info about the register > block. I think we need to bring this up with Renesas. > > > .../bindings/power/renesas,rcar-sysc.txt | 1 + > > .../devicetree/bindings/reset/renesas,rst.txt | 1 + > > drivers/soc/renesas/Kconfig| 9 -- > > drivers/soc/renesas/Makefile | 1 + > > drivers/soc/renesas/r8a77965-sysc.c| 37 > > ++ > > drivers/soc/renesas/rcar-rst.c | 1 + > > drivers/soc/renesas/rcar-sysc.c| 3 ++ > > drivers/soc/renesas/rcar-sysc.h| 1 + > > drivers/soc/renesas/renesas-soc.c | 8 + > > include/dt-bindings/power/r8a77965-sysc.h | 31 ++ > > 10 files changed, 91 insertions(+), 2 deletions(-) > > create mode 100644 drivers/soc/renesas/r8a77965-sysc.c > > create mode 100644 include/dt-bindings/power/r8a77965-sysc.h > > The maintainer may ask you to split this patch by functionality... > > > --- /dev/null > > +++ b/drivers/soc/renesas/r8a77965-sysc.c > > @@ -0,0 +1,37 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Renesas R-Car M3-N System Controller > > + * Copyright (C) 2018 Jacopo Mondi > > + * > > + * Based on Renesas R-Car M3-W System Controller > > + * Copyright (C) 2016 Glider bvba > > + */ > > + > > +#include > > +#include > > + > > +#include > > + > > +#include "rcar-sysc.h" > > + > > +static const struct rcar_sysc_area r8a77965_areas[] __initconst = { > > + { "always-on", 0, 0, R8A77965_PD_ALWAYS_ON, -1, PD_ALWAYS_ON }, > > + { "ca57-scu", 0x1c0, 0, R8A77965_PD_CA57_SCU, > > R8A77965_PD_ALWAYS_ON, > > + PD_SCU }, > > + { "ca57-cpu0", 0x80, 0, R8A77965_PD_CA57_CPU0, > > R8A77965_PD_CA57_SCU, > > + PD_CPU_NOCR }, > > + { "ca57-cpu1", 0x80, 1, R8A77965_PD_CA57_CPU1, > > R8A77965_PD_CA57_SCU, > > + PD_CPU_NOCR }, > > + { "cr7",0x240, 0, R8A77965_PD_CR7, > > R8A77965_PD_ALWAYS_ON }, > > + { "a3vc", 0x380, 0, R8A77965_PD_A3VC, > > R8A77965_PD_ALWAYS_ON }, > > + { "a2vc0", 0x3c0, 0, R8A77965_PD_A2VC0,R8A77965_PD_A3VC }, > > M3-N (and M3-W) does not have A2VC0? Why do I still see that power area listed in latest renesas-drivers for M3-W? Are there patch pendings for that? I'll remove it anyway for M3-N. Thanks j > > > + { "a2vc1", 0x3c0, 1, R8A77965_PD_A2VC1,R8A77965_PD_A3VC }, > > + { "3dg-a", 0x100, 0, R8A77965_PD_3DG_A, > > R8A77965_PD_ALWAYS_ON }, > > + { "3dg-b", 0x100, 1, R8A77965_PD_3DG_B,R8A77965_PD_3DG_A }, > > + { "a3ir", 0x180, 0, R8A77965_PD_A3IR, > > R8A77965_PD_ALWAYS_ON }, > > A3VP is missing? > > > +}; > > + > > +const struct rcar_sysc_info r8a77965_sysc_info __initconst = { > > + .areas = r8a77965_areas, > > + .num_areas = ARRAY_SIZE(r8a77965_areas), > > +}; > > > --- /dev/null > > +++ b/include/dt-bindings/power/r8a77965-sysc.h > > @@ -0,0 +1,31 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > +/* > > + * Copyright (C) 2018 Jacopo Mondi > > + * Copyright (C) 2016 Glider bvba > > + */ > > + > > +#ifndef __DT_BINDINGS_POWER_R8A77965_SYSC_H__ > > +#define __DT_BINDINGS_POWER_R8A77965_SYSC_H__ > > + > > +/* > > + * These power domain indices match the numbers of the interrupt bits > > + * representing the power areas in the various Interrupt Registers > > + * (e.g. SYSCISR, Interrupt Status Register) > > + */ > > + > > +#define R8A77965_PD_CA57_CPU0 0 > > +#define R8A77965_PD_CA57_CPU1 1 > > +#define R8A77965_PD_A3VP9 > > +#define R8A77965_PD_CA57_SCU 12 > > +#define R8A77965_PD_CR713 > > +#define R8A77965_PD_A3VC 14 > > +#define R8A77965_PD_3DG_A 17 > > +#define R8A77965_PD_3DG_B 18 > > +#define R8A77965_PD_A3IR 24 > > +#define R8A77965_PD_A2VC0 25 > > M3-N (and M3-W) does not have A2VC0? > > > +#define R8A77965_PD_A2VC1 26 > > + > > +/* Always-on power area */ > > +#define R8A77965_PD_ALWAYS_ON 32 > > + > > +#endif /* __DT_BINDINGS_POWER_R8A77965_SYSC_H__ */ > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of
Re: [PATCH 03/15] soc: renesas: Add R-Car M3-N support
Hi Jacopo, Thanks for your patch! On Tue, Feb 13, 2018 at 10:45 AM, Jacopo Mondiwrote: > Add support for R-Car M3-N (r8a77965) power areas and reset. > M3-N power areas are identical to M3-W ones, so just copy and rename > them. They are not identical: - M3-N does not have the CA53-related areas, - M3-W does not have A3VP, - M3-N does not have A2VC0 (M3-W also doesn't, according to latest datasheet?). The datasheet also mentions A3SH, without further info about the register block. I think we need to bring this up with Renesas. > .../bindings/power/renesas,rcar-sysc.txt | 1 + > .../devicetree/bindings/reset/renesas,rst.txt | 1 + > drivers/soc/renesas/Kconfig| 9 -- > drivers/soc/renesas/Makefile | 1 + > drivers/soc/renesas/r8a77965-sysc.c| 37 > ++ > drivers/soc/renesas/rcar-rst.c | 1 + > drivers/soc/renesas/rcar-sysc.c| 3 ++ > drivers/soc/renesas/rcar-sysc.h| 1 + > drivers/soc/renesas/renesas-soc.c | 8 + > include/dt-bindings/power/r8a77965-sysc.h | 31 ++ > 10 files changed, 91 insertions(+), 2 deletions(-) > create mode 100644 drivers/soc/renesas/r8a77965-sysc.c > create mode 100644 include/dt-bindings/power/r8a77965-sysc.h The maintainer may ask you to split this patch by functionality... > --- /dev/null > +++ b/drivers/soc/renesas/r8a77965-sysc.c > @@ -0,0 +1,37 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Renesas R-Car M3-N System Controller > + * Copyright (C) 2018 Jacopo Mondi > + * > + * Based on Renesas R-Car M3-W System Controller > + * Copyright (C) 2016 Glider bvba > + */ > + > +#include > +#include > + > +#include > + > +#include "rcar-sysc.h" > + > +static const struct rcar_sysc_area r8a77965_areas[] __initconst = { > + { "always-on", 0, 0, R8A77965_PD_ALWAYS_ON, -1, PD_ALWAYS_ON }, > + { "ca57-scu", 0x1c0, 0, R8A77965_PD_CA57_SCU, R8A77965_PD_ALWAYS_ON, > + PD_SCU }, > + { "ca57-cpu0", 0x80, 0, R8A77965_PD_CA57_CPU0, R8A77965_PD_CA57_SCU, > + PD_CPU_NOCR }, > + { "ca57-cpu1", 0x80, 1, R8A77965_PD_CA57_CPU1, R8A77965_PD_CA57_SCU, > + PD_CPU_NOCR }, > + { "cr7",0x240, 0, R8A77965_PD_CR7, R8A77965_PD_ALWAYS_ON > }, > + { "a3vc", 0x380, 0, R8A77965_PD_A3VC, R8A77965_PD_ALWAYS_ON > }, > + { "a2vc0", 0x3c0, 0, R8A77965_PD_A2VC0,R8A77965_PD_A3VC }, M3-N (and M3-W) does not have A2VC0? > + { "a2vc1", 0x3c0, 1, R8A77965_PD_A2VC1,R8A77965_PD_A3VC }, > + { "3dg-a", 0x100, 0, R8A77965_PD_3DG_A,R8A77965_PD_ALWAYS_ON > }, > + { "3dg-b", 0x100, 1, R8A77965_PD_3DG_B,R8A77965_PD_3DG_A }, > + { "a3ir", 0x180, 0, R8A77965_PD_A3IR, R8A77965_PD_ALWAYS_ON > }, A3VP is missing? > +}; > + > +const struct rcar_sysc_info r8a77965_sysc_info __initconst = { > + .areas = r8a77965_areas, > + .num_areas = ARRAY_SIZE(r8a77965_areas), > +}; > --- /dev/null > +++ b/include/dt-bindings/power/r8a77965-sysc.h > @@ -0,0 +1,31 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (C) 2018 Jacopo Mondi > + * Copyright (C) 2016 Glider bvba > + */ > + > +#ifndef __DT_BINDINGS_POWER_R8A77965_SYSC_H__ > +#define __DT_BINDINGS_POWER_R8A77965_SYSC_H__ > + > +/* > + * These power domain indices match the numbers of the interrupt bits > + * representing the power areas in the various Interrupt Registers > + * (e.g. SYSCISR, Interrupt Status Register) > + */ > + > +#define R8A77965_PD_CA57_CPU0 0 > +#define R8A77965_PD_CA57_CPU1 1 > +#define R8A77965_PD_A3VP9 > +#define R8A77965_PD_CA57_SCU 12 > +#define R8A77965_PD_CR713 > +#define R8A77965_PD_A3VC 14 > +#define R8A77965_PD_3DG_A 17 > +#define R8A77965_PD_3DG_B 18 > +#define R8A77965_PD_A3IR 24 > +#define R8A77965_PD_A2VC0 25 M3-N (and M3-W) does not have A2VC0? > +#define R8A77965_PD_A2VC1 26 > + > +/* Always-on power area */ > +#define R8A77965_PD_ALWAYS_ON 32 > + > +#endif /* __DT_BINDINGS_POWER_R8A77965_SYSC_H__ */ Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
[PATCH 03/15] soc: renesas: Add R-Car M3-N support
Add support for R-Car M3-N (r8a77965) power areas and reset. M3-N power areas are identical to M3-W ones, so just copy and rename them. Signed-off-by: Jacopo Mondi--- .../bindings/power/renesas,rcar-sysc.txt | 1 + .../devicetree/bindings/reset/renesas,rst.txt | 1 + drivers/soc/renesas/Kconfig| 9 -- drivers/soc/renesas/Makefile | 1 + drivers/soc/renesas/r8a77965-sysc.c| 37 ++ drivers/soc/renesas/rcar-rst.c | 1 + drivers/soc/renesas/rcar-sysc.c| 3 ++ drivers/soc/renesas/rcar-sysc.h| 1 + drivers/soc/renesas/renesas-soc.c | 8 + include/dt-bindings/power/r8a77965-sysc.h | 31 ++ 10 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 drivers/soc/renesas/r8a77965-sysc.c create mode 100644 include/dt-bindings/power/r8a77965-sysc.h diff --git a/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt b/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt index 8690f10..b9c9e28 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,r8a77965-sysc" (R-Car M3-N) - "renesas,r8a77970-sysc" (R-Car V3M) - "renesas,r8a77995-sysc" (R-Car D3) - reg: Address start and address range for the device. diff --git a/Documentation/devicetree/bindings/reset/renesas,rst.txt b/Documentation/devicetree/bindings/reset/renesas,rst.txt index a8014f3..64051d0 100644 --- a/Documentation/devicetree/bindings/reset/renesas,rst.txt +++ b/Documentation/devicetree/bindings/reset/renesas,rst.txt @@ -26,6 +26,7 @@ Required properties: - "renesas,r8a7794-rst" (R-Car E2) - "renesas,r8a7795-rst" (R-Car H3) - "renesas,r8a7796-rst" (R-Car M3-W) + - "renesas,r8a77965-rst" (R-Car M3-N) - "renesas,r8a77970-rst" (R-Car V3M) - "renesas,r8a77995-rst" (R-Car D3) - reg: Address start and address range for the device. diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index 09550b1..def33f7 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -3,8 +3,8 @@ config SOC_RENESAS default y if ARCH_RENESAS select SOC_BUS select RST_RCAR if ARCH_RCAR_GEN1 || ARCH_RCAR_GEN2 || \ - ARCH_R8A7795 || ARCH_R8A7796 || ARCH_R8A77970 || \ - ARCH_R8A77995 + ARCH_R8A7795 || ARCH_R8A7796 || ARCH_R8A77965 || \ + ARCH_R8A77970 || ARCH_R8A77995 select SYSC_R8A7743 if ARCH_R8A7743 select SYSC_R8A7745 if ARCH_R8A7745 select SYSC_R8A7779 if ARCH_R8A7779 @@ -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_R8A77965 if ARCH_R8A77965 select SYSC_R8A77970 if ARCH_R8A77970 select SYSC_R8A77995 if ARCH_R8A77995 @@ -56,6 +57,10 @@ config SYSC_R8A7796 bool "R-Car M3-W System Controller support" if COMPILE_TEST select SYSC_RCAR +config SYSC_R8A77965 + bool "R-Car M3-N 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 diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile index 845d62a..9f360b8 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_R8A77965)+= r8a77965-sysc.o obj-$(CONFIG_SYSC_R8A77970)+= r8a77970-sysc.o obj-$(CONFIG_SYSC_R8A77995)+= r8a77995-sysc.o diff --git a/drivers/soc/renesas/r8a77965-sysc.c b/drivers/soc/renesas/r8a77965-sysc.c new file mode 100644 index 000..f3e17f3 --- /dev/null +++ b/drivers/soc/renesas/r8a77965-sysc.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Renesas R-Car M3-N System Controller + * Copyright (C) 2018 Jacopo Mondi + * + * Based on Renesas R-Car M3-W System Controller + * Copyright (C) 2016 Glider bvba + */ + +#include +#include + +#include + +#include "rcar-sysc.h" + +static const struct rcar_sysc_area r8a77965_areas[] __initconst = { + { "always-on", 0, 0, R8A77965_PD_ALWAYS_ON, -1, PD_ALWAYS_ON }, + { "ca57-scu", 0x1c0, 0,