R8A7797: kernel updates

- add CANFD
- add V3M videobox board
- add CANFD to V3M KF
- add eMMC to V3MSK based boards

1 files changed, 51 insertions, 70 deletions

diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0018-arm64-renesas-r8a7797-Add-Renesas-R8A7797-SoC-suppor.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0018-arm64-renesas-r8a7797-Add-Renesas-R8A7797-SoC-suppor.patch
index f1a2cd6..93cf1ec 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0018-arm64-renesas-r8a7797-Add-Renesas-R8A7797-SoC-suppor.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0018-arm64-renesas-r8a7797-Add-Renesas-R8A7797-SoC-suppor.patch
@@ -8,7 +8,7 @@ This adds Renesas R8A7797 SoC support
 Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
 ---
  arch/arm64/Kconfig.platforms                  |    6 +
- arch/arm64/boot/dts/renesas/r8a7797.dtsi      |  992 ++++++++++
+ arch/arm64/boot/dts/renesas/r8a7797.dtsi      |  973 ++++++++++
  drivers/clk/renesas/Kconfig                   |    1 +
  drivers/clk/renesas/Makefile                  |    1 +
  drivers/clk/renesas/r8a7797-cpg-mssr.c        |  218 +++
@@ -48,7 +48,7 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
  drivers/thermal/rcar_gen3_thermal.c           |   29 +
  include/dt-bindings/clock/r8a7797-cpg-mssr.h  |   48 +
  include/dt-bindings/power/r8a7797-sysc.h      |   32 +
- 41 files changed, 4275 insertions(+), 30 deletions(-)
+ 41 files changed, 4256 insertions(+), 30 deletions(-)
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7797.dtsi
  create mode 100644 drivers/clk/renesas/r8a7797-cpg-mssr.c
  create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7797.c
@@ -75,10 +75,10 @@ index 7c104ca..9380fc6 100644
  	help
 diff --git a/arch/arm64/boot/dts/renesas/r8a7797.dtsi b/arch/arm64/boot/dts/renesas/r8a7797.dtsi
 new file mode 100644
-index 0000000..5bd447a
+index 0000000..30638e3
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7797.dtsi
-@@ -0,0 +1,992 @@
+@@ -0,0 +1,973 @@
 +/*
 + * Device Tree Source for the r8a7797 SoC
 + *
@@ -554,20 +554,19 @@ index 0000000..5bd447a
 +			#size-cells = <0>;
 +		};
 +
-+		/* Future
 +		canfd: canfd@e66c0000 {
 +			compatible = "renesas,r8a7797-canfd",
 +				     "renesas,rcar-gen3-canfd";
 +			reg = <0 0xe66c0000 0 0x8000>;
 +			interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
-+				   <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;		** SPI29:CAN-FD channel, SPI30:CAN-FD global **
++				   <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
 +			clocks = <&cpg CPG_MOD 914>,
 +			       <&cpg CPG_CORE R8A7797_CLK_CANFD>,
-+			       <&can_clk>;					** RMSTPCR9/bit14:CAN-FD **
++			       <&can_clk>;
 +			clock-names = "fck", "canfd", "can_clk";
 +			assigned-clocks = <&cpg CPG_CORE R8A7797_CLK_CANFD>;
 +			assigned-clock-rates = <40000000>;
-+			power-domains = <&cpg>;
++			power-domains = <&sysc R8A7797_PD_ALWAYS_ON>;
 +			status = "disabled";
 +
 +			channel0 {
@@ -577,7 +576,7 @@ index 0000000..5bd447a
 +			channel1 {
 +				status = "disabled";
 +			};
-+		};	*/
++		};
 +
 +		pwm0: pwm@e6e30000 {
 +			compatible = "renesas,pwm-r8a7797", "renesas,pwm-rcar";
@@ -911,31 +910,13 @@ index 0000000..5bd447a
 +			status = "disabled";
 +		};
 +
