Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-02-18 10:33:49 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-02-18 10:33:49 +0100
commit6820e4a4aca658377e3ea9018c3696ee2b41a6e3 (patch)
treed50e857bfcefedbeccd61d30e1f193b1755b30a1
parent05e95ea86e3b231de493c1e6cacd8204870b6c13 (diff)
gpu: ipu-v3: Fix CSI offsets for imx53 (bsc#1106929)
-rw-r--r--patches.fixes/0002-gpu-ipu-v3-Fix-CSI-offsets-for-imx53.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.fixes/0002-gpu-ipu-v3-Fix-CSI-offsets-for-imx53.patch b/patches.fixes/0002-gpu-ipu-v3-Fix-CSI-offsets-for-imx53.patch
new file mode 100644
index 0000000000..4c098aaaa7
--- /dev/null
+++ b/patches.fixes/0002-gpu-ipu-v3-Fix-CSI-offsets-for-imx53.patch
@@ -0,0 +1,38 @@
+From bb867d219fda7fbaabea3314702474c4eac2b91d Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <slongerbeam@gmail.com>
+Date: Tue, 16 Oct 2018 17:31:40 -0700
+Subject: gpu: ipu-v3: Fix CSI offsets for imx53
+Git-commit: bb867d219fda7fbaabea3314702474c4eac2b91d
+Patch-mainline: v5.0-rc7
+References: bsc#1106929
+
+The CSI offsets are wrong for both CSI0 and CSI1. They are at
+physical address 0x1e030000 and 0x1e038000 respectively.
+
+Fixes: 2ffd48f2e7 ("gpu: ipu-v3: Add Camera Sensor Interface unit")
+
+Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/ipu-v3/ipu-common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
+index 5b7cdbfe062f..0a7d4395d427 100644
+--- a/drivers/gpu/ipu-v3/ipu-common.c
++++ b/drivers/gpu/ipu-v3/ipu-common.c
+@@ -914,8 +914,8 @@ static struct ipu_devtype ipu_type_imx53 = {
+ .cpmem_ofs = 0x07000000,
+ .srm_ofs = 0x07040000,
+ .tpm_ofs = 0x07060000,
+- .csi0_ofs = 0x07030000,
+- .csi1_ofs = 0x07038000,
++ .csi0_ofs = 0x06030000,
++ .csi1_ofs = 0x06038000,
+ .ic_ofs = 0x06020000,
+ .disp0_ofs = 0x06040000,
+ .disp1_ofs = 0x06048000,
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index a816f04177..2376bcab53 100644
--- a/series.conf
+++ b/series.conf
@@ -24259,6 +24259,7 @@
patches.fixes/0001-drm-vmwgfx-Return-error-code-from-vmw_execbuf_copy_f.patch
patches.fixes/0001-drm-vmwgfx-Fix-setting-of-dma-masks.patch
patches.fixes/0001-gpu-ipu-v3-Fix-i.MX51-CSI-control-registers-offset.patch
+ patches.fixes/0002-gpu-ipu-v3-Fix-CSI-offsets-for-imx53.patch
# mkp/scsi 5.0/scsi-fixes
patches.fixes/scsi-target-make-the-pi_prot_format-ConfigFS-path-re.patch