ARM: tegra: Remove dmas and dma-names for debug UART

The debug UART doesn't support DMA and the DT bindings prohibit the use
of the dmas and dma-names properties for it, so remove them.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts b/arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts
index 84a3eb38e71d2165f00d5c32189f4020f90e7541..763ab812eb87f7d499be6184742febb623bdbecc 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts
+++ b/arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts
@@ -271,6 +271,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra114-dalmore.dts b/arch/arm/boot/dts/nvidia/tegra114-dalmore.dts
index a685fcb129d009040cf10b6755d5d951320dcf3c..c06b52fe330a23866ae21d4038459e758648f7c6 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/nvidia/tegra114-dalmore.dts
@@ -755,6 +755,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra114-roth.dts b/arch/arm/boot/dts/nvidia/tegra114-roth.dts
index b9d00009d1f4a46845bc413371ab342b1c2a5a9a..a89b16573b4273209a45f307c4995bfdc3fdaa1c 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra114-roth.dts
+++ b/arch/arm/boot/dts/nvidia/tegra114-roth.dts
@@ -779,6 +779,8 @@
 
        /* Usable on reworked devices only */
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra114-tn7.dts b/arch/arm/boot/dts/nvidia/tegra114-tn7.dts
index f02d8c79eee76099dd9de4320ef2ad0e873e0845..bfbdb345575a546d8b24525e2e07b26ae8c5815f 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/nvidia/tegra114-tn7.dts
@@ -50,6 +50,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra124-apalis-eval.dts b/arch/arm/boot/dts/nvidia/tegra124-apalis-eval.dts
index 2df2d8a6b552d9ad9d9e4c9792f62241cb6b89d0..0f3debeb294b704cd81d790a8b21f3c46df9448a 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/nvidia/tegra124-apalis-eval.dts
@@ -52,6 +52,8 @@
 
        /* Apalis UART1 */
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2-eval.dts
index f4521fd15f6ad73e8306fa01c7803fa9c31a436a..d13b8d25ca6a9c9255d4ee2c12c7bdde535a8ae9 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2-eval.dts
@@ -53,6 +53,8 @@
 
        /* Apalis UART1 */
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts
index 4196f2401c90f14eabc266c9b8ce4918b177cc83..00b62ed243ec0b2ea122d482c6a6e6d9494aa50f 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts
@@ -1404,6 +1404,8 @@
 
        /* DB9 serial port */
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi b/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi
index 0c35ca2e91219d5fd076ae58fb575262455128a0..a2ee3718020048133d22faa74ac7e69ba45b01a7 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi
@@ -70,6 +70,8 @@
 
        serial@70006000 {
                /* Debug connector on the bottom of the board near SD card. */
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra124-venice2.dts b/arch/arm/boot/dts/nvidia/tegra124-venice2.dts
index c697301c443c236b28d5a68cc3f01abc2d434a6c..3924ee385dee0671054353d7d2ab5f42ccefa848 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/nvidia/tegra124-venice2.dts
@@ -609,6 +609,8 @@
        };
 
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts b/arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts
index c2a9c3fb5b3374373421234312969662290ca66e..494d2d07def38bbbbc9baf086efbe205c05a2862 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts
@@ -482,6 +482,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-colibri-eval-v3.dts b/arch/arm/boot/dts/nvidia/tegra20-colibri-eval-v3.dts
index 612f4e54cb2028e7fca5d9c7d287ca2db99e9566..be2ead4147f2449cc975165c049c3726d0304dc8 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-colibri-eval-v3.dts
@@ -102,6 +102,8 @@
 
        /* Colibri UART-A */
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-colibri-iris.dts b/arch/arm/boot/dts/nvidia/tegra20-colibri-iris.dts
index 25a9f5dfe62d00406f6de82b7fe491a84143b031..1da202ad1ded6c8805c7bbee2266c67f087fc17f 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-colibri-iris.dts
@@ -102,6 +102,8 @@
 
        /* Colibri UART-A */
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-harmony.dts b/arch/arm/boot/dts/nvidia/tegra20-harmony.dts
index 11f21aeba8e99b9035159a401b956186b8baf791..5c31a6c8dabe4d407b758cc889825f6fa70aabd7 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-harmony.dts
@@ -273,6 +273,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-paz00.dts b/arch/arm/boot/dts/nvidia/tegra20-paz00.dts
index e995f428dc2eae71389c80ff9005c7909f77eb8e..898b4ad3b42792e8cb267d56ca1c192f5a5d4ca9 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-paz00.dts
@@ -279,10 +279,14 @@
        };
 
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 
        serial@70006200 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-seaboard.dts b/arch/arm/boot/dts/nvidia/tegra20-seaboard.dts
