ARM: tegra: transformer: 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: Svyatoslav Ryhel <clamor95@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra20-asus-tf101.dts b/arch/arm/boot/dts/tegra20-asus-tf101.dts
index 37e90bd8df95de0174b383dd947d3b162898f79c..a054d39db466e9a361b3cc9e3ced43e87a73f06c 100644 (file)
--- a/arch/arm/boot/dts/tegra20-asus-tf101.dts
+++ b/arch/arm/boot/dts/tegra20-asus-tf101.dts
@@ -450,11 +450,13 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra20-hsuart";
+               /delete-property/ reg-shift;
                /* GPS BCM4751 */
        };
 
        serial@70006200 {
                compatible = "nvidia,tegra20-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
 
                /* Azurewave AW-NH615 BCM4329B1 */

diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
index 85b43a86a26d98dfe02f291bd3ec3c8d6a4153fa..c662ab261ed5f92a90dbf1f6a3ea500f25f1d901 100644 (file)
--- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
@@ -1080,6 +1080,7 @@
 
        serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
 
                /* Broadcom GPS BCM47511 */
@@ -1087,6 +1088,7 @@
 
        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-pegatron-chagall.dts b/arch/arm/boot/dts/tegra30-pegatron-chagall.dts
index f4b2d4218849c4c2265fbd664b3882f5ebc7be55..8ce61035290b529f753270727f6d7a9d73a4ff67 100644 (file)
--- a/arch/arm/boot/dts/tegra30-pegatron-chagall.dts
+++ b/arch/arm/boot/dts/tegra30-pegatron-chagall.dts
@@ -1103,6 +1103,7 @@
 
        uartb: serial@70006040 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
 
                /* Broadcom GPS BCM47511 */
@@ -1110,6 +1111,7 @@
 
        uartc: serial@70006200 {
                compatible = "nvidia,tegra30-hsuart";
+               /delete-property/ reg-shift;
                status = "okay";
 
                nvidia,adjust-baud-rates = <0 9600 100>,