1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From a5d325f3d587578aae5cae46dbdb2a7570b706fb Mon Sep 17 00:00:00 2001
From: Valentine Barshak <valentine.barshak@cogentembedded.com>
Date: Fri, 26 Oct 2018 19:40:35 +0300
Subject: [PATCH 119/211] media: platform: soc_camera: rcar_csi2: r8a77970:
Update SoC id
Use r8a77970 SoC id instead of r8a7797.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
drivers/media/platform/soc_camera/Kconfig | 3 ++-
drivers/media/platform/soc_camera/rcar_csi2.c | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
index 61b0dcf..ae9e0b3 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -39,7 +39,8 @@ config VIDEO_RCAR_VIN_LEGACY_DEBUG
config VIDEO_RCAR_CSI2_LEGACY
tristate "R-Car MIPI CSI-2 Interface driver"
depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK
- depends on ARCH_R8A7795 || ARCH_R8A7796 || ARCH_R8A77965 || COMPILE_TEST
+ depends on ARCH_R8A7795 || ARCH_R8A7796 || ARCH_R8A77965 || \
+ ARCH_R8A77970 || COMPILE_TEST
select V4L2_FWNODE
---help---
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 384d7e9..838806d 100644
--- a/drivers/media/platform/soc_camera/rcar_csi2.c
+++ b/drivers/media/platform/soc_camera/rcar_csi2.c
@@ -166,8 +166,8 @@
#define RCAR_CSI2_INTSTATE_ERRSYNCESC (1 << 1)
#define RCAR_CSI2_INTSTATE_ERRCONTROL (1 << 0)
-static const struct soc_device_attribute r8a7797[] = {
- { .soc_id = "r8a7797" },
+static const struct soc_device_attribute r8a77970[] = {
+ { .soc_id = "r8a77970" },
{ }
};
@@ -409,7 +409,7 @@ static int rcar_csi2_set_phy_freq(struct rcar_csi2 *priv)
dev_dbg(&priv->pdev->dev, "bps_per_lane (%d)\n", bps_per_lane);
- if (soc_device_match(r8a7797))
+ if (soc_device_match(r8a77970))
iowrite32((hs_freq_range_v3m[bps_per_lane] << 16) |
RCAR_CSI2_PHTW_DWEN | RCAR_CSI2_PHTW_CWEN | 0x44,
priv->base + RCAR_CSI2_PHTW);
@@ -612,7 +612,7 @@ static struct v4l2_subdev_ops rcar_csi2_subdev_ops = {
#ifdef CONFIG_OF
static const struct of_device_id rcar_csi2_of_table[] = {
- { .compatible = "renesas,r8a7797-csi2", .data = (void *)RCAR_GEN3 },
+ { .compatible = "renesas,r8a77970-csi2", .data = (void *)RCAR_GEN3 },
{ .compatible = "renesas,r8a77965-csi2", .data = (void *)RCAR_GEN3 },
{ .compatible = "renesas,r8a7796-csi2", .data = (void *)RCAR_GEN3 },
{ .compatible = "renesas,r8a7795-csi2", .data = (void *)RCAR_GEN3 },
@@ -622,7 +622,7 @@ MODULE_DEVICE_TABLE(of, rcar_csi2_of_table);
#endif
static struct platform_device_id rcar_csi2_id_table[] = {
- { "r8a7797-csi2", RCAR_GEN3 },
+ { "r8a77970-csi2", RCAR_GEN3 },
{ "r8a77965-csi2", RCAR_GEN3 },
{ "r8a7796-csi2", RCAR_GEN3 },
{ "r8a7795-csi2", RCAR_GEN3 },
--
2.7.4
|