index bd4ff8b40b208fbd918134f68e036a48ac0f5705..e944ae9b86c2a63afbd226a9a184c3202d51b2d4 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-seaboard.dts
@@ -324,6 +324,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-tamonten.dtsi b/arch/arm/boot/dts/nvidia/tegra20-tamonten.dtsi
index ddb84e4a9f8b69e9314dd6aed7a7dc65a3233269..5c214dd060bb3e92638b4f42e713e5fce64fc0a3 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra20-tamonten.dtsi
@@ -288,6 +288,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-trimslice.dts b/arch/arm/boot/dts/nvidia/tegra20-trimslice.dts
index 1944121e2dd6b713d4e8877f5ac1982477764ac2..7cae6ad5754469893079fb3ebf8357f83fca4135 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-trimslice.dts
@@ -276,6 +276,8 @@
        };
 
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-ventana.dts b/arch/arm/boot/dts/nvidia/tegra20-ventana.dts
index 433575a6ad38fe7a6c8e30ee080e1d4fec873738..f3273941437cd387282250e39c73bdc8aca7f32b 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-ventana.dts
@@ -323,6 +323,8 @@
        };
 
        serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-apalis-eval.dts b/arch/arm/boot/dts/nvidia/tegra30-apalis-eval.dts
index 842b5faba2856466956ce48db180e97943f0525a..fc284155cd764c40c76e192deb18316a5b7f52ea 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/nvidia/tegra30-apalis-eval.dts
@@ -59,6 +59,8 @@
 
        /* Apalis UART1 */
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1-eval.dts b/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1-eval.dts
index ca277bf1df7840ba0a280fefe218a0e1469e4a55..9d08e2b094b415bbca76764df55f4a30ce27edb5 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1-eval.dts
+++ b/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1-eval.dts
@@ -60,6 +60,8 @@
 
        /* Apalis UART1 */
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-beaver.dts b/arch/arm/boot/dts/nvidia/tegra30-beaver.dts
index 51769d5132aec4f10bba7654b68726303ee7958d..1d74179dde79c9059f05253e609489b473a19d91 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/nvidia/tegra30-beaver.dts
@@ -1733,6 +1733,8 @@
        };
 
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi b/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi
index 37a9c5a0ca30344631d5e39c6dcee82e3d0cd31e..caefa7c2adda9a9f8292a5e988d24f4e0cee2310 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi
@@ -170,6 +170,8 @@
        };
 
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/nvidia/tegra30-colibri-eval-v3.dts
index 36615c5fda2cb89599ed8b7ac33e526b02b8c600..1990bf8e122d8962dc03983d10d08fe487206fab 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/nvidia/tegra30-colibri-eval-v3.dts
@@ -38,6 +38,8 @@
 
        /* Colibri UART-A */
        serial@70006000 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-ouya.dts b/arch/arm/boot/dts/nvidia/tegra30-ouya.dts
index eef27c82987b336848dc00b064f0c58596546057..e3309908b1ca0a57665daa14ed88d306bf030b1e 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-ouya.dts
+++ b/arch/arm/boot/dts/nvidia/tegra30-ouya.dts
@@ -2033,6 +2033,8 @@
        };
 
        uartd: serial@70006300 {
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
                status = "okay";
        };