ARM: tegra: Add missing reset-names for Tegra HS UART

The device tree bindings for the Tegra high-speed UART require the
reset-names property, so add it whenever the compatible string for the
serial port is overwritten.

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

diff --git a/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2.dtsi
index 75cfe71..54b7da4 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2.dtsi
@@ -1557,16 +1557,19 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra124-apalis.dtsi b/arch/arm/boot/dts/nvidia/tegra124-apalis.dtsi
index 554c808..c5a0d6a 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra124-apalis.dtsi
@@ -1550,16 +1550,19 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts
index 00b62ed..f09109b 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts
@@ -1385,6 +1385,7 @@
         */
        serial@70006000 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
        };
@@ -1398,6 +1399,7 @@
         */
        serial@70006040 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
        };

diff --git a/arch/arm/boot/dts/nvidia/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/nvidia/tegra20-acer-a500-picasso.dts
index 08b4295..486fd24 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-acer-a500-picasso.dts
@@ -393,12 +393,14 @@
 
        uartb: serial@70006040 {
                compatible = "nvidia,tegra20-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                /* GPS BCM4751 */
        };
 
        uartc: serial@70006200 {
                compatible = "nvidia,tegra20-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                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 494d2d0..a3757b7 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts
@@ -450,12 +450,14 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra20-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                /* GPS BCM4751 */
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra20-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
 

diff --git a/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi b/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi
index 0e03910..16b374e 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi
@@ -453,11 +453,13 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra20-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra20-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi
index a4b7fe5..1640763 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi
@@ -829,16 +829,19 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-apalis.dtsi b/arch/arm/boot/dts/nvidia/tegra30-apalis.dtsi
index d731038..3b6fad2 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra30-apalis.dtsi
@@ -820,16 +820,19 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi
index c006235..4fa6b20 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi
@@ -798,12 +798,14 @@
 
        uartb: serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                /* GPS BCM4751 */
        };
 
        uartc: serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi
index bdb898a..ead9530 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi
@@ -1088,6 +1088,7 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
 
@@ -1096,6 +1097,7 @@
 
        serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi b/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi
index caefa7c..0120859 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi
@@ -177,6 +177,7 @@
 
        serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
        };

diff --git a/arch/arm/boot/dts/nvidia/tegra30-colibri.dtsi b/arch/arm/boot/dts/nvidia/tegra30-colibri.dtsi
index ed6106f..4eb526f 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/nvidia/tegra30-colibri.dtsi
@@ -710,11 +710,13 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
        };
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-ouya.dts b/arch/arm/boot/dts/nvidia/tegra30-ouya.dts
index e330990..7e3de26 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-ouya.dts
+++ b/arch/arm/boot/dts/nvidia/tegra30-ouya.dts
@@ -2004,6 +2004,7 @@
 
        uartc: serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
 

diff --git a/arch/arm/boot/dts/nvidia/tegra30-pegatron-chagall.dts b/arch/arm/boot/dts/nvidia/tegra30-pegatron-chagall.dts
index 8d10eb8..c81d587 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra30-pegatron-chagall.dts
+++ b/arch/arm/boot/dts/nvidia/tegra30-pegatron-chagall.dts
@@ -1110,6 +1110,7 @@
 
        uartb: serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";
 
@@ -1118,6 +1119,7 @@
 
        uartc: serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               reset-names = "serial";
                /delete-property/ reg-shift;
                status = "okay";