Use stdout-path on qcom boards

PATCH Applied Stephen Boyd 2 participants 21 messages Jun 16, 2015 – Aug 27, 2015

Subsystems (2)

Device tree bindings Arm Qualcomm mailing list

lore

Share & tools

lore

Stephen Boyd

author

2015-06-16 21:31 UTC #0 lore raw

cover Use stdout-path on qcom boards

These patches convert the qcom dts files to use serial aliases and the stdout-path property so that we don't have to put the console on the kernel commandline.

Cc Mike Rapoport <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Tim Bird <[email protected]>

Cc Bjorn Andersson <[email protected]>

Cc Mathieu Olivari <[email protected]>

Stephen Boyd (10):
ARM: dts: qcom: Label serial nodes for aliasing and stdout-path
ARM: dts: qcom: apq8064-cm-qs600: Use stdout-path
ARM: dts: qcom: apq8064-ifc6410: Use stdout-path
ARM: dts: qcom: apq8074-dragonboard: Use stdout-path
ARM: dts: qcom: apq8084-ifc6540: Use stdout-path
ARM: dts: qcom: apq8084-mtp: Use stdout-path
ARM: dts: qcom: ipq8064-ap148: Use stdout-path
ARM: dts: qcom: msm8660-surf: Use stdout-path
ARM: dts: qcom: msm8960-cdp: Use stdout-path
ARM: dts: qcom: msm8974-sony-xperia-honami: Use stdout-path

 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts           | 8 ++++++++
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts            | 4 ++++
 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts        | 8 ++++++++
 arch/arm/boot/dts/qcom-apq8084-ifc6540.dts            | 8 ++++++++
 arch/arm/boot/dts/qcom-apq8084-mtp.dts                | 8 ++++++++
 arch/arm/boot/dts/qcom-apq8084.dtsi                   | 2 +-
 arch/arm/boot/dts/qcom-ipq8064-ap148.dts              | 8 ++++++++
 arch/arm/boot/dts/qcom-ipq8064.dtsi                   | 2 +-
 arch/arm/boot/dts/qcom-msm8660-surf.dts               | 8 ++++++++
 arch/arm/boot/dts/qcom-msm8660.dtsi                   | 2 +-
 arch/arm/boot/dts/qcom-msm8960-cdp.dts                | 8 ++++++++
 arch/arm/boot/dts/qcom-msm8960.dtsi                   | 2 +-
 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 ++++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi                   | 2 +-
 14 files changed, 73 insertions(+), 5 deletions(-)

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #1 lore raw

PATCH 1/10 ARM: dts: qcom: Label serial nodes for aliasing and stdout-path

Add a label to the serial nodes that are being used for the console.

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +-
 arch/arm/boot/dts/qcom-ipq8064.dtsi | 2 +-
 arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +-
 arch/arm/boot/dts/qcom-msm8960.dtsi | 2 +-
 arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

arch/arm/boot/dts/qcom-apq8084.dtsi +1 -1

index 7084010ee61b..0554fbd72c40 100644
@@ -234,7 +234,7 @@
 			interrupts = <0 208 0>;
 		};
 
