arm64: dts: Add more serial port nodes in APM X-Gene device tree
PATCH 1/1 arm64: dts: Add more serial port nodes in APM X-Gene device tree
APM X-Gene Storm SoC supports 4 serial ports. This patch adds device nodes for serial ports 1 to 3 (a device node for serial port 0 is already present in the dts file).
This patch also sets the compatible property of serial nodes to "ns16550a".
--- arch/arm64/boot/dts/apm-mustang.dts | 4 ++++ arch/arm64/boot/dts/apm-storm.dtsi | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/apm-mustang.dts +4 -0
@@ -24,3 +24,7 @@ reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */ }; }; + +&serial0 { + status = "ok"; +};
arch/arm64/boot/dts/apm-storm.dtsi +35 -1
@@ -179,13 +179,47 @@ }; serial0: serial at 1c020000 { + status = "disabled"; device_type = "serial"; - compatible = "ns16550"; + compatible = "ns16550a"; reg = <0 0x1c020000 0x0 0x1000>; reg-shift = <2>; clock-frequency = <10000000>; /* Updated by bootloader */ interrupt-parent = <&gic>; interrupts = <0x0 0x4c 0x4>; }; + + serial1: serial at 1c021000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c021000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4d 0x4>; + }; + + serial2: serial at 1c022000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c022000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4e 0x4>; + }; + + serial3: serial at 1c023000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c023000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4f 0x4>; + }; }; };
Signature · 1 line
1.8.2.1
PATCH 1/1 arm64: dts: Add more serial port nodes in APM X-Gene device tree
Hi Catalin / Will,
Can you please merge this one?
Thanks
-Vinayak
Quoted 79 lines · Vinayak Kale
APM X-Gene Storm SoC supports 4 serial ports. This patch adds device nodes for serial ports 1 to 3 (a device node for serial port 0 is already present in the dts file).
This patch also sets the compatible property of serial nodes to "ns16550a".Signed-off-by Vinayak Kale <[email protected]>--- arch/arm64/boot/dts/apm-mustang.dts | 4 ++++ arch/arm64/boot/dts/apm-storm.dtsi | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-)arch/arm64/boot/dts/apm-mustang.dts +4
-0@@ -24,3 +24,7 @@ reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */ }; }; + +&serial0 { + status = "ok"; +};arch/arm64/boot/dts/apm-storm.dtsi +35
-2@@ -179,13 +179,47 @@ }; serial0: serial at 1c020000 { + status = "disabled"; device_type = "serial"; - compatible = "ns16550"; + compatible = "ns16550a"; reg = <0 0x1c020000 0x0 0x1000>; reg-shift = <2>; clock-frequency = <10000000>; /* Updated by bootloader */ interrupt-parent = <&gic>; interrupts = <0x0 0x4c 0x4>; }; + + serial1: serial at 1c021000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c021000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4d 0x4>; + }; + + serial2: serial at 1c022000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c022000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4e 0x4>; + }; + + serial3: serial at 1c023000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c023000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4f 0x4>; + }; }; }; --1.8.2.1
PATCH 1/1 arm64: dts: Add more serial port nodes in APM X-Gene device tree
Quoted 1 line · Vinayak Kale
Can you please merge this one?
I was hoping for an ack/nak from the DT guys before merging it.
Signature · 1 line
Catalin
PATCH 1/1 arm64: dts: Add more serial port nodes in APM X-Gene device tree
Quoted 4 lines · Catalin Marinas
Quoted 1 line · Vinayak Kale
Can you please merge this one?
I was hoping for an ack/nak from the DT guys before merging it.
I'll resend this patch CCing DT folks.
Quoted 3 lines
--
Catalin
PATCH 1/1 arm64: dts: Add more serial port nodes in APM X-Gene device tree
In reply to Catalin MarinasQuoted 4 lines · Catalin Marinas
Quoted 1 line · Vinayak Kale
Can you please merge this one?
I was hoping for an ack/nak from the DT guys before merging it.
We generally don't review every dts change.
Rob
PATCH 1/1 arm64: dts: Add more serial port nodes in APM X-Gene device tree
In reply to Vinayak KaleQuoted 28 lines · Vinayak Kale
APM X-Gene Storm SoC supports 4 serial ports. This patch adds device nodes for serial ports 1 to 3 (a device node for serial port 0 is already present in the dts file).
This patch also sets the compatible property of serial nodes to "ns16550a".Signed-off-by Vinayak Kale <[email protected]>--- arch/arm64/boot/dts/apm-mustang.dts | 4 ++++ arch/arm64/boot/dts/apm-storm.dtsi | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-)arch/arm64/boot/dts/apm-mustang.dts +4
-0@@ -24,3 +24,7 @@ reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */ }; }; + +&serial0 { + status = "ok"; +};arch/arm64/boot/dts/apm-storm.dtsi +0
-0
arch/arm64/boot/dts/apm-storm.dtsi line 184
Quoted 7 lines
arch/arm64/boot/dts/apm-storm.dtsi +2
-1@@ -179,13 +179,47 @@ }; serial0: serial at 1c020000 { + status = "disabled"; device_type = "serial"; - compatible = "ns16550"; + compatible = "ns16550a";
Generally, changing a compatible string like this is a no-no. You could be breaking compatibility with different OS versions. However, this is one generic string to another and they have been around forever, so I think it is okay. You probably should have a specific string in case you ever have some quirk in your particular h/w.
Rob
Quoted 48 lines
arch/arm64/boot/dts/apm-storm.dtsi +33
-1reg = <0 0x1c020000 0x0 0x1000>; reg-shift = <2>; clock-frequency = <10000000>; /* Updated by bootloader */ interrupt-parent = <&gic>; interrupts = <0x0 0x4c 0x4>; }; + + serial1: serial at 1c021000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c021000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4d 0x4>; + }; + + serial2: serial at 1c022000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c022000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4e 0x4>; + }; + + serial3: serial at 1c023000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c023000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4f 0x4>; + }; }; }; --1.8.2.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html