Merge branch 'drm-rockchip-next-fixes-2016-03-28' of https://github.com/markyzq/kerne...

[cascardo/linux.git] / arch / arm / boot / dts / imx25.dtsi

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index cde329e..6b1f4bb 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -269,13 +269,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 {
@@ -497,7 +520,8 @@
                                compatible = "fsl,imx25-usb", "fsl,imx27-usb";
                                reg = <0x53ff4000 0x0200>;
                                interrupts = <37>;
-                               clocks = <&clks 70>;
+                               clocks = <&clks 9>, <&clks 70>, <&clks 8>;
+                               clock-names = "ipg", "ahb", "per";
                                fsl,usbmisc = <&usbmisc 0>;
                                fsl,usbphy = <&usbphy0>;
                                status = "disabled";
@@ -507,7 +531,8 @@
                                compatible = "fsl,imx25-usb", "fsl,imx27-usb";
                                reg = <0x53ff4400 0x0200>;
                                interrupts = <35>;
-                               clocks = <&clks 70>;
+                               clocks = <&clks 9>, <&clks 70>, <&clks 8>;
+                               clock-names = "ipg", "ahb", "per";
                                fsl,usbmisc = <&usbmisc 1>;
                                fsl,usbphy = <&usbphy1>;
                                status = "disabled";
@@ -516,8 +541,6 @@
                        usbmisc: usbmisc@53ff4600 {
                                #index-cells = <1>;
                                compatible = "fsl,imx25-usbmisc";
-                               clocks = <&clks 9>, <&clks 70>, <&clks 8>;
-                               clock-names = "ipg", "ahb", "per";
                                reg = <0x53ff4600 0x00f>;
                        };