aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorSandor Yu <R01008@freescale.com>2014-04-11 02:08:59 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-17 22:19:13 -0400
commit8544fda7fcf451bdfbd24e8f789c27d36a87c758 (patch)
tree0e681107ed87bb2de0297a0c1aec0391a1705339 /arch/arm/boot
parent2ba585a2f1105195897d17c061fcb0106be5fc30 (diff)
ENGR00307014-07 ARM: DTS: Add vadc driver in imx6sx dts
Add vadc item in imx6sx.dtsi and enable it in 19x19 arm2 and sdb board. Signed-off-by: Sandor Yu <R01008@freescale.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6sx-19x19-arm2.dts6
-rw-r--r--arch/arm/boot/dts/imx6sx-sdb.dts6
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi12
3 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index 505bcbfbc07c..8b8db3028544 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -497,3 +497,9 @@
497 0x0000c000 0x1404a38e 0x00000000>; 497 0x0000c000 0x1404a38e 0x00000000>;
498 }; 498 };
499}; 499};
500
501&vadc {
502 vadc_in = <0>;
503 csi_id = <0>;
504 status = "okay";
505};
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 84e1ec52b62f..10e95064ab62 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -620,3 +620,9 @@
620 reg = <1>; 620 reg = <1>;
621 }; 621 };
622}; 622};
623
624&vadc {
625 vadc_in = <0>;
626 csi_id = <0>;
627 status = "okay";
628};
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index ec4167834831..140fbcb4ea74 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1056,6 +1056,18 @@
1056 status = "disabled"; 1056 status = "disabled";
1057 }; 1057 };
1058 1058
1059 vadc: vadc@02228000 {
1060 compatible = "fsl,imx6sx-vadc";
1061 reg = <0x02228000 0x4000>, <0x0222c000 0x4000>;
1062 reg-names = "vadc-vafe", "vadc-vdec";
1063 clocks = <&clks IMX6SX_CLK_VADC>,
1064 <&clks IMX6SX_CLK_CSI>;
1065 clock-names = "vadc", "csi";
1066 gpr = <&gpr>;
1067 csi_id = <0>;
1068 status = "disabled";
1069 };
1070
1059 spba@0223c000 { 1071 spba@0223c000 {
1060 reg = <0x0223c000 0x4000>; 1072 reg = <0x0223c000 0x4000>;
1061 }; 1073 };