From: Denis Carikli <de...@eukrea.com>

Signed-off-by: Denis Carikli <de...@eukrea.com>
Signed-off-by: Markus Pargmann <m...@pengutronix.de>
---
 arch/arm/boot/dts/imx25.dtsi | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 677f81d9dcd5..6ac5e71d312b 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -265,13 +265,36 @@
                                status = "disabled";
                        };
 
-                       tsc: tsc@50030000 {
-                               compatible = "fsl,imx25-adc", "fsl,imx21-tsc";
-                               reg = <0x50030000 0x4000>;
+                       tscadc: tscadc@50030000 {
+                               compatible = "fsl,imx25-tsadc";
+                               reg = <0x50030000 0xc>;
                                interrupts = <46>;
                                clocks = <&clks 119>;
                                clock-names = "ipg";
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                status = "disabled";
+
+                               adc: adc@50030800 {
+                                       compatible = "fsl,imx25-gcq";
+                                       reg = <0x50030800 0x60>;
+                                       interrupt-parent = <&tscadc>;
+                                       interrupts = <1>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       status = "disabled";
+                               };
+
+                               tsc: tcq@50030400 {
+                                       compatible = "fsl,imx25-tcq";
+                                       reg = <0x50030400 0x60>;
+                                       interrupt-parent = <&tscadc>;
+                                       interrupts = <0>;
+                                       fsl,wires = <4>;
+                                       status = "disabled";
+                               };
                        };
 
                        ssi1: ssi@50034000 {
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to