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 75cfe718737cda68de0f8e0216a8c3fa13754d68..54b7da4b692006fd84189e40979a15ba8af7bbe8 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 554c8089491c95d323d26396cf6b096bb5893817..c5a0d6aebaecd7763d6c016a0651dea68d5e591b 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 00b62ed243ec0b2ea122d482c6a6e6d9494aa50f..f09109be1152e84d928d2563c4cf4f0fc310beda 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 08b42952f4de39530f9abc502e8948c4adb43443..486fd244291ebee8fbc3d30fa20c41e582ba5852 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 494d2d07def38bbbbc9baf086efbe205c05a2862..a3757b7daeda4907f64b73f8cd9bcc0961abeae2 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 0e03910abbe6406a62a3a94b4a36b7c641d68d98..16b374e6482f5194d3fdf0d5a8c7a6bb5f2ca9e8 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 a4b7fe5c3d2369dd2403ebfe05eac3093b5ad6cc..1640763fd4af2216c225b95e60e954afd5255fb5 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 d731038840008c87df6f72ac736e49d6ef69e7da..3b6fad273cabf17a6ddff7ede1d72de13079ed1f 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 c0062353c1f192980a27217ab1d3ffa9abf8c5ec..4fa6b20c4fdb373cf4540eae3abe85d55a6c8264 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 bdb898ad626229943ab8bfa94702d1ded424de1c..ead95306840f7e34956e6546a5ae1796002a8b02 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 caefa7c2adda9a9f8292a5e988d24f4e0cee2310..0120859d6d72bbd35c2f3211d597fd247d39d214 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 ed6106f1bea115a38244062f61cf977447c88a76..4eb526fe9c55888d6a595d68d3a95616bb913404 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 e3309908b1ca0a57665daa14ed88d306bf030b1e..7e3de26ca960d2168ca6c4710a5109c1583720a6 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 8d10eb8b48b9522aa5bbc51a279442da11a04909..c81d5875c31ca6eb5c5de641064b520c2e29cc44 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";