Skip to contentSkip to conversation

ARM: dts: qcom: label all gsbi devices

PATCH New Mathieu Olivari 1 participant 2 messages Feb 25, 2015 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: dts: qcom: label all gsbi devices

All IPQ806x based boards will include this file and will need a way to identify each GSBI device. So this change is labelling them all to make reference from board specific file easier.

---
 arch/arm/boot/dts/qcom-ipq8064.dtsi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/qcom-ipq8064.dtsi +7 -7
index d01f618..ffa5b5e 100644
@@ -140,7 +140,7 @@
 			ranges;
 			status = "disabled";
 
-			serial at 12490000 {
+			uart2: serial at 12490000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x12490000 0x1000>,
 				      <0x12480000 0x1000>;
@@ -150,7 +150,7 @@
 				status = "disabled";
 			};
 
-			i2c at 124a0000 {
+			i2c2: i2c at 124a0000 {
 				compatible = "qcom,i2c-qup-v1.1.1";
 				reg = <0x124a0000 0x1000>;
 				interrupts = <0 196 0>;
@@ -175,7 +175,7 @@
 			ranges;
 			status = "disabled";
 
-			serial at 16340000 {
+			uart4: serial at 16340000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x16340000 0x1000>,
 				      <0x16300000 0x1000>;
@@ -185,7 +185,7 @@
 				status = "disabled";
 			};
 
-			i2c at 16380000 {
+			i2c4: i2c at 16380000 {
 				compatible = "qcom,i2c-qup-v1.1.1";
 				reg = <0x16380000 0x1000>;
 				interrupts = <0 153 0>;
@@ -209,7 +209,7 @@
 			ranges;
 			status = "disabled";
 
-			serial at 1a240000 {
+			uart5: serial at 1a240000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x1a240000 0x1000>,
 				      <0x1a200000 0x1000>;
@@ -219,7 +219,7 @@
 				status = "disabled";
 			};
 
-			i2c at 1a280000 {
+			i2c5: i2c at 1a280000 {
 				compatible = "qcom,i2c-qup-v1.1.1";
 				reg = <0x1a280000 0x1000>;
 				interrupts = <0 155 0>;
@@ -232,7 +232,7 @@
 				#size-cells = <0>;
 			};
 
-			spi at 1a280000 {
+			spi5: spi at 1a280000 {
 				compatible = "qcom,spi-qup-v1.1.1";
 				reg = <0x1a280000 0x1000>;
 				interrupts = <0 155 0>;
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/2 ARM: dts: qcom: add stdout-path to AP148

AP148 default console output is uart4, so this change adds a serial0 alias to it, as well add the corresponding stdout-path.

This will avoid having to set these as chosen.

---
 arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/qcom-ipq8064-ap148.dts +8 -0
index 55b2910..208bb79 100644
@@ -14,6 +14,14 @@
 		};
 	};
 
+	alias {
+		serial0 = &uart4;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		pinmux at 800000 {
 			i2c4_pins: i2c4_pinmux {
Signature · 1 line
1.9.1