Merge tag 'uapi-20121219' into for-linus

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / spear1340.dtsi

diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index 6c09eb0a1b2bbad90683f7311c14f052a2e21ac7..34da11aa679504616359ec759568d31160eb829a 100644 (file)
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -17,6 +17,20 @@
        compatible = "st,spear1340";
 
        ahb {
+
+               spics: spics@e0700000{
+                       compatible = "st,spear-spics-gpio";
+                       reg = <0xe0700000 0x1000>;
+                       st-spics,peripcfg-reg = <0x42c>;
+                       st-spics,sw-enable-bit = <21>;
+                       st-spics,cs-value-bit = <20>;
+                       st-spics,cs-enable-mask = <3>;
+                       st-spics,cs-enable-shift = <18>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       status = "disabled";
+               };
+
                ahci@b1000000 {
                        compatible = "snps,spear-ahci";
                        reg = <0xb1000000 0x10000>;
@@ -24,15 +38,61 @@
                        status = "disabled";
                };
 
+               i2s-play@b2400000 {
+                       compatible = "snps,designware-i2s";
+                       reg = <0xb2400000 0x10000>;
+                       interrupt-names = "play_irq";
+                       interrupts = <0 98 0x4
+                                     0 99 0x4>;
+                       play;
+                       channel = <8>;
+                       status = "disabled";
+               };
+
+               i2s-rec@b2000000 {
+                       compatible = "snps,designware-i2s";
+                       reg = <0xb2000000 0x10000>;
+                       interrupt-names = "record_irq";
+                       interrupts = <0 100  0x4
+                                     0 101 0x4>;
+                       record;
+                       channel = <8>;
+                       status = "disabled";
+               };
+
                pinmux: pinmux@e0700000 {
                        compatible = "st,spear1340-pinmux";
                        reg = <0xe0700000 0x1000>;
                        #gpio-range-cells = <2>;
                };
 
+               pwm: pwm@e0180000 {
+                       compatible ="st,spear13xx-pwm";
+                       reg = <0xe0180000 0x1000>;
+                       #pwm-cells = <2>;
+                       status = "disabled";
+               };
+
+               spdif-in@d0100000 {
+                       compatible = "st,spdif-in";
+                       reg = < 0xd0100000 0x20000
+                               0xd0110000 0x10000 >;
+                       interrupts = <0 84 0x4>;
+                       status = "disabled";
+               };
+
+               spdif-out@d0000000 {
+                       compatible = "st,spdif-out";
+                       reg = <0xd0000000 0x20000>;
+                       interrupts = <0 85 0x4>;
+                       status = "disabled";
+               };
+
                spi1: spi@5d400000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0x5d400000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <0 99 0x4>;
                        status = "disabled";
                };
@@ -44,6 +104,7 @@
                                compatible = "snps,designware-i2c";
                                reg = <0xb4000000 0x1000>;
                                interrupts = <0 104 0x4>;
+                               write-16bit;
                                status = "disabled";
                        };