-+
 +		sdhi2: sd@ee140000 {
 +			compatible = "renesas,sdhi-r8a7797";
 +			reg = <0 0xee140000 0 0x2000>;
-+			interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;		 /* SPI165:SDHI.ch0 */
-+			clocks = <&cpg CPG_MOD 314>;				 /* RMSTPCR3/bit14:SDIF */
-+			power-domains = <&sysc R8A7797_PD_ALWAYS_ON>;
-+			renesas,clk-rate = <200000000>;
-+			cap-sd-highspeed;
-+			sd-uhs-sdr50;
-+			sd-uhs-sdr104;
-+			renesas,mmc-scc-tapnum = <8>;
-+			status = "disabled";
-+		};
-+
-+		mmc0: mmc@ee140000 {
-+			compatible = "renesas,mmc-r8a7797";
-+			reg = <0 0xee140000 0 0x2000>;
-+			interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;		/* SPI165:SDHI.ch0 */
-+			clocks = <&cpg CPG_MOD 314>;				/* RMSTPCR3/bit14:SDIF */
++			interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
++			clocks = <&cpg CPG_MOD 314>;
 +			power-domains = <&sysc R8A7797_PD_ALWAYS_ON>;
 +			renesas,clk-rate = <200000000>;
-+			cap-mmc-highspeed;
-+			mmc-hs200-1_8v;
-+			renesas,mmc-scc-tapnum = <8>;
 +			status = "disabled";
 +		};
 +
@@ -1097,7 +1078,7 @@ index 1072f76..c6f0abb 100644
  obj-$(CONFIG_CLK_RENESAS_CPG_MSSR)	+= renesas-cpg-mssr.o clk-div6.o
 diff --git a/drivers/clk/renesas/r8a7797-cpg-mssr.c b/drivers/clk/renesas/r8a7797-cpg-mssr.c
 new file mode 100644
-index 0000000..c69bf31
+index 0000000..c8e9a3f
 --- /dev/null
 +++ b/drivers/clk/renesas/r8a7797-cpg-mssr.c
 @@ -0,0 +1,218 @@
@@ -1320,7 +1301,7 @@ index 0000000..c69bf31
 +	.cpg_clk_register = rcar_gen3_cpg_clk_register,
 +};
 diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c
-index f9d1763..96de154 100644
+index 1cd2c05..b145f14 100644
 --- a/drivers/clk/renesas/rcar-gen3-cpg.c
 +++ b/drivers/clk/renesas/rcar-gen3-cpg.c
 @@ -26,6 +26,13 @@
@@ -1337,7 +1318,7 @@ index f9d1763..96de154 100644
  #define CPG_PLL0CR		0x00d8
  #define CPG_PLL2CR		0x002c
  #define CPG_PLL4CR		0x01f4
