arm: dts: pxa3xx: Add ssp ports to pxa3xx device tree

Also fix the documentation for these bindings.

The DMA properties have to be passed in the ssp users for now.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

diff --git a/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt b/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt
index 74c9ba6..efd3fb1 100644 (file)
--- a/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt
+++ b/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt
@@ -9,20 +9,18 @@ Example:
 
        /* upstream device */
 
-       ssp0: ssp@41000000 {
+       ssp1: ssp@41000000 {
                compatible = "mrvl,pxa3xx-ssp";
                reg = <0x41000000 0x40>;
                interrupts = <24>;
                clock-names = "pxa27x-ssp.0";
-               dmas = <&dma 13
-                       &dma 14>;
-               dma-names = "rx", "tx";
        };
 
        /* DAI as user */
 
        ssp_dai0: ssp_dai@0 {
                compatible = "mrvl,pxa-ssp-dai";
-               port = <&ssp0>;
+               port = <&ssp1>;
+               #sound-dai-cells = <0>;
        };
 

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 01b2af1..3a8f0ed 100644 (file)
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -243,6 +243,38 @@
                        clocks = <&clks CLK_PWM1>;
                        status = "disabled";
                };
+
+               ssp1: ssp@41000000 {
+                       compatible = "mrvl,pxa3xx-ssp";
+                       reg = <0x41000000 0x40>;
+                       interrupts = <24>;
+                       clocks = <&clks CLK_SSP1>;
+                       status = "disabled";
+               };
+
+               ssp2: ssp@41700000 {
+                       compatible = "mrvl,pxa3xx-ssp";
+                       reg = <0x41700000 0x40>;
+                       interrupts = <16>;
+                       clocks = <&clks CLK_SSP2>;
+                       status = "disabled";
+               };
+
+               ssp3: ssp@41900000 {
+                       compatible = "mrvl,pxa3xx-ssp";
+                       reg = <0x41900000 0x40>;
+                       interrupts = <0>;
+                       clocks = <&clks CLK_SSP3>;
+                       status = "disabled";
+               };
+
+               ssp4: ssp@41a00000 {
+                       compatible = "mrvl,pxa3xx-ssp";
+                       reg = <0x41a00000 0x40>;
+                       interrupts = <13>;
+                       clocks = <&clks CLK_SSP4>;
+                       status = "disabled";
+               };
        };
 
        clocks {