From 6e8736a0ea4fdddb503a8b5c2b01e4562b175e98 Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Tue, 1 Jul 2014 21:17:26 +0800 Subject: [PATCH] ENGR00320692-1 ARM: dts: imx6sl: fix "csi_id is missing or invalid" issue csi_id property is missing in dts file for imx6sl-evk board, which causes the following kernel dump when insert the csi_v4l2_capture module. This patch fixed it. csi_v4l2 csi_v4l2_cap.22: csi_id missing or invalid Unable to handle kernel NULL pointer dereference at virtual address 00000034 pgd = a8774000 [00000034] *pgd=a957f831, *pte=00000000, *ppte=00000000 Internal error: Oops: 817 [#1] PREEMPT SMP ARM Modules linked in: csi_v4l2_capture(+) fsl_csi ov5642_camera ov5640_camera evbug CPU: 0 PID: 829 Comm: modprobe Not tainted 3.10.31-1.1.0_beta+g3c16fd0 #1 task: a881ef00 ti: a892c000 task.ti: a892c000 PC is at csi_v4l2_probe+0x2a0/0x35c [csi_v4l2_capture] LR is at csi_v4l2_probe+0x290/0x35c [csi_v4l2_capture] Signed-off-by: Robby Cai (cherry picked from commit d0173b8ba4027983b2b9e988fafb64124ccb9731) --- arch/arm/boot/dts/imx6sl-evk-common.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/imx6sl-evk-common.dtsi b/arch/arm/boot/dts/imx6sl-evk-common.dtsi index 38be901cbac2e1..2f0ec262d5f7d1 100644 --- a/arch/arm/boot/dts/imx6sl-evk-common.dtsi +++ b/arch/arm/boot/dts/imx6sl-evk-common.dtsi @@ -78,6 +78,7 @@ csi_v4l2_cap { compatible = "fsl,imx6sl-csi-v4l2"; + csi_id = <0>; status = "disabled"; };