Merge tag 'renesas-r8a7745-sysc-for-v4.10' of git://git.kernel.org/pub/scm/linux...

Pull "Renesas ARM Based SoC r8a7745 SYSC Driver Updates for v4.10" from Simon Horman:

* Add support for the r8a7745 SoC to rcar-sysc

* tag 'renesas-r8a7745-sysc-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: rcar-sysc: add R8A7745 support
  ARM: shmobile: r8a7745: add power domain index macros

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt
index c16ec1866ac455f59eac92f7995876c063711e70,1375758307d248c78b45d67c06d0028f8dcd2dc7..d91715bc8d52c22e7f159b6bca96f35fa5a68111
--- 1/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt
--- 2/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt
+++ b/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt
@@@ -7,7 -7,7 +7,8 @@@ and various coprocessors
  
  Required properties:
    - compatible: Must contain exactly one of the following:
 +      - "renesas,r8a7743-sysc" (RZ/G1M)
+       - "renesas,r8a7745-sysc" (RZ/G1E)
        - "renesas,r8a7779-sysc" (R-Car H1)
        - "renesas,r8a7790-sysc" (R-Car H2)
        - "renesas,r8a7791-sysc" (R-Car M2-W)

diff --cc drivers/soc/renesas/Makefile
index 9e0bb329594c4fca02dcea048bb68faa8838136a,a25a628e90b57876c74c71a66034af28f56d85b9..e2249f01b2de45fcf2a6bcc46700e37c1890f527
--- 1/drivers/soc/renesas/Makefile
--- 2/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@@ -1,4 -1,4 +1,5 @@@
 +obj-$(CONFIG_ARCH_R8A7743)    += rcar-sysc.o r8a7743-sysc.o
+ obj-$(CONFIG_ARCH_R8A7745)    += rcar-sysc.o r8a7745-sysc.o
  obj-$(CONFIG_ARCH_R8A7779)    += rcar-sysc.o r8a7779-sysc.o
  obj-$(CONFIG_ARCH_R8A7790)    += rcar-sysc.o r8a7790-sysc.o
  obj-$(CONFIG_ARCH_R8A7791)    += rcar-sysc.o r8a7791-sysc.o

diff --cc drivers/soc/renesas/rcar-sysc.c
index 71acd45b13f09f0e14ae2f2188e9e8c0a7012a29,a4e1bb046bc724e366a4c8e6645cc4d9b04656c2..225c35c79d9abad07308d2226f99448ba0d93531
--- 1/drivers/soc/renesas/rcar-sysc.c
--- 2/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@@ -275,9 -275,9 +275,12 @@@ finalize
  }
  
  static const struct of_device_id rcar_sysc_matches[] = {
 +#ifdef CONFIG_ARCH_R8A7743
 +      { .compatible = "renesas,r8a7743-sysc", .data = &r8a7743_sysc_info },
 +#endif
+ #ifdef CONFIG_ARCH_R8A7745
+       { .compatible = "renesas,r8a7745-sysc", .data = &r8a7745_sysc_info },
+ #endif
  #ifdef CONFIG_ARCH_R8A7779
        { .compatible = "renesas,r8a7779-sysc", .data = &r8a7779_sysc_info },
  #endif

diff --cc drivers/soc/renesas/rcar-sysc.h
index 8ab9ca8a825a7aaf8a3d299fcc61616f7f75d175,3048dd31288af62a87fd38a33e466fcec3a8e911..f6e842e2976ebe326ca2439dfb58a4b14f6464bc
--- 1/drivers/soc/renesas/rcar-sysc.h
--- 2/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@@ -50,7 -50,7 +50,8 @@@ struct rcar_sysc_info 
        unsigned int num_areas;
  };
  
 +extern const struct rcar_sysc_info r8a7743_sysc_info;
+ extern const struct rcar_sysc_info r8a7745_sysc_info;
  extern const struct rcar_sysc_info r8a7779_sysc_info;
  extern const struct rcar_sysc_info r8a7790_sysc_info;
  extern const struct rcar_sysc_info r8a7791_sysc_info;