-@@ -227,7 +234,10 @@ static unsigned long cpg_z2_clk_recalc_rate(struct clk_hw *hw,
+@@ -228,7 +235,10 @@ static unsigned long cpg_z2_clk_recalc_rate(struct clk_hw *hw,
  	unsigned int val;
  	unsigned long rate;
  
@@ -1349,7 +1330,7 @@ index f9d1763..96de154 100644
  	mult = 32 - val;
  
  	rate = div_u64((u64)parent_rate * mult + 16, 32);
-@@ -339,6 +349,11 @@ static int cpg_z2_clk_set_rate(struct clk_hw *hw, unsigned long rate,
+@@ -372,6 +382,11 @@ static int cpg_z2_clk_set_rate(struct clk_hw *hw, unsigned long rate,
  	u32 val, kick;
  	unsigned int i;
  
@@ -1361,7 +1342,7 @@ index f9d1763..96de154 100644
  	mult = div_u64((u64)rate * 32 + parent_rate/2, parent_rate);
  	mult = clamp(mult, 1U, 32U);
  
-@@ -451,6 +466,19 @@ static struct clk * __init cpg_z2_clk_register(const char *name,
+@@ -566,6 +581,19 @@ static struct clk * __init cpg_zg_clk_register(const char *name,
  /*
   * SDn Clock
   */
@@ -1381,7 +1362,7 @@ index f9d1763..96de154 100644
  #define CPG_SD_STP_HCK		BIT(9)
  #define CPG_SD_STP_CK		BIT(8)
  
-@@ -749,6 +777,14 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -864,6 +892,14 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
  	case CLK_TYPE_GEN3_SD:
  		return cpg_sd_clk_register(core, base, __clk_get_name(parent));
  
@@ -1396,7 +1377,7 @@ index f9d1763..96de154 100644
  	case CLK_TYPE_GEN3_RINT:
  		div = cpg_pll_config->rint;
  		break;
-@@ -799,5 +835,8 @@ int __init rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,
+@@ -917,5 +953,8 @@ int __init rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,
  	if (attr)
  		cpg_quirks = (uintptr_t)attr->data;
  	pr_debug("%s: mode = 0x%x quirks = 0x%x\n", __func__, mode, cpg_quirks);
@@ -1406,7 +1387,7 @@ index f9d1763..96de154 100644
  	return 0;
  }
 diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h
-index 4155023..f0c0a92 100644
+index 51ae7b8..694bedc 100644
 --- a/drivers/clk/renesas/rcar-gen3-cpg.h
 +++ b/drivers/clk/renesas/rcar-gen3-cpg.h
 @@ -19,6 +19,8 @@ enum rcar_gen3_clk_types {
@@ -1418,7 +1399,7 @@ index 4155023..f0c0a92 100644
  	CLK_TYPE_GEN3_R,
  	CLK_TYPE_GEN3_Z,
  	CLK_TYPE_GEN3_Z2,
-@@ -26,6 +28,10 @@ enum rcar_gen3_clk_types {
+@@ -29,6 +31,10 @@ enum rcar_gen3_clk_types {
  
  #define DEF_GEN3_SD(_name, _id, _parent, _offset)	\
  	DEF_BASE(_name, _id, CLK_TYPE_GEN3_SD, _parent, .offset = _offset)
@@ -1471,7 +1452,7 @@ index 29f76a4..809a6e1 100644
  
  	{ .compatible = "rockchip,rk2928", },
 diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
-index f721a89..118e579 100644
+index 7685d31..02e42ba 100644
 --- a/drivers/gpio/gpio-rcar.c
 +++ b/drivers/gpio/gpio-rcar.c
 @@ -1,7 +1,7 @@
@@ -1483,7 +1464,7 @@ index f721a89..118e579 100644
   *  Copyright (C) 2013 Magnus Damm
   *
   * This program is free software; you can redistribute it and/or modify
-@@ -579,6 +579,10 @@ struct gpio_rcar_info {
+@@ -363,6 +363,10 @@ struct gpio_rcar_info {
  		/* Gen3 GPIO is identical to Gen2. */
  		.data = &gpio_rcar_info_gen2,
  	}, {
@@ -1495,7 +1476,7 @@ index f721a89..118e579 100644
  		.data = &gpio_rcar_info_gen1,
  	}, {
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
-index 6295c73..ac9cf2a 100644
+index eb088cb..62612cd 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
 @@ -289,6 +289,30 @@
@@ -1538,7 +1519,7 @@ index 6295c73..ac9cf2a 100644
  };
  
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c
-index c15611c..95023bd 100644
+index ccf5159..4c9e008 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c
 @@ -29,11 +29,17 @@
@@ -1573,7 +1554,7 @@ index c15611c..95023bd 100644
  }
  
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
-index ecae864..42eb45c 100644
+index ecae864..d5fa06c 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
 @@ -17,12 +17,18 @@
@@ -1676,7 +1657,7 @@ index 73ff520..306ba97 100644
  };
  MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids);
 diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 2b380ff..b9ef21a 100644
+index 4cf30c8..3fdd96e 100644
 --- a/drivers/iommu/ipmmu-vmsa.c
 +++ b/drivers/iommu/ipmmu-vmsa.c
 @@ -1,7 +1,7 @@
@@ -1698,7 +1679,7 @@ index 2b380ff..b9ef21a 100644
  		/* Terminator */
  	},
  };
-@@ -1640,6 +1643,8 @@ static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np)
+@@ -1643,6 +1646,8 @@ static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np)
  		 ipmmu_vmsa_iommu_of_setup);
  IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796",
  		 ipmmu_vmsa_iommu_of_setup);
@@ -1721,7 +1702,7 @@ index 17178ad..5539c5d 100644
  	  This is a v4l2 driver for the R-Car CSI-2 Interface
  
 diff --git a/drivers/media/platform/soc_camera/rcar_csi2.c b/drivers/media/platform/soc_camera/rcar_csi2.c
-index 05f623468..5faac64 100644
+index 05f623468..4d95da6 100644
 --- a/drivers/media/platform/soc_camera/rcar_csi2.c
 +++ b/drivers/media/platform/soc_camera/rcar_csi2.c
 @@ -25,6 +25,7 @@
