]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: imx25: Add TSC and ADC support
authorDenis Carikli <denis@eukrea.com>
Mon, 14 Dec 2015 13:53:53 +0000 (14:53 +0100)
committerShawn Guo <shawnguo@kernel.org>
Mon, 29 Feb 2016 08:17:28 +0000 (16:17 +0800)
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx25.dtsi

index cde329e9b9e3fcf2e7a9fb477f12ca14d9818774..a482cdc3da5cd83195cd1dfc1f633afbb746b82a 100644 (file)
@@ -269,13 +269,36 @@ uart5: serial@5002c000 {
                                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 {