diff options
author | Robby Cai <r63905@freescale.com> | 2014-06-26 01:58:58 -0400 |
---|---|---|
committer | Robby Cai <r63905@freescale.com> | 2014-06-28 19:45:53 -0400 |
commit | d4478b9ab9feebbd2b3c663afedf9dfa9fe8526b (patch) | |
tree | b18066f98c2b67fe9cf22c7feba5d1fb28146dd4 /arch/arm/boot | |
parent | a50b6c8e53011c5290b7028903ff9329fea82c13 (diff) |
ENGR00320056-4 ARM: dts: imx6sx-19x19-arm2: Add CSI2 support
Add CSI2 support.
use CSI2 for VADC instead of CSI1.
Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit 9de447e3c715fa570c145bdd2e9692f59b0072a3)
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx6sx-19x19-arm2.dts | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts index 2d2687ad4d3a..131f330decfe 100644 --- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts | |||
@@ -23,6 +23,13 @@ | |||
23 | 23 | ||
24 | csi1_v4l2_cap { | 24 | csi1_v4l2_cap { |
25 | compatible = "fsl,imx6sx-csi-v4l2", "fsl,imx6sl-csi-v4l2"; | 25 | compatible = "fsl,imx6sx-csi-v4l2", "fsl,imx6sl-csi-v4l2"; |
26 | csi_id = <0>; | ||
27 | status = "okay"; | ||
28 | }; | ||
29 | |||
30 | csi2_v4l2_cap { | ||
31 | compatible = "fsl,imx6sx-csi-v4l2", "fsl,imx6sl-csi-v4l2"; | ||
32 | csi_id = <1>; | ||
26 | status = "okay"; | 33 | status = "okay"; |
27 | }; | 34 | }; |
28 | 35 | ||
@@ -99,6 +106,10 @@ | |||
99 | status = "okay"; | 106 | status = "okay"; |
100 | }; | 107 | }; |
101 | 108 | ||
109 | &csi2 { | ||
110 | status = "okay"; | ||
111 | }; | ||
112 | |||
102 | &fec1 { | 113 | &fec1 { |
103 | pinctrl-names = "default"; | 114 | pinctrl-names = "default"; |
104 | pinctrl-0 = <&pinctrl_enet1_1>; | 115 | pinctrl-0 = <&pinctrl_enet1_1>; |
@@ -492,6 +503,6 @@ | |||
492 | 503 | ||
493 | &vadc { | 504 | &vadc { |
494 | vadc_in = <0>; | 505 | vadc_in = <0>; |
495 | csi_id = <0>; | 506 | csi_id = <1>; |
496 | status = "okay"; | 507 | status = "okay"; |
497 | }; | 508 | }; |