Skip to contentSkip to conversation

Add support for the Mercury+ AA1 module

PATCH Superseded Paweł Anikiel 2 participants 5 messages Oct 19, 2021 – Oct 20, 2021

Subsystems (2)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover Add support for the Mercury+ AA1 module

The following patches add support for the Mercury+ AA1 with an Arria 10 SoCFPGA.

v4:
* move devicetree aliases to socfpga_arria10.dtsi
* sort arria10 entries in arch/arm/boot/dts/Makefile

v3:
* replace i2c busno property with devicetree aliases
* reset controller patch added to Philipp Zabel's tree

v2:
* remove spi flash node
* rename memory and mdio nodes
* add gpio nodes
* add busno property to designware i2c driver

Paweł Anikiel (2):
reset: socfpga: add empty driver allowing consumers to probe
socfpga: dts: move arria10 aliases to socfpga_arria10.dtsi

 arch/arm/boot/dts/socfpga_arria10.dtsi       | 13 ++++++++++
 arch/arm/boot/dts/socfpga_arria10_socdk.dtsi |  7 +-----
 drivers/reset/reset-socfpga.c                | 26 ++++++++++++++++++++
 3 files changed, 40 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/2 socfpga: dts: move arria10 aliases to socfpga_arria10.dtsi

socfpga_arria10_socdk.dtsi declares aliases which will most likely be used by other arria10 boards in the exact same way. move these aliases to the parent file.

---
 arch/arm/boot/dts/socfpga_arria10.dtsi       | 13 +++++++++++++
 arch/arm/boot/dts/socfpga_arria10_socdk.dtsi |  7 +------
 2 files changed, 14 insertions(+), 6 deletions(-)
arch/arm/boot/dts/socfpga_arria10.dtsi +13 -0
index a574ea91d9d3..26b1662cc00f 100644
@@ -10,6 +10,19 @@ / {
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		ethernet0 = &gmac0;
+		ethernet1 = &gmac1;
+		ethernet2 = &gmac2;
+		serial0 = &uart0;
+		serial1 = &uart1;
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		i2c2 = &i2c2;
+		i2c3 = &i2c3;
+		i2c4 = &i2c4;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi +1 -6
index 7edebe20e859..e9bb56ec15f1 100644
@@ -8,14 +8,9 @@ / {
 	model = "Altera SOCFPGA Arria 10";
 	compatible = "altr,socfpga-arria10", "altr,socfpga";
 
-	aliases {
-		ethernet0 = &gmac0;
-		serial0 = &uart1;
-	};
-
 	chosen {
 		bootargs = "earlyprintk";
-		stdout-path = "serial0:115200n8";
+		stdout-path = "serial1:115200n8";
 	};
 
 	memory@0 {
Signature · 1 line
2.25.1
maintainer
#2 lore raw

Re: [PATCH v4 1/2] socfpga: dts: move arria10 aliases to socfpga_arria10.dtsi

Quoted 6 lines · Paweł Anikiel

socfpga_arria10_socdk.dtsi declares aliases which will most likely be used by other arria10 boards in the exact same way. move these aliases to the parent file.

No, please move them into the .dts files instead for consistency.

Each board may use a different subset of them, or have them numbered differently, so keep it out of the .dtsi file.

Arnd

#3 lore raw

Re: [PATCH v4 1/2] socfpga: dts: move arria10 aliases to socfpga_arria10.dtsi

Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · Paweł Anikiel

socfpga_arria10_socdk.dtsi declares aliases which will most likely be used by other arria10 boards in the exact same way. move these aliases to the parent file.

Quoted 8 lines
Quoted 1 line

No, please move them into the .dts files instead for consistency.

Each board may use a different subset of them, or have them numbered differently, so keep it out of the .dtsi file.

Arnd

Thank you for your remark. The aliases per .dts file were in the v3 patch, however this change was explicitly requested. I will bring that back and resubmit.

Thanks, Paweł.

#4 lore raw

PATCH v4 2/2 dts: socfpga: Add Mercury+ AA1 devicetree

In reply to Paweł Anikiel

Add support for the Mercury+ AA1 module for Arria 10 SoC FPGA.

---
 arch/arm/boot/dts/Makefile                    |   1 +
 .../boot/dts/socfpga_arria10_mercury_aa1.dts  | 105 ++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
arch/arm/boot/dts/Makefile +1 -0
index 7e0934180724..803702883122 100644
@@ -1075,6 +1075,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
 	s5pv210-torbreck.dtb
 dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
 	socfpga_arria5_socdk.dtb \
+	socfpga_arria10_mercury_aa1.dtb \
 	socfpga_arria10_socdk_nand.dtb \
 	socfpga_arria10_socdk_qspi.dtb \
 	socfpga_arria10_socdk_sdmmc.dtb \
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +105 -0

105 lines not on this page · raw message

Signature · 1 line
2.25.1