-		serial at f995e000 {
+		blsp2_uart2: serial at f995e000 {
 			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
 			reg = <0xf995e000 0x1000>;
 			interrupts = <0 114 0x0>;

arch/arm/boot/dts/qcom-ipq8064.dtsi +1 -1

index 9f727d8eadf6..fa698635eea0 100644
@@ -197,7 +197,7 @@
 
 			syscon-tcsr = <&tcsr>;
 
-			serial at 16340000 {
+			gsbi4_serial: serial at 16340000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x16340000 0x1000>,
 				      <0x16300000 0x1000>;

arch/arm/boot/dts/qcom-msm8660.dtsi +1 -1

index e0b2ce2910e0..80070bd41d5d 100644
@@ -97,7 +97,7 @@
 
 			syscon-tcsr = <&tcsr>;
 
-			serial at 19c40000 {
+			gsbi12_serial: serial at 19c40000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x19c40000 0x1000>,
 				      <0x19c00000 0x1000>;

arch/arm/boot/dts/qcom-msm8960.dtsi +1 -1

index a02b984cc68d..502d332eb7bc 100644
@@ -139,7 +139,7 @@
 
 			syscon-tcsr = <&tcsr>;
 
-			serial at 16440000 {
+			gsbi5_serial: serial at 16440000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x16440000 0x1000>,
 				      <0x16400000 0x1000>;

arch/arm/boot/dts/qcom-msm8974.dtsi +1 -1

index 37b47b5538b8..d549f7edf21f 100644
@@ -227,7 +227,7 @@
 			reg = <0xfd8c0000 0x6000>;
 		};
 
-		serial at f991e000 {
+		blsp1_uart2: serial at f991e000 {
 			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
 			reg = <0xf991e000 0x1000>;
 			interrupts = <0 108 0x0>;

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

Applied

2015-08-27 04:35 UTC #2 lore raw

Re: [PATCH 01/10] ARM: dts: qcom: Label serial nodes for aliasing and stdout-path

Quoted 5 lines · Stephen Boyd

Add a label to the serial nodes that are being used for the console.
Signed-off-by Stephen Boyd <[email protected]>
---

Applied. Thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #3 lore raw

PATCH 2/10 ARM: dts: qcom: apq8064-cm-qs600: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Cc Mike Rapoport <[email protected]>

Cc Igor Grinberg <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts +8 -0

index 71512b3ca444..bdc0acd5f825 100644
@@ -4,6 +4,14 @@
 	model = "CompuLab CM-QS600";
 	compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064";
 
+	aliases {
+		serial0 = &gsbi7_serial;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		pinctrl at 800000 {
 			i2c1_pins: i2c1 {

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

Applied

2015-08-27 04:33 UTC #4 lore raw

Re: [PATCH 02/10] ARM: dts: qcom: apq8064-cm-qs600: Use stdout-path

Quoted 9 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Cc Mike Rapoport <[email protected]>
Cc Igor Grinberg <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied. Thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #5 lore raw

PATCH 3/10 ARM: dts: qcom: apq8064-ifc6410: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 4 ++++
 1 file changed, 4 insertions(+)

arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +4 -0

index a7c939ba8873..c843274a34ef 100644
@@ -9,6 +9,10 @@
 		serial0 = &gsbi7_serial;
 	};
 
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		pinctrl at 800000 {
 			card_detect: card_detect {

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

2015-08-27 04:16 UTC #6 lore raw

Re: [PATCH 03/10] ARM: dts: qcom: apq8064-ifc6410: Use stdout-path

arch/arm/boot/dts/qcom-apq8064-ifc6410.dts

Quoted 9 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +0 -0

Thanks. Applied.

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #7 lore raw

PATCH 4/10 ARM: dts: qcom: apq8074-dragonboard: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +8 -0

index d484d08163e9..835bdc71c5ba 100644
@@ -6,6 +6,14 @@
 	model = "Qualcomm APQ8074 Dragonboard";
 	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
 
+	aliases {
+		serial0 = &blsp1_uart2;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		serial at f991e000 {
 			status = "ok";

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

2015-08-27 04:17 UTC #8 lore raw

Re: [PATCH 04/10] ARM: dts: qcom: apq8074-dragonboard: Use stdout-path

Quoted 7 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Thanks. Applied.

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #9 lore raw

PATCH 5/10 ARM: dts: qcom: apq8084-ifc6540: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/qcom-apq8084-ifc6540.dts +8 -0

index f7725b96612c..c9c2b769554f 100644
@@ -5,6 +5,14 @@
 	model = "Qualcomm APQ8084/IFC6540";
 	compatible = "qcom,apq8084-ifc6540", "qcom,apq8084";
 
+	aliases {
+		serial0 = &blsp2_uart2;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		serial at f995e000 {
 			status = "okay";

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

Applied

2015-08-27 04:27 UTC #10 lore raw

Re: [PATCH 05/10] ARM: dts: qcom: apq8084-ifc6540: Use stdout-path

Quoted 7 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied. Thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #11 lore raw

PATCH 6/10 ARM: dts: qcom: apq8084-mtp: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-apq8084-mtp.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/qcom-apq8084-mtp.dts +8 -0

index cb43acfc5d1d..3016c7048d44 100644
@@ -5,6 +5,14 @@
 	model = "Qualcomm APQ 8084-MTP";
 	compatible = "qcom,apq8084-mtp", "qcom,apq8084";
 
+	aliases {
+		serial0 = &blsp2_uart2;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		serial at f995e000 {
 			status = "okay";

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

Applied

2015-08-27 04:36 UTC #12 lore raw

Re: [PATCH 06/10] ARM: dts: qcom: apq8084-mtp: Use stdout-path

Quoted 7 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-apq8084-mtp.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied. Thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #13 lore raw

PATCH 7/10 ARM: dts: qcom: ipq8064-ap148: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Cc Mathieu Olivari <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

---
 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 55b2910efd87..d501382493e3 100644
@@ -4,6 +4,14 @@
 	model = "Qualcomm IPQ8064/AP148";
 	compatible = "qcom,ipq8064-ap148", "qcom,ipq8064";
 
+	aliases {
+		serial0 = &gsbi4_serial;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

2015-08-27 04:34 UTC #14 lore raw

Re: [PATCH 07/10] ARM: dts: qcom: ipq8064-ap148: Use stdout-path

Quoted 8 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Cc Mathieu Olivari <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #15 lore raw

PATCH 8/10 ARM: dts: qcom: msm8660-surf: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-msm8660-surf.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/qcom-msm8660-surf.dts +8 -0

index e0883c376248..b17f379e8c2a 100644
@@ -6,6 +6,14 @@
 	model = "Qualcomm MSM8660 SURF";
 	compatible = "qcom,msm8660-surf", "qcom,msm8660";
 
+	aliases {
+		serial0 = &gsbi12_serial;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		gsbi at 19c00000 {
 			status = "ok";

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

Applied

2015-08-27 04:36 UTC #16 lore raw

Re: [PATCH 08/10] ARM: dts: qcom: msm8660-surf: Use stdout-path

Quoted 7 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-msm8660-surf.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied. thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #17 lore raw

PATCH 9/10 ARM: dts: qcom: msm8960-cdp: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-msm8960-cdp.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/qcom-msm8960-cdp.dts +8 -0

index 7f70fae90959..9a99742e4a18 100644
@@ -6,6 +6,14 @@
 	model = "Qualcomm MSM8960 CDP";
 	compatible = "qcom,msm8960-cdp", "qcom,msm8960";
 
+	aliases {
+		serial0 = &gsbi5_serial;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	soc {
 		gsbi at 16400000 {
 			status = "ok";

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

Applied

2015-08-27 04:28 UTC #18 lore raw

Re: [PATCH 09/10] ARM: dts: qcom: msm8960-cdp: Use stdout-path

Quoted 7 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-msm8960-cdp.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied. Thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Stephen Boyd

author

2015-06-16 21:31 UTC #19 lore raw

PATCH 10/10 ARM: dts: qcom: msm8974-sony-xperia-honami: Use stdout-path

In reply to Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.

Cc Tim Bird <[email protected]>

Cc Bjorn Andersson <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

---
 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts +8 -0

index bd35b0674ff6..eb547f1f6a60 100644
@@ -6,6 +6,14 @@
 	model = "Sony Xperia Z1";
 	compatible = "sony,xperia-honami", "qcom,msm8974";
 
+	aliases {
+		serial0 = &blsp1_uart2;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	memory at 0 {
 		reg = <0 0x40000000>, <0x40000000 0x40000000>;
 		device_type = "memory";

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Andy Gross

Applied

2015-08-27 04:36 UTC #20 lore raw

Re: [PATCH 10/10] ARM: dts: qcom: msm8974-sony-xperia-honami: Use stdout-path

Quoted 10 lines · Stephen Boyd

Use stdout-path so that we don't have to put the console on the kernel command line.
Cc Tim Bird <[email protected]>
Cc Bjorn Andersson <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

Applied. Thanks

Signature · 3 lines

Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project