aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorSandor Yu <R01008@freescale.com>2014-07-03 05:47:34 -0400
committerSandor Yu <R01008@freescale.com>2014-07-03 07:09:46 -0400
commit81585f8a2b299eec47c20c92cc352accba0f3bdb (patch)
tree73322f51b9db3c8053a4863a23df3ea7ddc710da /arch/arm/boot
parent4dd14a653910662ca31544a38b1553f10e96fbb2 (diff)
ENGR00321114 dts: Recpvery gpr item in vadc dts item
Gpr item is remove from vadc dts by dcic patch incorrectly. It should add back, otherwise vadc driver can not initialized. Signed-off-by: Sandor Yu <R01008@freescale.com> (cherry picked from commit f24c5f76c18745c3b6b7562a873dedf0d4a3c321)
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 1da492574901..cf30d3df1471 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1163,6 +1163,7 @@
1163 clocks = <&clks IMX6SX_CLK_VADC>, 1163 clocks = <&clks IMX6SX_CLK_VADC>,
1164 <&clks IMX6SX_CLK_CSI>; 1164 <&clks IMX6SX_CLK_CSI>;
1165 clock-names = "vadc", "csi"; 1165 clock-names = "vadc", "csi";
1166 gpr = <&gpr>;
1166 csi_id = <0>; 1167 csi_id = <0>;
1167 status = "disabled"; 1168 status = "disabled";
1168 }; 1169 };