Merge remote-tracking branch 'powerpc/next'

[karo-tx-linux.git] / arch / arm / boot / dts / bcm-cygnus.dtsi

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 33ec6a51e45db0e0b6dc5a8ed39d7ff939c862f9..2778533502d9b7fcfdc1ac4ef074fafdd274c012 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -32,6 +32,7 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/clock/bcm-cygnus.h>
 
 #include "skeleton.dtsi"
 
@@ -40,10 +41,6 @@
        model = "Broadcom Cygnus SoC";
        interrupt-parent = <&gic>;
 
-       aliases {
-               serial0 = &uart3;
-       };
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -233,8 +230,7 @@
                };
 
                nand: nand@18046000 {
-                       compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
-                                    "brcm,brcmnand";
+                       compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x18046000 0x600>, <0xf8105408 0x600>,
                              <0x18046f00 0x20>;
                        reg-names = "nand", "iproc-idm", "iproc-ext";
@@ -257,5 +253,14 @@
                        interrupt-controller;
                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
                };
+
+               touchscreen: tsc@180a6000 {
+                       compatible = "brcm,iproc-touchscreen";
+                       reg = <0x180a6000 0x40>;
+                       clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>;
+                       clock-names = "tsc_clk";
+                       interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
        };
 };