Skip to contentSkip to conversation

x86: edison: Use proper number of serial interface

PATCH New Andy Shevchenko 2 participants 7 messages Feb 28, 2019 – Mar 4, 2019 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 x86: edison: Use proper number of serial interface

The console is actually serial #2. When we would like to enable other ports, this would be not okay to mess up with the ordering.

Thus, fix the number of default console interface to be 2.

---
 arch/x86/dts/edison.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/dts/edison.dts +3 -3
index 0dd72407ea..b59171cb50 100644
@@ -17,11 +17,11 @@
 	compatible = "intel,edison";
 
 	aliases {
-		serial0 = &serial0;
+		serial2 = &serial2;
 	};
 
 	chosen {
-		stdout-path = &serial0;
+		stdout-path = &serial2;
 	};
 
 	cpus {
@@ -53,7 +53,7 @@
 			  0x01000000 0x0 0x2000 0x2000 0 0xe000>;
 	};
 
-	serial0: serial at ff010180 {
+	serial2: serial at ff010180 {
 		compatible = "intel,mid-uart";
 		reg = <0xff010180 0x100>;
 		reg-shift = <0>;
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/2 x86: edison: Add the rest of UARTs present on board

Intel Edison has three UART ports, i.e.
port 0 - Bluetooth
port 1 - auxiliary, available for general purpose use port 2 - debugging, usually console output is here

Enable all of them for future use.

---
 arch/x86/dts/edison.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
arch/x86/dts/edison.dts +18 -0
index b59171cb50..ea336eac19 100644
@@ -17,6 +17,8 @@
 	compatible = "intel,edison";
 
 	aliases {
+		serial0 = &serial0;
+		serial1 = &serial1;
 		serial2 = &serial2;
 	};
 
@@ -53,6 +55,22 @@
 			  0x01000000 0x0 0x2000 0x2000 0 0xe000>;
 	};
 
+	serial0: serial at ff010080 {
+		compatible = "intel,mid-uart";
+		reg = <0xff010080 0x100>;
+		reg-shift = <0>;
+		clock-frequency = <29491200>;
+		current-speed = <115200>;
+	};
+
+	serial1: serial at ff010100 {
+		compatible = "intel,mid-uart";
+		reg = <0xff010100 0x100>;
+		reg-shift = <0>;
+		clock-frequency = <29491200>;
+		current-speed = <115200>;
+	};
+
 	serial2: serial at ff010180 {
 		compatible = "intel,mid-uart";
 		reg = <0xff010180 0x100>;
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/2 x86: edison: Add the rest of UARTs present on board

Quoted 6 lines · Andy Shevchenko

Intel Edison has three UART ports, i.e.
port 0 - Bluetooth
port 1 - auxiliary, available for general purpose use port 2 - debugging, usually console output is here

Quoted 7 lines

Enable all of them for future use.

---
 arch/x86/dts/edison.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
#3 lore raw

PATCH v2 2/2 x86: edison: Add the rest of UARTs present on board

Quoted 10 lines · Bin Meng
Quoted 8 lines · Andy Shevchenko

Intel Edison has three UART ports, i.e.
port 0 - Bluetooth
port 1 - auxiliary, available for general purpose use port 2 - debugging, usually console output is here

Enable all of them for future use.

Quoted 7 lines
Quoted 5 lines
---
 arch/x86/dts/edison.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Thanks, but please defer this series. It made a regression.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw

PATCH v2 2/2 x86: edison: Add the rest of UARTs present on board

Quoted 17 lines · Andy Shevchenko
Quoted 16 lines · Bin Meng
Quoted 13 lines · Andy Shevchenko

Intel Edison has three UART ports, i.e.
port 0 - Bluetooth
port 1 - auxiliary, available for general purpose use port 2 - debugging, usually console output is here

Enable all of them for future use.

---
 arch/x86/dts/edison.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
Quoted 3 lines
Quoted 1 line

Thanks, but please defer this series. It made a regression.

I found the root cause.

It's a regression in the

commit a61cbad78e67963944e7d719f0aee27b8aef6c02

Author: Simon Glass <[email protected]>
Date:   Fri Dec 28 14:23:10 2018 -0700

dm: serial: Adjust serial_getinfo() to use proper API

I will send a fix soon.

This series is okay as long as future fix will be applied.

Should I make a fix as patch 1 in the series and resend as v3?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw

PATCH v2 2/2 x86: edison: Add the rest of UARTs present on board

In reply to Bin Meng
Quoted 11 lines · Bin Meng
Quoted 8 lines · Andy Shevchenko

Intel Edison has three UART ports, i.e.
port 0 - Bluetooth
port 1 - auxiliary, available for general purpose use port 2 - debugging, usually console output is here

Enable all of them for future use.

Quoted 7 lines
Quoted 5 lines
---
 arch/x86/dts/edison.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

applied to u-boot-x86, thanks!

#6 lore raw

PATCH v2 1/2 x86: edison: Use proper number of serial interface

In reply to Andy Shevchenko
Quoted 4 lines · Andy Shevchenko

The console is actually serial #2. When we would like to enable other ports, this would be not okay to mess up with the ordering.

Quoted 8 lines

Thus, fix the number of default console interface to be 2.

---
 arch/x86/dts/edison.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

applied to u-boot-x86, thanks!