diff options
author | Olof Johansson <olof@lixom.net> | 2019-11-03 17:05:45 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-11-03 17:05:46 -0800 |
commit | 064652ad88e8bb97ae14e49ae87d40952d6e1f3e (patch) | |
tree | 24c76942072065ca330b21a4f573ac4e9ab999e7 /drivers/soc/renesas/rcar-sysc.h | |
parent | Merge branch 'for_5.5/driver-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/drivers (diff) | |
parent | soc: renesas: rcar-sysc: Add R8A77961 support (diff) | |
download | linux-dev-064652ad88e8bb97ae14e49ae87d40952d6e1f3e.tar.xz linux-dev-064652ad88e8bb97ae14e49ae87d40952d6e1f3e.zip |
Merge tag 'renesas-drivers-for-v5.5-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/drivers
Renesas driver updates for v5.5 (take two)
- Initial support for the R-Car M3-W+ (r8a77961) SoC,
- A minor fix.
* tag 'renesas-drivers-for-v5.5-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
soc: renesas: rcar-sysc: Add R8A77961 support
soc: renesas: rcar-rst: Add R8A77961 support
soc: renesas: Identify R-Car M3-W+
soc: renesas: Add ARCH_R8A77961 for new R-Car M3-W+
soc: renesas: Add ARCH_R8A77960 for existing R-Car M3-W
soc: renesas: Rename SYSC_R8A7796 to SYSC_R8A77960
soc: renesas: Add missing check for non-zero product register address
dt-bindings: clock: Add r8a77961 CPG Core Clock Definitions
dt-bindings: power: Add r8a77961 SYSC power domain definitions
Link: https://lore.kernel.org/r/20191101155842.31467-6-geert+renesas@glider.be
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc/renesas/rcar-sysc.h')
-rw-r--r-- | drivers/soc/renesas/rcar-sysc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h index e4c9854f5dc0..8d074489fba9 100644 --- a/drivers/soc/renesas/rcar-sysc.h +++ b/drivers/soc/renesas/rcar-sysc.h @@ -61,7 +61,8 @@ extern const struct rcar_sysc_info r8a7791_sysc_info; extern const struct rcar_sysc_info r8a7792_sysc_info; extern const struct rcar_sysc_info r8a7794_sysc_info; extern struct rcar_sysc_info r8a7795_sysc_info; -extern struct rcar_sysc_info r8a7796_sysc_info; +extern const struct rcar_sysc_info r8a77960_sysc_info; +extern const struct rcar_sysc_info r8a77961_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; |