ARM: tegra: update DT files to add DMA properties

This patch switches the Tegra DT files to use the standard DMA DT bindings
rather than custom properties. Note that the legacy properties are not yet
removed; the drivers must be updated to use the new properties first.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index c40dbdcb37416f93cf77d34ebadf815df3d6310a..b4f2e62909a7ad410ea793985549ab3d7e40c345 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -84,6 +84,7 @@ apbdma: dma {
                clocks = <&tegra_car TEGRA114_CLK_APBDMA>;
                resets = <&tegra_car 34>;
                reset-names = "dma";
+               #dma-cells = <1>;
        };
 
        ahb: ahb {
@@ -131,6 +132,8 @@ uarta: serial@70006000 {
                clocks = <&tegra_car TEGRA114_CLK_UARTA>;
                resets = <&tegra_car 6>;
                reset-names = "serial";
+               dmas = <&apbdma 8>, <&apbdma 8>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -143,6 +146,8 @@ uartb: serial@70006040 {
                clocks = <&tegra_car TEGRA114_CLK_UARTB>;
                resets = <&tegra_car 7>;
                reset-names = "serial";
+               dmas = <&apbdma 9>, <&apbdma 9>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -155,6 +160,8 @@ uartc: serial@70006200 {
                clocks = <&tegra_car TEGRA114_CLK_UARTC>;
                resets = <&tegra_car 55>;
                reset-names = "serial";
+               dmas = <&apbdma 10>, <&apbdma 10>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -167,6 +174,8 @@ uartd: serial@70006300 {
                clocks = <&tegra_car TEGRA114_CLK_UARTD>;
                resets = <&tegra_car 65>;
                reset-names = "serial";
+               dmas = <&apbdma 19>, <&apbdma 19>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -190,6 +199,8 @@ i2c@7000c000 {
                clock-names = "div-clk";
                resets = <&tegra_car 12>;
                reset-names = "i2c";
+               dmas = <&apbdma 21>, <&apbdma 21>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -203,6 +214,8 @@ i2c@7000c400 {
                clock-names = "div-clk";
                resets = <&tegra_car 54>;
                reset-names = "i2c";
+               dmas = <&apbdma 22>, <&apbdma 22>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -216,6 +229,8 @@ i2c@7000c500 {
                clock-names = "div-clk";
                resets = <&tegra_car 67>;
                reset-names = "i2c";
+               dmas = <&apbdma 23>, <&apbdma 23>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -229,6 +244,8 @@ i2c@7000c700 {
                clock-names = "div-clk";
                resets = <&tegra_car 103>;
                reset-names = "i2c";
+               dmas = <&apbdma 26>, <&apbdma 26>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -242,6 +259,8 @@ i2c@7000d000 {
                clock-names = "div-clk";
                resets = <&tegra_car 47>;
                reset-names = "i2c";
+               dmas = <&apbdma 24>, <&apbdma 24>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -256,6 +275,8 @@ spi@7000d400 {
                clock-names = "spi";
                resets = <&tegra_car 41>;
                reset-names = "spi";
+               dmas = <&apbdma 15>, <&apbdma 15>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -270,6 +291,8 @@ spi@7000d600 {
                clock-names = "spi";
                resets = <&tegra_car 44>;
                reset-names = "spi";
+               dmas = <&apbdma 16>, <&apbdma 16>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -284,6 +307,8 @@ spi@7000d800 {
                clock-names = "spi";
                resets = <&tegra_car 46>;
                reset-names = "spi";
+               dmas = <&apbdma 17>, <&apbdma 17>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -298,6 +323,8 @@ spi@7000da00 {
                clock-names = "spi";
                resets = <&tegra_car 68>;
                reset-names = "spi";
+               dmas = <&apbdma 18>, <&apbdma 18>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -312,6 +339,8 @@ spi@7000dc00 {
                clock-names = "spi";
                resets = <&tegra_car 104>;
                reset-names = "spi";
+               dmas = <&apbdma 27>, <&apbdma 27>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -326,6 +355,8 @@ spi@7000de00 {
                clock-names = "spi";
                resets = <&tegra_car 105>;
                reset-names = "spi";
+               dmas = <&apbdma 28>, <&apbdma 28>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -406,6 +437,20 @@ ahub {
                reset-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2",
                              "i2s3", "i2s4", "dam0", "dam1", "dam2",
                              "spdif", "amx", "adx";
+               dmas = <&apbdma 1>, <&apbdma 1>,
+                      <&apbdma 2>, <&apbdma 2>,
+                      <&apbdma 3>, <&apbdma 3>,
+                      <&apbdma 4>, <&apbdma 4>,
+                      <&apbdma 6>, <&apbdma 6>,
+                      <&apbdma 7>, <&apbdma 7>,
+                      <&apbdma 12>, <&apbdma 12>,
+                      <&apbdma 13>, <&apbdma 13>,
+                      <&apbdma 14>, <&apbdma 14>,
+                      <&apbdma 29>, <&apbdma 29>;
+               dma-names = "rx0", "tx0", "rx1", "tx1", "rx2", "tx2",
+                           "rx3", "tx3", "rx4", "tx4", "rx5", "tx5",
+                           "rx6", "tx6", "rx7", "tx7", "rx8", "tx8",
+                           "rx9", "tx9";
                ranges;
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index f21b0416c547d33c7b22ef57ea18c653a23c6693..437793067ad303c2abbff811d265e396340a88a5 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -207,6 +207,7 @@ apbdma: dma {
                clocks = <&tegra_car TEGRA20_CLK_APBDMA>;
                resets = <&tegra_car 34>;
                reset-names = "dma";
+               #dma-cells = <1>;
        };
 
        ahb {
@@ -251,6 +252,8 @@ tegra_ac97: ac97 {
                clocks = <&tegra_car TEGRA20_CLK_AC97>;
                resets = <&tegra_car 3>;
                reset-names = "ac97";
+               dmas = <&apbdma 12>, <&apbdma 12>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -262,6 +265,8 @@ tegra_i2s1: i2s@70002800 {
                clocks = <&tegra_car TEGRA20_CLK_I2S1>;
                resets = <&tegra_car 11>;
                reset-names = "i2s";
+               dmas = <&apbdma 2>, <&apbdma 2>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -273,6 +278,8 @@ tegra_i2s2: i2s@70002a00 {
                clocks = <&tegra_car TEGRA20_CLK_I2S2>;
                resets = <&tegra_car 18>;
                reset-names = "i2s";
+               dmas = <&apbdma 1>, <&apbdma 1>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -292,6 +299,8 @@ uarta: serial@70006000 {
                clocks = <&tegra_car TEGRA20_CLK_UARTA>;
                resets = <&tegra_car 6>;
                reset-names = "serial";
+               dmas = <&apbdma 8>, <&apbdma 8>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -304,6 +313,8 @@ uartb: serial@70006040 {
                clocks = <&tegra_car TEGRA20_CLK_UARTB>;
                resets = <&tegra_car 7>;
                reset-names = "serial";
+               dmas = <&apbdma 9>, <&apbdma 9>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -316,6 +327,8 @@ uartc: serial@70006200 {
                clocks = <&tegra_car TEGRA20_CLK_UARTC>;
                resets = <&tegra_car 55>;
                reset-names = "serial";
+               dmas = <&apbdma 10>, <&apbdma 10>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -328,6 +341,8 @@ uartd: serial@70006300 {
                clocks = <&tegra_car TEGRA20_CLK_UARTD>;
                resets = <&tegra_car 65>;
                reset-names = "serial";
+               dmas = <&apbdma 19>, <&apbdma 19>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -340,6 +355,8 @@ uarte: serial@70006400 {
                clocks = <&tegra_car TEGRA20_CLK_UARTE>;
                resets = <&tegra_car 66>;
                reset-names = "serial";
+               dmas = <&apbdma 20>, <&apbdma 20>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -371,6 +388,8 @@ i2c@7000c000 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 12>;
                reset-names = "i2c";
+               dmas = <&apbdma 21>, <&apbdma 21>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -384,6 +403,8 @@ spi@7000c380 {
                clocks = <&tegra_car TEGRA20_CLK_SPI>;
                resets = <&tegra_car 43>;
                reset-names = "spi";
+               dmas = <&apbdma 11>, <&apbdma 11>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -398,6 +419,8 @@ i2c@7000c400 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 54>;
                reset-names = "i2c";
+               dmas = <&apbdma 22>, <&apbdma 22>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -412,6 +435,8 @@ i2c@7000c500 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 67>;
                reset-names = "i2c";
+               dmas = <&apbdma 23>, <&apbdma 23>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -426,6 +451,8 @@ i2c@7000d000 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 47>;
                reset-names = "i2c";
+               dmas = <&apbdma 24>, <&apbdma 24>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -439,6 +466,8 @@ spi@7000d400 {
                clocks = <&tegra_car TEGRA20_CLK_SBC1>;
                resets = <&tegra_car 41>;
                reset-names = "spi";
+               dmas = <&apbdma 15>, <&apbdma 15>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -452,6 +481,8 @@ spi@7000d600 {
                clocks = <&tegra_car TEGRA20_CLK_SBC2>;
                resets = <&tegra_car 44>;
                reset-names = "spi";
+               dmas = <&apbdma 16>, <&apbdma 16>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -465,6 +496,8 @@ spi@7000d800 {
                clocks = <&tegra_car TEGRA20_CLK_SBC3>;
                resets = <&tegra_car 46>;
                reset-names = "spi";
+               dmas = <&apbdma 17>, <&apbdma 17>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -478,6 +511,8 @@ spi@7000da00 {
                clocks = <&tegra_car TEGRA20_CLK_SBC4>;
                resets = <&tegra_car 68>;
                reset-names = "spi";
+               dmas = <&apbdma 18>, <&apbdma 18>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 1e1a0171c87c34e6f0b59a9b2a966a411fd9fc81..bf2602b87a79c5643ca68bd1857f75d141d569cc 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -302,6 +302,7 @@ apbdma: dma {
                clocks = <&tegra_car TEGRA30_CLK_APBDMA>;
                resets = <&tegra_car 34>;
                reset-names = "dma";
+               #dma-cells = <1>;
        };
 
        ahb: ahb {
@@ -349,6 +350,8 @@ uarta: serial@70006000 {
                clocks = <&tegra_car TEGRA30_CLK_UARTA>;
                resets = <&tegra_car 6>;
                reset-names = "serial";
+               dmas = <&apbdma 8>, <&apbdma 8>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -361,6 +364,8 @@ uartb: serial@70006040 {
                clocks = <&tegra_car TEGRA30_CLK_UARTB>;
                resets = <&tegra_car 7>;
                reset-names = "serial";
+               dmas = <&apbdma 9>, <&apbdma 9>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -373,6 +378,8 @@ uartc: serial@70006200 {
                clocks = <&tegra_car TEGRA30_CLK_UARTC>;
                resets = <&tegra_car 55>;
                reset-names = "serial";
+               dmas = <&apbdma 10>, <&apbdma 10>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -385,6 +392,8 @@ uartd: serial@70006300 {
                clocks = <&tegra_car TEGRA30_CLK_UARTD>;
                resets = <&tegra_car 65>;
                reset-names = "serial";
+               dmas = <&apbdma 19>, <&apbdma 19>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -397,6 +406,8 @@ uarte: serial@70006400 {
                clocks = <&tegra_car TEGRA30_CLK_UARTE>;
                resets = <&tegra_car 66>;
                reset-names = "serial";
+               dmas = <&apbdma 20>, <&apbdma 20>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -428,6 +439,8 @@ i2c@7000c000 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 12>;
                reset-names = "i2c";
+               dmas = <&apbdma 21>, <&apbdma 21>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -442,6 +455,8 @@ i2c@7000c400 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 54>;
                reset-names = "i2c";
+               dmas = <&apbdma 22>, <&apbdma 22>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -456,6 +471,8 @@ i2c@7000c500 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 67>;
                reset-names = "i2c";
+               dmas = <&apbdma 23>, <&apbdma 23>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -470,6 +487,8 @@ i2c@7000c700 {
                resets = <&tegra_car 103>;
                reset-names = "i2c";
                clock-names = "div-clk", "fast-clk";
+               dmas = <&apbdma 26>, <&apbdma 26>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -484,6 +503,8 @@ i2c@7000d000 {
                clock-names = "div-clk", "fast-clk";
                resets = <&tegra_car 47>;
                reset-names = "i2c";
+               dmas = <&apbdma 24>, <&apbdma 24>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -497,6 +518,8 @@ spi@7000d400 {
                clocks = <&tegra_car TEGRA30_CLK_SBC1>;
                resets = <&tegra_car 41>;
                reset-names = "spi";
+               dmas = <&apbdma 15>, <&apbdma 15>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -510,6 +533,8 @@ spi@7000d600 {
                clocks = <&tegra_car TEGRA30_CLK_SBC2>;
                resets = <&tegra_car 44>;
                reset-names = "spi";
+               dmas = <&apbdma 16>, <&apbdma 16>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -523,6 +548,8 @@ spi@7000d800 {
                clocks = <&tegra_car TEGRA30_CLK_SBC3>;
                resets = <&tegra_car 46>;
                reset-names = "spi";
+               dmas = <&apbdma 17>, <&apbdma 17>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -536,6 +563,8 @@ spi@7000da00 {
                clocks = <&tegra_car TEGRA30_CLK_SBC4>;
                resets = <&tegra_car 68>;
                reset-names = "spi";
+               dmas = <&apbdma 18>, <&apbdma 18>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -549,6 +578,8 @@ spi@7000dc00 {
                clocks = <&tegra_car TEGRA30_CLK_SBC5>;
                resets = <&tegra_car 104>;
                reset-names = "spi";
+               dmas = <&apbdma 27>, <&apbdma 27>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -562,6 +593,8 @@ spi@7000de00 {
                clocks = <&tegra_car TEGRA30_CLK_SBC6>;
                resets = <&tegra_car 106>;
                reset-names = "spi";
+               dmas = <&apbdma 28>, <&apbdma 28>;
+               dma-names = "rx", "tx";
                status = "disabled";
        };
 
@@ -635,6 +668,12 @@ ahub {
                reset-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2",
                              "i2s3", "i2s4", "dam0", "dam1", "dam2",
                              "spdif";
+               dmas = <&apbdma 1>, <&apbdma 1>,
+                      <&apbdma 2>, <&apbdma 2>,
+                      <&apbdma 3>, <&apbdma 3>,
+                      <&apbdma 4>, <&apbdma 4>;
+               dma-names = "rx0", "tx0", "rx1", "tx1", "rx2", "tx2",
+                           "rx3", "tx3";
                ranges;
                #address-cells = <1>;
                #size-cells = <1>;