Skip to contentSkip to conversation

arm64: dts: marvell: add CP110 uart peripherals

PATCH New Baruch Siach 3 participants 11 messages Jan 31, 2018 – Feb 14, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

---
v2: No change

---
 arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/marvell/armada-cp110.dtsi +40 -0
index a8af4136dbe7..a422cd981a0b 100644
@@ -290,6 +290,46 @@
 			status = "disabled";
 		};
 
+		CP110_LABEL(uart0): serial at 702000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702000 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 122 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart1): serial at 702100 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702100 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 123 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart2): serial at 702200 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702200 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 124 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart3): serial at 702300 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702300 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 125 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
 		CP110_LABEL(nand): nand at 720000 {
 			/*
 			* Due to the limitation of the pins available
Signature · 1 line
2.15.1
#1 lore raw

PATCH v2 2/2 arm64: dts: marvell: mcbin: enable uart headers

Add description of the J25 and J27 UART headers of the Macchiatobin. They use uart peripherals that the CP0 (J25) and CP1 (J27) provide.

Even though J25 and J27 are labeled as UART header, the pins on these headers can be muxed for other purposes. But the UART functionality is useful when the board is mounted in an ATX style enclosure, since the console UART is not accessible through the microUSB at CON9.

---
v2:
Add comments to indicate the headers board labels (Thomas) Explain in the commit log why we want the UART functionality (RMK)

---
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +22 -0
index 626e9d0462c3..122d2257ebc4 100644
@@ -163,6 +163,13 @@
 	};
 };
 
+/* J25 UART header */
+&cp0_uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&cp0_uart1_pins>;
+	status = "okay";
+};
+
 &cp0_mdio {
 	pinctrl-names = "default";
 	pinctrl-0 = <&cp0_ge_mdio_pins>;
@@ -195,6 +202,10 @@
 		marvell,pins = "mpp37", "mpp38";
 		marvell,function = "i2c0";
 	};
+	cp0_uart1_pins: uart1-pins {
+		marvell,pins = "mpp40", "mpp41";
+		marvell,function = "uart1";
+	};
 	cp0_xhci_vbus_pins: xhci0-vbus-pins {
 		marvell,pins = "mpp47";
 		marvell,function = "gpio";
@@ -290,6 +301,17 @@
 		marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", "mpp16";
 		marvell,function = "spi1";
 	};
+	cp1_uart0_pins: uart0-pins {
+		marvell,pins = "mpp6", "mpp7";
+		marvell,function = "uart0";
+	};
+};
+
+/* J27 UART header */
+&cp1_uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&cp1_uart0_pins>;
+	status = "okay";
 };
 
 &cp1_sata0 {
Signature · 1 line
2.15.1
maintainer
#2 lore raw

PATCH v2 2/2 arm64: dts: marvell: mcbin: enable uart headers

Hi Baruch,

Quoted 9 lines · Baruch Siach

Add description of the J25 and J27 UART headers of the Macchiatobin. They use uart peripherals that the CP0 (J25) and CP1 (J27) provide.

Even though J25 and J27 are labeled as UART header, the pins on these headers can be muxed for other purposes. But the UART functionality is useful when the board is mounted in an ATX style enclosure, since the console UART is not accessible through the microUSB at CON9.

Applied on mvebu/dt64

Thanks,

Gregory

Quoted 58 lines

---
v2:
Add comments to indicate the headers board labels (Thomas) Explain in the commit log why we want the UART functionality (RMK)

---
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +22 -0
index 626e9d0462c3..122d2257ebc4 100644
@@ -163,6 +163,13 @@
 	};
 };
 
+/* J25 UART header */
+&cp0_uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&cp0_uart1_pins>;
+	status = "okay";
+};
+
 &cp0_mdio {
 	pinctrl-names = "default";
 	pinctrl-0 = <&cp0_ge_mdio_pins>;
@@ -195,6 +202,10 @@
 		marvell,pins = "mpp37", "mpp38";
 		marvell,function = "i2c0";
 	};
+	cp0_uart1_pins: uart1-pins {
+		marvell,pins = "mpp40", "mpp41";
+		marvell,function = "uart1";
+	};
 	cp0_xhci_vbus_pins: xhci0-vbus-pins {
 		marvell,pins = "mpp47";
 		marvell,function = "gpio";
@@ -290,6 +301,17 @@
 		marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", "mpp16";
 		marvell,function = "spi1";
 	};
