uboot-mediatek: backport pinctrl fix to avoid error message
Import a3ba6adb70 arm: dts: mt7622: remove default pinctrl of uart0 and apply also to locally added boards. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
parent
7f5e70a534
commit
87e09b692b
|
@ -0,0 +1,45 @@
|
||||||
|
From a3ba6adb70c91ec3b9312c3a025faa44acd39cfa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Weijie Gao <weijie.gao@mediatek.com>
|
||||||
|
Date: Wed, 13 Jul 2022 11:16:39 +0800
|
||||||
|
Subject: [PATCH] arm: dts: mt7622: remove default pinctrl of uart0
|
||||||
|
|
||||||
|
Currently u-boot running on mt7622 will print an warning log at beginning:
|
||||||
|
> serial_mtk serial@11002000: pinctrl_select_state_full: uclass_get_device_by_phandle_id: err=-19
|
||||||
|
|
||||||
|
It turns out that the pinctrl uclass can't work properly in board_f stage.
|
||||||
|
|
||||||
|
Since the uart0 is the default UART device used by bootrom, and will be
|
||||||
|
initialized in both bootrom and tf-a bl2. It's ok not to setup pinctrl for
|
||||||
|
uart0 in u-boot.
|
||||||
|
|
||||||
|
This patch removes the default pinctrl of uart0 to suppress the unwanted
|
||||||
|
warning.
|
||||||
|
|
||||||
|
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/mt7622-bananapi-bpi-r64.dts | 2 --
|
||||||
|
arch/arm/dts/mt7622-rfb.dts | 2 --
|
||||||
|
2 files changed, 4 deletions(-)
|
||||||
|
|
||||||
|
--- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
|
||||||
|
+++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
|
||||||
|
@@ -182,8 +182,6 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
&uart0 {
|
||||||
|
- pinctrl-names = "default";
|
||||||
|
- pinctrl-0 = <&uart0_pins>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
--- a/arch/arm/dts/mt7622-rfb.dts
|
||||||
|
+++ b/arch/arm/dts/mt7622-rfb.dts
|
||||||
|
@@ -196,8 +196,6 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
&uart0 {
|
||||||
|
- pinctrl-names = "default";
|
||||||
|
- pinctrl-0 = <&uart0_pins>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
reg_1p8v: regulator-1p8v {
|
reg_1p8v: regulator-1p8v {
|
||||||
compatible = "regulator-fixed";
|
compatible = "regulator-fixed";
|
||||||
regulator-name = "fixed-1.8V";
|
regulator-name = "fixed-1.8V";
|
||||||
@@ -199,7 +236,7 @@
|
@@ -197,7 +234,7 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
max-frequency = <50000000>;
|
max-frequency = <50000000>;
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
vmmc-supply = <®_3p3v>;
|
vmmc-supply = <®_3p3v>;
|
||||||
vqmmc-supply = <®_3p3v>;
|
vqmmc-supply = <®_3p3v>;
|
||||||
non-removable;
|
non-removable;
|
||||||
@@ -210,7 +247,7 @@
|
@@ -208,7 +245,7 @@
|
||||||
pinctrl-0 = <&mmc1_pins_default>;
|
pinctrl-0 = <&mmc1_pins_default>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
|
|
|
@ -139,7 +139,7 @@
|
||||||
+CONFIG_USB_STORAGE=y
|
+CONFIG_USB_STORAGE=y
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm/dts/mt7622-linksys-e8450-ubi.dts
|
+++ b/arch/arm/dts/mt7622-linksys-e8450-ubi.dts
|
||||||
@@ -0,0 +1,195 @@
|
@@ -0,0 +1,193 @@
|
||||||
+// SPDX-License-Identifier: GPL-2.0
|
+// SPDX-License-Identifier: GPL-2.0
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2019 MediaTek Inc.
|
+ * Copyright (c) 2019 MediaTek Inc.
|
||||||
|
@ -302,8 +302,6 @@
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+&uart0 {
|
+&uart0 {
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&uart0_pins>;
|
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
|
|
|
@ -144,7 +144,7 @@
|
||||||
+CONFIG_SPI_FLASH_XMC=y
|
+CONFIG_SPI_FLASH_XMC=y
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm/dts/mt7622-ubnt-unifi-6-lr.dts
|
+++ b/arch/arm/dts/mt7622-ubnt-unifi-6-lr.dts
|
||||||
@@ -0,0 +1,202 @@
|
@@ -0,0 +1,200 @@
|
||||||
+// SPDX-License-Identifier: GPL-2.0
|
+// SPDX-License-Identifier: GPL-2.0
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2019 MediaTek Inc.
|
+ * Copyright (c) 2019 MediaTek Inc.
|
||||||
|
@ -311,8 +311,6 @@
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+&uart0 {
|
+&uart0 {
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&uart0_pins>;
|
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
|
|
Loading…
Reference in New Issue