Add support for the Mercury+ AA1 module
v3 cover Add support for the Mercury+ AA1 module
The following patches add support for the Mercury+ AA1 with an Arria 10 SoCFPGA.
The reset controller patch was added into Philipp Zabel's tree:
https://git.pengutronix.de/cgit/pza/linux/commit/?h=reset/fixes
The i2c bus numbering property was replaced by aliases in the devicetree.
Paweł Anikiel (1):
dts: socfpga: Add Mercury+ AA1 devicetree
arch/arm/boot/dts/Makefile | 1 + .../boot/dts/socfpga_arria10_mercury_aa1.dts | 112 ++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
Signature · 1 line
2.25.1
PATCH v3 1/1 dts: socfpga: Add Mercury+ AA1 devicetree
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 | 112 ++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -1078,6 +1078,7 @@ dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \ socfpga_arria10_socdk_nand.dtb \ socfpga_arria10_socdk_qspi.dtb \ socfpga_arria10_socdk_sdmmc.dtb \ + socfpga_arria10_mercury_aa1.dtb \ socfpga_cyclone5_chameleon96.dtb \ socfpga_cyclone5_mcvevk.dtb \ socfpga_cyclone5_socdk.dtb \
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +112 -0
112 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v3 1/1] dts: socfpga: Add Mercury+ AA1 devicetree
Quoted 37 lines · Paweł Anikiel
Add support for the Mercury+ AA1 module for Arria 10 SoC FPGA.
Signed-off-by Paweł Anikiel <[email protected]>Signed-off-by Joanna Brozek <[email protected]>Signed-off-by Mariusz Glebocki <[email protected]>Signed-off-by Tomasz Gorochowik <[email protected]>Signed-off-by Maciej Mikunda <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + .../boot/dts/socfpga_arria10_mercury_aa1.dts | 112 ++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsarch/arm/boot/dts/Makefile +1
-0@@ -1078,6 +1078,7 @@ dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \ socfpga_arria10_socdk_nand.dtb \ socfpga_arria10_socdk_qspi.dtb \ socfpga_arria10_socdk_sdmmc.dtb \ + socfpga_arria10_mercury_aa1.dtb \ socfpga_cyclone5_chameleon96.dtb \ socfpga_cyclone5_mcvevk.dtb \ socfpga_cyclone5_socdk.dtb \arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +5
-0@@ -0,0 +1,112 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; + +#include "socfpga_arria10.dtsi" +
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts line 15
Quoted 10 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +10
-0+/ { + + model = "Enclustra Mercury AA1"; + compatible = "altr,socfpga-arria10", "altr,socfpga"; + + aliases { + ethernet0 = &gmac0; + serial1 = &uart1; + i2c0 = &i2c0; + i2c1 = &i2c1;
Yeah, this is fine now. I still would have added this in "socfpga_arria10.dtsi" instead. I don't think there's ever a case where these aliases wouldn't be wanted for any user of this chip.
Quoted 98 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +97
-1+ }; + + memory@0 { + name = "memory"; + device_type = "memory"; + reg = <0x0 0x80000000>; /* 2GB */ + }; + + chosen { + stdout-path = "serial1:115200n8"; + }; +}; + +&eccmgr { + sdmmca-ecc@ff8c2c00 { + compatible = "altr,socfpga-sdmmc-ecc"; + reg = <0xff8c2c00 0x400>; + altr,ecc-parent = <&mmc>; + interrupts = <15 IRQ_TYPE_LEVEL_HIGH>, + <47 IRQ_TYPE_LEVEL_HIGH>, + <16 IRQ_TYPE_LEVEL_HIGH>, + <48 IRQ_TYPE_LEVEL_HIGH>; + }; +}; + +&gmac0 { + phy-mode = "rgmii"; + phy-addr = <0xffffffff>; /* probe for phy addr */ + + max-frame-size = <3800>; + status = "okay"; + + phy-handle = <&phy3>; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + phy3: ethernet-phy@3 { + txd0-skew-ps = <0>; /* -420ps */ + txd1-skew-ps = <0>; /* -420ps */ + txd2-skew-ps = <0>; /* -420ps */ + txd3-skew-ps = <0>; /* -420ps */ + rxd0-skew-ps = <420>; /* 0ps */ + rxd1-skew-ps = <420>; /* 0ps */ + rxd2-skew-ps = <420>; /* 0ps */ + rxd3-skew-ps = <420>; /* 0ps */ + txen-skew-ps = <0>; /* -420ps */ + txc-skew-ps = <1860>; /* 960ps */ + rxdv-skew-ps = <420>; /* 0ps */ + rxc-skew-ps = <1680>; /* 780ps */ + reg = <3>; + }; + }; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&gpio2 { + status = "okay"; +}; + +&i2c1 { + status = "okay"; + isl12022: isl12022@6f { + status = "okay"; + compatible = "isil,isl12022"; + reg = <0x6f>; + }; +}; + +/* Following mappings are taken from arria10 socdk dts */ +&mmc { + status = "okay"; + cap-sd-highspeed; + broken-cd; + bus-width = <4>; +}; + +&osc1 { + clock-frequency = <33330000>; +}; + +&uart1 { + status = "okay"; +}; + +&usb0 { + status = "okay"; + dr_mode = "host"; +}; --
Quoted 2 lines
2.25.1
Hello Paweł,
Thank you for respinning.
This looks good as a base to make the boards be able to boot. I'd be happy if it lands (even the v3 patch).
Just a small nit about the location of the aliases.
Thanks,
Alexandru Stan