@@ -2008,10 +1989,10 @@ index 400958b..74fb005 100644
  
  	for (i = 0; i < num; i++) {
 diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
-index 45bd0f3..90f7109 100644
+index 57b1b81..2f711bb 100644
 --- a/drivers/media/platform/vsp1/vsp1_drv.c
 +++ b/drivers/media/platform/vsp1/vsp1_drv.c
-@@ -888,6 +888,15 @@ void vsp1_device_put(struct vsp1_device *vsp1)
+@@ -893,6 +893,15 @@ void vsp1_device_put(struct vsp1_device *vsp1)
  		.wpf_count = 2,
  		.num_bru_inputs = 5,
  		.header_mode = true,
@@ -2072,10 +2053,10 @@ index b442d14..e79f9e6 100644
  
  static const struct vsp1_entity_operations lif_entity_ops = {
 diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
-index 885f60b..2d863a7 100644
+index fb6d56c..bcba968 100644
 --- a/drivers/media/platform/vsp1/vsp1_regs.h
 +++ b/drivers/media/platform/vsp1/vsp1_regs.h
-@@ -788,6 +788,12 @@
+@@ -789,6 +789,12 @@
  #define VI6_LIF_CSBTH_LBTH_MASK		(0x7ff << 0)
  #define VI6_LIF_CSBTH_LBTH_SHIFT	0
  
@@ -2088,7 +2069,7 @@ index 885f60b..2d863a7 100644
  /* -----------------------------------------------------------------------------
   * Security Control Registers
   */
-@@ -811,6 +817,7 @@
+@@ -812,6 +818,7 @@
  #define VI6_IP_VERSION_MODEL_VSPBD_GEN3	(0x15 << 8)
  #define VI6_IP_VERSION_MODEL_VSPBC_GEN3	(0x16 << 8)
  #define VI6_IP_VERSION_MODEL_VSPD_GEN3	(0x17 << 8)
@@ -2097,10 +2078,10 @@ index 885f60b..2d863a7 100644
  #define VI6_IP_VERSION_SOC_MASK		(0xff << 0)
  #define VI6_IP_VERSION_SOC_H		(0x01 << 0)
 diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
-index 136ebac..fe4e022 100644
+index 359a981..49276282 100644
 --- a/drivers/mmc/host/sh_mobile_sdhi.c
 +++ b/drivers/mmc/host/sh_mobile_sdhi.c
-@@ -150,6 +150,8 @@ struct sh_mobile_sdhi_of_data {
+@@ -138,6 +138,8 @@ struct sh_mobile_sdhi_of_data {
  	{ .compatible = "renesas,sdhi-r8a7794", .data = &of_rcar_gen2_compatible, },
  	{ .compatible = "renesas,sdhi-r8a7795", .data = &of_rcar_gen3_compatible, },
  	{ .compatible = "renesas,sdhi-r8a7796", .data = &of_rcar_gen3_compatible, },
@@ -2110,10 +2091,10 @@ index 136ebac..fe4e022 100644
  };
  MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);
 diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
-index 6c65426..97c52dd 100644
+index 68019d9..cd4f25a 100644
 --- a/drivers/net/ethernet/renesas/ravb_main.c
 +++ b/drivers/net/ethernet/renesas/ravb_main.c
-@@ -1922,6 +1922,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
+@@ -1906,6 +1906,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
  	{ .compatible = "renesas,etheravb-rcar-gen2", .data = (void *)RCAR_GEN2 },
  	{ .compatible = "renesas,etheravb-r8a7795", .data = (void *)RCAR_GEN3 },
  	{ .compatible = "renesas,etheravb-r8a7796", .data = (void *)RCAR_GEN3 },
@@ -2150,7 +2131,7 @@ index 8e08684..10adc18 100644
  obj-$(CONFIG_PINCTRL_PFC_SH7264)	+= pfc-sh7264.o
  obj-$(CONFIG_PINCTRL_PFC_SH7269)	+= pfc-sh7269.o
 diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
-index 6399eb1..9bb3665 100644
+index 7ea6c8e..b536aeb 100644
 --- a/drivers/pinctrl/sh-pfc/core.c
 +++ b/drivers/pinctrl/sh-pfc/core.c
 @@ -5,6 +5,7 @@
@@ -2161,7 +2142,7 @@ index 6399eb1..9bb3665 100644
   *
   * This file is subject to the terms and conditions of the GNU General Public
   * License.  See the file "COPYING" in the main directory of this archive
-@@ -622,6 +623,12 @@ static int sh_pfc_init_ranges(struct sh_pfc *pfc)
+@@ -539,6 +540,12 @@ static int sh_pfc_init_ranges(struct sh_pfc *pfc)
  		.data = &r8a7796_pinmux_info,
  	},
  #endif
@@ -2176,7 +2157,7 @@ index 6399eb1..9bb3665 100644
  		.compatible = "renesas,pfc-sh73a0",
 diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7797.c b/drivers/pinctrl/sh-pfc/pfc-r8a7797.c
 new file mode 100644
-index 0000000..d58ccb3
+index 0000000..9b6127f
 --- /dev/null
 +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7797.c
 @@ -0,0 +1,2586 @@
@@ -3794,7 +3775,7 @@ index 0000000..d58ccb3
 +};
 +static const unsigned int mmc_ctrl_pins[] = {
 +	/* CLK, CMD */
-+	RCAR_GP_PIN(3,10), RCAR_GP_PIN(3, 5),
++	RCAR_GP_PIN(3, 10), RCAR_GP_PIN(3, 5),
 +};
 +static const unsigned int mmc_ctrl_mux[] = {
 +	MMC_CLK_MARK, MMC_CMD_MARK,
@@ -4767,10 +4748,10 @@ index 0000000..d58ccb3
 +	.pinmux_data_size = ARRAY_SIZE(pinmux_data),
 +};
 diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
