ARM: tegra: Drop reg-shift for Tegra HS UART

When the Tegra High-Speed UART is used instead of the regular UART, the
reg-shift property is implied from the compatible string and should not
be explicitly listed.

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

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index f00ef4d08fd4096d49723b95809f374c2c92febf..b952b272afc000a28577d21b80333534fcc35fe9 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1539,14 +1539,17 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        hdmi_ddc: i2c@7000c700 {

diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index e6d25813b41638811846ba3283d74869ab350b68..2b1bb4382b42467467d308d8ed6c7f335cd04cbe 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1532,14 +1532,17 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        hdmi_ddc: i2c@7000c400 {

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index f42191f22c199d5ede4123875b1c4b9b15dba102..e805cb2e20f495775ea8e28a0110c4fe7960e24c 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1389,6 +1389,7 @@
         */
        serial@70006000 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
        };
 
@@ -1401,6 +1402,7 @@
         */
        serial@70006040 {
                compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
index 2e6340e92fe1c33754c8412a06cc564778c2bfa1..f973df0158c9f60122c3677fad97f749fec7d6ad 100644 (file)
--- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
@@ -382,11 +382,13 @@
 
        uartb: serial@70006040 {
                compatible = "nvidia,tegra20-hsuart";
+               /delete-property/ reg-shift;
                /* GPS BCM4751 */
        };
 
        uartc: serial@70006200 {
                compatible = "nvidia,tegra20-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
 
                /* Azurewave AW-NH665 BCM4329B1 */

diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index 80e439003a6d5cf3e1cb17b49e895981052a9325..6fed5706da794c10cec7635fcc3808de7ccceee9 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -428,10 +428,12 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra20-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra20-hsuart";
+               /delete-property/ reg-shift;
        };
 
        nand-controller@70008000 {

diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
index 6a3a72f81c44565beeba49ff8995f91a30415664..6fe775b2b38d904dd69b81bce5d38544098fedc3 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
@@ -829,14 +829,17 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        hdmi_ddc: i2c@7000c700 {

diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index b2ac51fb15b140745eaa812845cafabc66212f64..7df2841690d7ebc7b715d43b32724405ab35fa25 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -820,14 +820,17 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        hdmi_ddc: i2c@7000c700 {

diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index e6aed19a5f3bb7db250bb926ceb81f016d29c9ed..ab33ceb63fffb644364a6dd72cccbc69eb0a4d2c 100644 (file)
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -804,11 +804,13 @@
 
        uartb: serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
                /* GPS BCM4751 */
        };
 
        uartc: serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
 
                nvidia,adjust-baud-rates = <0 9600 100>,

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

diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index fcd3d26bef2d2ced22bef6d4492d31581ce9f936..b585831e32128cb8e2e043d348facf6908353844 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -701,10 +701,12 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        serial@70006300 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
        };
 
        hdmi_ddc: i2c@7000c700 {

diff --git a/arch/arm/boot/dts/tegra30-ouya.dts b/arch/arm/boot/dts/tegra30-ouya.dts
index 4259871b76c9f82b636994ec36b3db6f7ab051d2..2a6dc423b9fc529693a724118fb2e57aacd5b1a6 100644 (file)
--- a/arch/arm/boot/dts/tegra30-ouya.dts
+++ b/arch/arm/boot/dts/tegra30-ouya.dts
@@ -82,8 +82,9 @@
        };
 
        uartc: serial@70006200 {
-               status = "okay";
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
+               status = "okay";
 
                nvidia,adjust-baud-rates = <0 9600 100>,
                                           <9600 115200 200>,