Skip to contentSkip to conversation

x86: edison: Use proper number of serial interface

PATCH Superseded Andy Shevchenko 2 participants 4 messages Feb 26, 2019 – Feb 28, 2019 x86

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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 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..8629f7bcf2 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 ff010180 {
+		compatible = "intel,mid-uart";
+		reg = <0xff010080 0x100>;
+		reg-shift = <0>;
+		clock-frequency = <29491200>;
+		current-speed = <115200>;
+	};
+
+	serial1: serial at ff010180 {
+		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 2/2 x86: edison: Add the rest of UARTs present on board

Hi Andy,

Quoted 27 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(+)
arch/x86/dts/edison.dts +2 -0
index b59171cb50..8629f7bcf2 100644
@@ -17,6 +17,8 @@
        compatible = "intel,edison";
 
        aliases {
+               serial0 = &serial0;
+               serial1 = &serial1;
                serial2 = &serial2;
        };
 

arch/x86/dts/edison.dts line 58

Quoted 4 lines
arch/x86/dts/edison.dts +1 -0
@@ -53,6 +55,22 @@
                          0x01000000 0x0 0x2000 0x2000 0 0xe000>;
        };
 
+       serial0: serial at ff010180 {

The reg base is wrong here, should be @ff010080

arch/x86/dts/edison.dts line 66

Quoted 8 lines
arch/x86/dts/edison.dts +8 -0
+               compatible = "intel,mid-uart";
+               reg = <0xff010080 0x100>;
+               reg-shift = <0>;
+               clock-frequency = <29491200>;
+               current-speed = <115200>;
+       };
+
+       serial1: serial at ff010180 {

ditto

arch/x86/dts/edison.dts

Quoted 11 lines
arch/x86/dts/edison.dts +7 -1
+               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>;
--

Regards,
Bin

#3 lore raw

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

In reply to Andy Shevchenko
Quoted 11 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.

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

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