diff mbox series

[U-Boot,v1,5/5] dts: 820c: Add pinctrl node and uart mux

Message ID 20190112094728.14189-6-ramon.fried@gmail.com
State Accepted
Commit fbf4152ba65045f8832a95ed2c31bd10805480bd
Delegated to: Tom Rini
Headers show
Series db820: Add missing initialization for uart | expand

Commit Message

Ramon Fried Jan. 12, 2019, 9:47 a.m. UTC 
* Add pinctrl node for TLMM and add mux request for uart node.
* Rename uart to the actual board uart port.
* Fix indentendation of sdhc2 node.

Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
---

 arch/arm/dts/dragonboard820c-uboot.dtsi | 10 ++++++++-
 arch/arm/dts/dragonboard820c.dts        | 29 +++++++++++++++++++------
 2 files changed, 31 insertions(+), 8 deletions(-)

Comments

Tom Rini Jan. 27, 2019, 3:51 a.m. UTC | #1 
On Sat, Jan 12, 2019 at 11:47:28AM +0200, Ramon Fried wrote:

> * Add pinctrl node for TLMM and add mux request for uart node.
> * Rename uart to the actual board uart port.
> * Fix indentendation of sdhc2 node.
> 
> Signed-off-by: Ramon Fried <ramon.fried@gmail.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi b/arch/arm/dts/dragonboard820c-uboot.dtsi
index d60aa04494..8610d7ec37 100644
--- a/arch/arm/dts/dragonboard820c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard820c-uboot.dtsi
@@ -13,14 +13,22 @@ 
 	soc {
 		u-boot,dm-pre-reloc;
 
+		qcom,tlmm@1010000 {
+			u-boot,dm-pre-reloc;
+
+			uart {
+				u-boot,dm-pre-reloc;
+			};
+		};
+
 		clock-controller@300000 {
 			u-boot,dm-pre-reloc;
 		};
 
 		serial@75b0000 {
 			u-boot,dm-pre-reloc;
-			};
 		};
+	};
 };
 
 &pm8994_pon {
diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts
index 34abbc9110..dac15775dd 100644
--- a/arch/arm/dts/dragonboard820c.dts
+++ b/arch/arm/dts/dragonboard820c.dts
@@ -8,6 +8,7 @@ 
 /dts-v1/;
 
 #include "skeleton64.dtsi"
+#include <dt-bindings/pinctrl/pinctrl-snapdragon.h>
 
 / {
 	model = "Qualcomm Technologies, Inc. DB820c";
@@ -16,7 +17,7 @@ 
 	#size-cells = <2>;
 
 	aliases {
-		serial0 = &blsp2_uart1;
+		serial0 = &blsp2_uart2;
 	};
 
 	chosen {
@@ -63,18 +64,32 @@ 
 			reg = <0x300000 0x90000>;
 		};
 
-		blsp2_uart1: serial@75b0000 {
+		pinctrl: qcom,tlmm@1010000 {
+			compatible = "qcom,tlmm-apq8096";
+			reg = <0x1010000 0x400000>;
+
+			blsp8_uart: uart {
+				function = "blsp_uart8";
+				pins = "GPIO_4", "GPIO_5";
+				drive-strength = <DRIVE_STRENGTH_8MA>;
+				bias-disable;
+			};
+		};
+
+		blsp2_uart2: serial@75b0000 {
 			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
 			reg = <0x75b0000 0x1000>;
 			clock = <&gcc 4>;
+			pinctrl-names = "uart";
+			pinctrl-0 = <&blsp8_uart>;
 		};
 
 		sdhc2: sdhci@74a4900 {
-			 compatible = "qcom,sdhci-msm-v4";
-			 reg = <0x74a4900 0x314>, <0x74a4000 0x800>;
-			 index = <0x0>;
-			 bus-width = <4>;
-			 clock = <&gcc 0>;
+			compatible = "qcom,sdhci-msm-v4";
+			reg = <0x74a4900 0x314>, <0x74a4000 0x800>;
+			index = <0x0>;
+			bus-width = <4>;
+			clock = <&gcc 0>;
 			clock-frequency = <200000000>;
 		 };