From d22f6c3fab016056283dcf523f84c333919f30c4 Mon Sep 17 00:00:00 2001 From: Svyatoslav Ryhel Date: Tue, 18 Jan 2022 13:04:59 +0200 Subject: [PATCH 1/3] ARM: tegra: transformer: Drop reg-shift for Tegra HS UART Refer to 9ab9ecd83a3ecf269e8cda08233652203347f5f1. Signed-off-by: Svyatoslav Ryhel --- arch/arm/boot/dts/tegra20-asus-tf101.dts | 6 +++++- arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi | 2 ++ arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/tegra20-asus-tf101.dts b/arch/arm/boot/dts/tegra20-asus-tf101.dts index 21c5fd500bbe6..ff534051571c6 100644 --- a/arch/arm/boot/dts/tegra20-asus-tf101.dts +++ b/arch/arm/boot/dts/tegra20-asus-tf101.dts @@ -450,11 +450,15 @@ serial@70006040 { compatible = "nvidia,tegra20-hsuart"; - /* GPS BCM4751 */ + /delete-property/ reg-shift; + status = "okay"; + + /* Broadcom 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 76b72e708dbb1..eb699c32883e4 100644 --- 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 55e4a9c5aaf20..7f4340ff799d1 100644 --- 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>, From d44d8f9d110b8e5e8549ed6982fe1ca1fcfe7f00 Mon Sep 17 00:00:00 2001 From: Svyatoslav Ryhel Date: Tue, 18 Jan 2022 13:09:05 +0200 Subject: [PATCH 2/3] ARM: tegra: transformer: use labels for mmc in aliases Signed-off-by: Svyatoslav Ryhel --- arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi index eb699c32883e4..b7320c791ab20 100644 --- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi +++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi @@ -12,9 +12,9 @@ chassis-type = "convertible"; aliases { - mmc0 = "/mmc@78000600"; /* eMMC */ - mmc1 = "/mmc@78000000"; /* uSD slot */ - mmc2 = "/mmc@78000400"; /* WiFi */ + mmc0 = &sdmmc4; /* eMMC */ + mmc1 = &sdmmc1; /* uSD slot */ + mmc2 = &sdmmc3; /* WiFi */ rtc0 = &pmic; rtc1 = "/rtc@7000e000"; From 67609ff389a7a5073b0c97ef5038c5611db7b8c4 Mon Sep 17 00:00:00 2001 From: Svyatoslav Ryhel Date: Tue, 18 Jan 2022 13:18:48 +0200 Subject: [PATCH 3/3] ARM: tegra: transformer: add missing wifi reset gpio Signed-off-by: Svyatoslav Ryhel --- arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi index b7320c791ab20..d5c3c0fd1dc8e 100644 --- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi +++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi @@ -1471,6 +1471,8 @@ interrupt-parent = <&gpio>; interrupts = ; interrupt-names = "host-wake"; + + reset-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_LOW>; }; };