+	cp1_uart0_pins: uart0-pins {
+		marvell,pins = "mpp6", "mpp7";
+		marvell,function = "uart0";
+	};
+};
+
+/* J27 UART header */
+&cp1_uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&cp1_uart0_pins>;
+	status = "okay";
 };
 
 &cp1_sata0 {
Signature · 1 line
2.15.1
Signature · 3 lines
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
maintainer
#3 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

In reply to Baruch Siach

Hi Baruch,

Quoted 4 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Applied on mvebu/dt64

Thanks,

Gregory

Quoted 65 lines

---
v2: No change

---
 arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/marvell/armada-cp110.dtsi +40 -0
index a8af4136dbe7..a422cd981a0b 100644
@@ -290,6 +290,46 @@
 			status = "disabled";
 		};
 
+		CP110_LABEL(uart0): serial at 702000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702000 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 122 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart1): serial at 702100 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702100 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 123 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart2): serial at 702200 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702200 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 124 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart3): serial at 702300 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702300 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 125 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
 		CP110_LABEL(nand): nand at 720000 {
 			/*
 			* Due to the limitation of the pins available
Signature · 7 lines
2.15.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 3 lines
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
maintainer
#4 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

In reply to Baruch Siach

Hi Baruch,

Quoted 4 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Applied on mvebu/dt64

Thanks,

Gregory

Quoted 65 lines

---
v2: No change

---
 arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/marvell/armada-cp110.dtsi +40 -0
index a8af4136dbe7..a422cd981a0b 100644
@@ -290,6 +290,46 @@
 			status = "disabled";
 		};
 
+		CP110_LABEL(uart0): serial at 702000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702000 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 122 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart1): serial at 702100 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702100 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 123 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart2): serial at 702200 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702200 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 124 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
+		CP110_LABEL(uart3): serial at 702300 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x702300 0x100>;
+			reg-shift = <2>;
+			interrupts = <ICU_GRP_NSR 125 IRQ_TYPE_LEVEL_HIGH>;
+			reg-io-width = <1>;
+			clocks = <&CP110_LABEL(clk) 1 21>;
+			status = "disabled";
+		};
+
 		CP110_LABEL(nand): nand at 720000 {
 			/*
 			* Due to the limitation of the pins available
Signature · 7 lines
2.15.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 3 lines
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
#5 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

Hi Gregory,

Quoted 8 lines · Gregory CLEMENT
Quoted 4 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Applied on mvebu/dt64

Thanks.

What about patch 2/2 in this series?

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
maintainer
#6 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

Hi Baruch,

Quoted 8 lines · Baruch Siach

Hi Gregory,

Quoted 5 lines · Gregory CLEMENT
Quoted 3 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Applied on mvebu/dt64

Thanks.

What about patch 2/2 in this series?

I thought I applied it, but now it's done.

Gregory

Quoted 7 lines

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Signature · 3 lines
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
#7 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

In reply to Baruch Siach
Quoted 8 lines · Baruch Siach

Hi Gregory,

Quoted 5 lines · Gregory CLEMENT
Quoted 3 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Applied on mvebu/dt64

Thanks.

What about patch 2/2 in this series?

I'm not entirely convinced that it's something that should be done. I know that some people are already using the UART headers for other purposes (other than UART) and the later revision boards have the placement of the microUSB fixed so it is accessible.

While you can tell Linux to use the other UART headers with this patch, uboot won't use them, which means you can't configure the boot loader without (in your case) taking the board out of the case.

I've a similar problem (with the mcbin in a rackmount case), and my solution to that has been to put a single washer under the mounting post near the microUSB to lift the board sufficiently to allow a connector to be plugged in. Sometimes simple hardware fixes are better than software fixes.

Others have used a dremel to modify the case to access the microUSB.

Signature · 3 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
#8 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

Hi Ressell,

Quoted 24 lines · Russell King - ARM Linux
Quoted 6 lines · Baruch Siach
Quoted 5 lines · Gregory CLEMENT
Quoted 3 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Applied on mvebu/dt64

Thanks.

What about patch 2/2 in this series?

I'm not entirely convinced that it's something that should be done. I know that some people are already using the UART headers for other purposes (other than UART) and the later revision boards have the placement of the microUSB fixed so it is accessible.

While you can tell Linux to use the other UART headers with this patch, uboot won't use them, which means you can't configure the boot loader without (in your case) taking the board out of the case.

Quoted 7 lines

I've a similar problem (with the mcbin in a rackmount case), and my solution to that has been to put a single washer under the mounting post near the microUSB to lift the board sufficiently to allow a connector to be plugged in. Sometimes simple hardware fixes are better than software fixes.

Others have used a dremel to modify the case to access the microUSB.

Just for the record, I'm fine with dropping 'status = "okay"' from the mcbin CP{0,1} UART nodes. This would still allow anyone who needs this functionality to enable it with a simple .dts modification, or a run-time dtb modification from the bootloader.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#9 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

Quoted 33 lines · Baruch Siach

Hi Ressell,

Quoted 30 lines · Russell King - ARM Linux
Quoted 6 lines · Baruch Siach
Quoted 5 lines · Gregory CLEMENT
Quoted 3 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Applied on mvebu/dt64

Thanks.

What about patch 2/2 in this series?

I'm not entirely convinced that it's something that should be done. I know that some people are already using the UART headers for other purposes (other than UART) and the later revision boards have the placement of the microUSB fixed so it is accessible.

While you can tell Linux to use the other UART headers with this patch, uboot won't use them, which means you can't configure the boot loader without (in your case) taking the board out of the case.

I've a similar problem (with the mcbin in a rackmount case), and my solution to that has been to put a single washer under the mounting post near the microUSB to lift the board sufficiently to allow a connector to be plugged in. Sometimes simple hardware fixes are better than software fixes.

Quoted 6 lines
Quoted 1 line

Others have used a dremel to modify the case to access the microUSB.

Just for the record, I'm fine with dropping 'status = "okay"' from the mcbin CP{0,1} UART nodes. This would still allow anyone who needs this functionality to enable it with a simple .dts modification, or a run-time dtb modification from the bootloader.

Talking more with Jon (who works for SolidRun, the board manufacturer), the feeling there is:

1. Why enable both UART headers - it makes more sense (given your reason) to enable one as UART but keep the other as GPIO. The labelling up of them being a UART is merely a historical artifact of the very early development of the board.

2. They are developer boards, not a final product. Case modification is somewhat expected.

(2) is especially relevant when SFP support gets added - some of the early revision boards have the SCL/SDA lines swapped on the I2C bus. With that fixed, all boards have way too strong pull-ups on the I2C bus which means some modules don't work - and worse than that, may result in corrupted module EEPROMs.

I ended up with corruption here, and although I've a rev 1.3 board now, I'm still using my self-modified rev 1.1 in preference to it, because I don't want to have to deal with another corrupted EEPROM.

In order for SFP to be reliably functional, board modification is required (either replacement of resistor packs, or in the case of the early boards, cutting the I2C lines and rewiring them.)

IOW, board modification will be required for SFP on most mcbins.

Signature · 3 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
maintainer
#10 lore raw

PATCH v2 1/2 arm64: dts: marvell: add CP110 uart peripherals

Hi,

Quoted 44 lines · Russell King - ARM Linux
Quoted 33 lines · Baruch Siach

Hi Ressell,

Quoted 30 lines · Russell King - ARM Linux
Quoted 6 lines · Baruch Siach
Quoted 5 lines · Gregory CLEMENT
Quoted 3 lines · Baruch Siach

The CP110 component has 4 uart peripherals. All of them use the same clock gate for slow peripherals that is shared with the i2c and spi peripherals.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Applied on mvebu/dt64

Thanks.

What about patch 2/2 in this series?

I'm not entirely convinced that it's something that should be done. I know that some people are already using the UART headers for other purposes (other than UART) and the later revision boards have the placement of the microUSB fixed so it is accessible.

While you can tell Linux to use the other UART headers with this patch, uboot won't use them, which means you can't configure the boot loader without (in your case) taking the board out of the case.

I've a similar problem (with the mcbin in a rackmount case), and my solution to that has been to put a single washer under the mounting post near the microUSB to lift the board sufficiently to allow a connector to be plugged in. Sometimes simple hardware fixes are better than software fixes.

Quoted 6 lines
Quoted 1 line

Others have used a dremel to modify the case to access the microUSB.

Just for the record, I'm fine with dropping 'status = "okay"' from the mcbin CP{0,1} UART nodes. This would still allow anyone who needs this functionality to enable it with a simple .dts modification, or a run-time dtb modification from the bootloader.

Talking more with Jon (who works for SolidRun, the board manufacturer), the feeling there is:

Quoted 7 lines

1. Why enable both UART headers - it makes more sense (given your reason) to enable one as UART but keep the other as GPIO. The labelling up of them being a UART is merely a historical artifact of the very early development of the board.

2. They are developer boards, not a final product. Case modification is somewhat expected.

Just to let know that I applied the patch but I still can either ammend it or drop it as it is not yet part of an immutable tag.

Once you will have agreed I will do the change.

Gregory

Quoted 21 lines

(2) is especially relevant when SFP support gets added - some of the early revision boards have the SCL/SDA lines swapped on the I2C bus. With that fixed, all boards have way too strong pull-ups on the I2C bus which means some modules don't work - and worse than that, may result in corrupted module EEPROMs.

I ended up with corruption here, and although I've a rev 1.3 board now, I'm still using my self-modified rev 1.1 in preference to it, because I don't want to have to deal with another corrupted EEPROM.

In order for SFP to be reliably functional, board modification is required (either replacement of resistor packs, or in the case of the early boards, cutting the I2C lines and rewiring them.)

IOW, board modification will be required for SFP on most mcbins.

Signature · 3 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
Signature · 3 lines
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com