diff options
author | Robby Cai <R63905@freescale.com> | 2014-03-27 06:41:01 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:58:09 -0400 |
commit | 75031ed93ee37b048d28785eedec7c2bc4da86fe (patch) | |
tree | f4dda33878e0a2f59dadee5f11e2a14e1037378b /arch/arm/boot | |
parent | d36e6365640d41b6c29f42ac944e210eb25cf0e3 (diff) |
ENGR00305598-3 ARM: dts: imx6sx: add csi and v4l2 capture support
Add csi camera support and csi v4l2 capture support on i.MX6SX 19x19 ARM2 board.
Since MX6SX_PAD_LCD1_ENABLE pin is shared between CSI and LCDIF1. LCDIF1 is
disabled by default.
Signed-off-by: Robby Cai <R63905@freescale.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx6sx-19x19-arm2.dts | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts index abb4f3f11b38..2aac6f7bbb3e 100644 --- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts | |||
@@ -21,6 +21,11 @@ | |||
21 | default-brightness-level = <6>; | 21 | default-brightness-level = <6>; |
22 | }; | 22 | }; |
23 | 23 | ||
24 | csi1_v4l2_cap { | ||
25 | compatible = "fsl,imx6sx-csi-v4l2", "fsl,imx6sl-csi-v4l2"; | ||
26 | status = "okay"; | ||
27 | }; | ||
28 | |||
24 | hannstar_cabc { | 29 | hannstar_cabc { |
25 | compatible = "hannstar,cabc"; | 30 | compatible = "hannstar,cabc"; |
26 | 31 | ||
@@ -59,6 +64,10 @@ | |||
59 | }; | 64 | }; |
60 | }; | 65 | }; |
61 | 66 | ||
67 | &csi1 { | ||
68 | status = "okay"; | ||
69 | }; | ||
70 | |||
62 | &fec1 { | 71 | &fec1 { |
63 | pinctrl-names = "default"; | 72 | pinctrl-names = "default"; |
64 | pinctrl-0 = <&pinctrl_enet1_1>; | 73 | pinctrl-0 = <&pinctrl_enet1_1>; |
@@ -268,7 +277,7 @@ | |||
268 | pinctrl-0 = <&pinctrl_lcdif_dat_0 | 277 | pinctrl-0 = <&pinctrl_lcdif_dat_0 |
269 | &pinctrl_lcdif_ctrl_0>; | 278 | &pinctrl_lcdif_ctrl_0>; |
270 | display = <&display0>; | 279 | display = <&display0>; |
271 | status = "okay"; | 280 | status = "disabled"; |
272 | 281 | ||
273 | display0: display { | 282 | display0: display { |
274 | bits-per-pixel = <16>; | 283 | bits-per-pixel = <16>; |