-index c6a1855..a673a00 100644
+index 93cce90..0da3ee4 100644
 --- a/drivers/pinctrl/sh-pfc/sh_pfc.h
 +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
-@@ -269,6 +269,7 @@ struct sh_pfc_soc_info {
+@@ -287,6 +287,7 @@ struct sh_pfc_soc_info {
  extern const struct sh_pfc_soc_info r8a7795_pinmux_info;
  extern const struct sh_pfc_soc_info r8a7795_es1_pinmux_info;
  extern const struct sh_pfc_soc_info r8a7796_pinmux_info;
@@ -4778,7 +4759,7 @@ index c6a1855..a673a00 100644
  extern const struct sh_pfc_soc_info sh7203_pinmux_info;
  extern const struct sh_pfc_soc_info sh7264_pinmux_info;
  extern const struct sh_pfc_soc_info sh7269_pinmux_info;
-@@ -374,6 +375,11 @@ struct sh_pfc_soc_info {
+@@ -392,6 +393,11 @@ struct sh_pfc_soc_info {
  	PORT_GP_CFG_1(bank, 3,  fn, sfx, cfg)
  #define PORT_GP_4(bank, fn, sfx)	PORT_GP_CFG_4(bank, fn, sfx, 0)
  
@@ -4790,7 +4771,7 @@ index c6a1855..a673a00 100644
  #define PORT_GP_CFG_8(bank, fn, sfx, cfg)				\
  	PORT_GP_CFG_4(bank, fn, sfx, cfg),				\
  	PORT_GP_CFG_1(bank, 4,  fn, sfx, cfg),				\
-@@ -420,6 +426,12 @@ struct sh_pfc_soc_info {
+@@ -438,6 +444,12 @@ struct sh_pfc_soc_info {
  	PORT_GP_CFG_1(bank, 17, fn, sfx, cfg)
  #define PORT_GP_18(bank, fn, sfx)	PORT_GP_CFG_18(bank, fn, sfx, 0)
  
@@ -4888,10 +4869,10 @@ index a6d1c26..2e87293 100644
  };
  
 diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
-index 042500a..e6165b6 100644
+index 072f94c..7e59c72 100644
 --- a/drivers/soc/renesas/rcar-sysc.c
 +++ b/drivers/soc/renesas/rcar-sysc.c
-@@ -320,6 +320,9 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
+@@ -321,6 +321,9 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
  #ifdef CONFIG_ARCH_R8A7796
  	{ .compatible = "renesas,r8a7796-sysc", .data = &r8a7796_sysc_info },
  #endif
@@ -4902,10 +4883,10 @@ index 042500a..e6165b6 100644
  };
  
 diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
-index f6e842e..e7980d5 100644
+index cd8bc52..e367715 100644
 --- a/drivers/soc/renesas/rcar-sysc.h
 +++ b/drivers/soc/renesas/rcar-sysc.h
-@@ -59,4 +59,5 @@ struct rcar_sysc_info {
+@@ -60,4 +60,5 @@ struct rcar_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;
@@ -4993,10 +4974,10 @@ index 996869e..3281dc7 100644
  };
  MODULE_DEVICE_TABLE(of, sh_msiof_match);
 diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
-index 39763c7..07b1a2e 100644
+index 6700dda..a9f4d96 100644
 --- a/drivers/thermal/rcar_gen3_thermal.c
 +++ b/drivers/thermal/rcar_gen3_thermal.c
-@@ -385,6 +385,30 @@ static int rcar_gen3_r8a7795_thermal_init(struct rcar_thermal_priv *priv)
+@@ -391,6 +391,30 @@ static int rcar_gen3_r8a7795_thermal_init(struct rcar_thermal_priv *priv)
  	return 0;
  }
  
@@ -5027,7 +5008,7 @@ index 39763c7..07b1a2e 100644
  /*
   *		Interrupt
   */
-@@ -466,9 +490,14 @@ static int rcar_gen3_thermal_remove(struct platform_device *pdev)
+@@ -472,9 +496,14 @@ static int rcar_gen3_thermal_remove(struct platform_device *pdev)
  	.thermal_init = rcar_gen3_r8a7796_thermal_init,
  };