V3M: add ISP resources in dtsi

1 files changed, 19 insertions, 7 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 1f2b11c..63c109a 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                  |    8 +
- arch/arm64/boot/dts/renesas/r8a7797.dtsi      | 1156 +++++++++++
+ arch/arm64/boot/dts/renesas/r8a7797.dtsi      | 1168 +++++++++++
  drivers/clk/renesas/Kconfig                   |    1 +
  drivers/clk/renesas/Makefile                  |    1 +
  drivers/clk/renesas/r8a7797-cpg-mssr.c        |  232 +++
@@ -47,7 +47,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 +
- 40 files changed, 4489 insertions(+), 29 deletions(-)
+ 40 files changed, 4501 insertions(+), 29 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
@@ -76,10 +76,10 @@ index ebe0a37..9cebaad 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..5319b1a
+index 0000000..faefe8a
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7797.dtsi
-@@ -0,0 +1,1156 @@
+@@ -0,0 +1,1168 @@
 +/*
 + * Device Tree Source for the r8a7797 SoC
 + *
@@ -115,6 +115,7 @@ index 0000000..5319b1a
 +		vin2 = &vin2;
 +		vin3 = &vin3;
 +		tsc0 = &tsc1;
++		isp0 = &isp0;
 +	};
 +
 +	psci {
@@ -1234,6 +1235,17 @@ index 0000000..5319b1a
 +			clocks = <&cpg CPG_MOD 820>;
 +			power-domains = <&sysc R8A7797_PD_ALWAYS_ON>;
 +		};
++
++		isp0: isp@fec00000 {
++			compatible = "renesas,isp-r8a7797";
++			reg = <0 0xfec00000 0 0x20000>,
++			      <0 0xfed00000 0 0x4000>;
++			interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
++				     <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
++			clocks = <&cpg CPG_MOD 817>;
++			power-domains = <&sysc R8A7797_PD_ALWAYS_ON>;
++			status = "disabled";
++		};
 +	};
 +};
 diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig
@@ -1821,10 +1833,10 @@ index ecae864..d5fa06c 100644
  
  	lvdcr0 |= LVDCR0_LVRES;
 diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
-index 74c17d8..149c107 100644
+index 156fe5f..ea451cd 100644
 --- a/drivers/i2c/busses/i2c-rcar.c
 +++ b/drivers/i2c/busses/i2c-rcar.c
-@@ -807,6 +807,7 @@ static u32 rcar_i2c_func(struct i2c_adapter *adap)
+@@ -836,6 +836,7 @@ static u32 rcar_i2c_func(struct i2c_adapter *adap)
  	{ .compatible = "renesas,i2c-r8a7795", .data = (void *)I2C_RCAR_GEN3 },
  	{ .compatible = "renesas,i2c-r8a7796", .data = (void *)I2C_RCAR_GEN3 },
  	{ .compatible = "renesas,i2c-r8a77965", .data = (void *)I2C_RCAR_GEN3 },
@@ -5171,7 +5183,7 @@ index 1b33c50..63f943d 100644
  	{ .compatible = "renesas,sh73a0",	.data = &soc_shmobile_ag5 },
  #endif
 diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
-index 36e70db..a2606fe 100644
+index 2d3ac0b..1488964 100644
 --- a/drivers/spi/spi-sh-msiof.c
 +++ b/drivers/spi/spi-sh-msiof.c
 @@ -216,7 +216,8 @@ static int msiof_rcar_is_gen3(struct device *dev)