summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKe Qinghua <qinghua.ke@freescale.com>2014-07-01 14:00:56 +0800
committerKe Qinghua <qinghua.ke@freescale.com>2014-07-01 14:01:38 +0800
commit35023c2a3511facf151e8a81a2f7504fda0231ad (patch)
tree5b1db94cbbb270a81e5287a4af95d152c5cdec50 /arch
parentd5800fcb9c0a07366c920414326ecb61d362b7b1 (diff)
ENGR00319937 Enable android feature for linux kernel 3.10.y
Fix SL EVK csi_id missing crash issue Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6sl-evk-common.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sl-evk-common.dtsi b/arch/arm/boot/dts/imx6sl-evk-common.dtsi
index 30eeeedc8f68..5191d9c8bbf1 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";
};