arm: mvebu: Support for 98DX25xx/98DX35xx (AlleyCat5)
Subsystems (7)
v6 cover arm: mvebu: Support for 98DX25xx/98DX35xx (AlleyCat5)
These patches are based on Marvell's bootloader for the AlleyCat5/5X which was based on u-boot 2018.03. I've split that code into consumable chunks and dropped as much unnecessary stuff as I can. I've also tried to sync the device trees as much as possible with the support that will land in Linux 6.0 although there are still some differences
Changes in v6:
- Set CONFIG_DEFAULT_DEVICE_TREE and CONFIG_TEXT_BASE
Changes in v5:
- Minor white space cleanups
- Collect review from Stefan
- Minor fixup for checkpatch.pl complaint
- Remove unused bpard_{early,late}_init{,_r,_f} functions
- Remove CPNFIG_PCI and CONFIG_E1000 as the PCI interface is not currently working (requires more vendor code)
- Use CONFIG_OF_SEPARATE instead of CONFIG_OF_EMBED
Changes in v4:
- Collect r-by from Stefan
- Remove unused mvebu_get_nand_clock() (will return in a later series)
- Remove unnecessary #ifdefs
- Misc style cleanups
- Replace CONFIG_MVEBU_SAR with simpler code implemented directly in soc.c based around get_sar_freq which the 32-bit platforms already use.
- Move CONFIG_DISPLAY_BOARDINFO_LATE and CONFIG_ENV_OVERWRITE to the defconfig.
- Remove CONFIG_BAUDRATE as this is already set in the default config
- Remove CONFIG_USB_MAX_CONTROLLER_COUNT as this is not needed with DM_USB
- Remove CONFIG_PREBOOT as we don't have anything to run
- Remove commented out CONFIG_BOARD_EARLY_INIT_R
- Remove DEBUG_UART configuration
- Remove unnecessary console environment variable
- Remove CONFIG_MVEBU_SAR
Changes in v3:
- Remove unnecessary changes to RX descriptor handling
- Use dev_get_dma_range() to parse dma-ranges property from parent device.
- Remove unnecessary dma-ranges property from ethernet nodes (mvneta now correctly parses the property from the parent node).
- Keep soc_print_clock_info and soc_print_device_info local to alleycat5.
- Remove MMC and UBIFS distroboot options (MMC driver is not currently functional, NAND is not populated on the RD-AC5X board)
- Remove unnecessary Ethernet configuration
- Remove unnecessary NAND configuration
- Remove memory node from dts so the value passed by the DDR FW will be used
Changes in v2:
- Use distro boot by default
- remove unnecessary SPI-NOR partitions
Chris Packham (6):
arm: mvebu: Don't use CONFIG_TIMER on ARM64
net: mvneta: Add support for AlleyCat5
usb: ehci: ehci-marvell: Support for marvell,ac5-ehci
pinctrl: mvebu: Add AlleyCat5 support
arm: mvebu: Support for 98DX25xx/98DX35xx SoC
arm: mvebu: Add RD-AC5X board
arch/arm/Kconfig | 2 +- arch/arm/dts/Makefile | 3 +- arch/arm/dts/ac5-98dx25xx.dtsi | 277 +++++++++++++++++++ arch/arm/dts/ac5-98dx35xx-rd.dts | 129 +++++++++ arch/arm/dts/ac5-98dx35xx.dtsi | 17 ++ arch/arm/mach-mvebu/Kconfig | 13 +- arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/alleycat5/Makefile | 8 + arch/arm/mach-mvebu/alleycat5/cpu.c | 124 +++++++++ arch/arm/mach-mvebu/alleycat5/soc.c | 298 +++++++++++++++++++++ arch/arm/mach-mvebu/alleycat5/soc.h | 7 + arch/arm/mach-mvebu/arm64-common.c | 5 + arch/arm/mach-mvebu/include/mach/cpu.h | 4 + board/Marvell/mvebu_alleycat-5/MAINTAINERS | 6 + board/Marvell/mvebu_alleycat-5/Makefile | 3 + board/Marvell/mvebu_alleycat-5/board.c | 13 + configs/mvebu_ac5_rd_defconfig | 81 ++++++ drivers/net/Kconfig | 2 +- drivers/net/mvneta.c | 43 ++- drivers/pinctrl/mvebu/Kconfig | 2 +- drivers/usb/host/Kconfig | 1 + drivers/usb/host/ehci-marvell.c | 53 +++- include/configs/mvebu_alleycat-5.h | 42 +++ 23 files changed, 1120 insertions(+), 14 deletions(-) create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi create mode 100644 arch/arm/dts/ac5-98dx35xx-rd.dts create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.h create mode 100644 board/Marvell/mvebu_alleycat-5/MAINTAINERS create mode 100644 board/Marvell/mvebu_alleycat-5/Makefile create mode 100644 board/Marvell/mvebu_alleycat-5/board.c create mode 100644 configs/mvebu_ac5_rd_defconfig create mode 100644 include/configs/mvebu_alleycat-5.h
Signature · 1 line
2.38.1
PATCH v6 1/6 arm: mvebu: Don't use CONFIG_TIMER on ARM64
The 64-bit mvebu SoCs don't have a suitable timer driver so add a !ARM64 condition to the select.
---
(no changes since v1)
arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -640,7 +640,7 @@ config ARCH_MVEBU select SPL_DM_SPI if SPL select SPL_DM_SPI_FLASH if SPL select SPL_TIMER if SPL - select TIMER + select TIMER if !ARM64 select OF_CONTROL select OF_SEPARATE select SPI
Signature · 1 line
2.38.1
Re: [PATCH v6 1/6] arm: mvebu: Don't use CONFIG_TIMER on ARM64
Quoted 17 lines · Chris Packham
The 64-bit mvebu SoCs don't have a suitable timer driver so add a !ARM64 condition to the select.
Fixes 7b530bb19e ("arm: mvebu: Use CONFIG_TIMER on all MVEBU & KIRKWOOD platforms")Signed-off-by Chris Packham <[email protected]>---
(no changes since v1)
arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/Kconfig +0
-0
arch/arm/Kconfig config ARCH_MVEBU · line 646
Quoted 8 lines
arch/arm/Kconfig +1
-1@@ -640,7 +640,7 @@ config ARCH_MVEBU select SPL_DM_SPI if SPL select SPL_DM_SPI_FLASH if SPL select SPL_TIMER if SPL - select TIMER + select TIMER if !ARM64 select OF_CONTROL select OF_SEPARATE select SPI
Thanks,
Stefan
PATCH v6 2/6 net: mvneta: Add support for AlleyCat5
In reply to Chris PackhamAdd support for the AlleyCat5 SoC. This lacks the mbus from the other users of the mvneta.c driver so a new compatible string is needed to allow for a different window configuration.
---
(no changes since v3)
Changes in v3:
- Remove unnecessary changes to RX descriptor handling
- Use dev_get_dma_range() to parse dma-ranges property from parent device.
drivers/net/Kconfig | 2 +- drivers/net/mvneta.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-)
drivers/net/Kconfig +1 -1
@@ -448,7 +448,7 @@ config MVGBE config MVNETA bool "Marvell Armada XP/385/3700 network interface support" - depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 + depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 || ALLEYCAT_5 select PHYLIB select DM_MDIO help
drivers/net/mvneta.c +42 -1
88 lines not on this page · raw message
Signature · 1 line
2.38.1
Re: [PATCH v6 2/6] net: mvneta: Add support for AlleyCat5
Quoted 133 lines · Chris Packham
Add support for the AlleyCat5 SoC. This lacks the mbus from the other users of the
mvneta.cdriver so a new compatible string is needed to allow for a different window configuration.Signed-off-by Chris Packham <[email protected]>Reviewed-by Stefan Roese <[email protected]>---
(no changes since v3)
Changes in v3:
- Remove unnecessary changes to RX descriptor handling
- Usedev_get_dma_range()to parse dma-ranges property from parent device.drivers/net/Kconfig | 2 +- drivers/net/mvneta.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-)drivers/net/Kconfig +1
-1@@ -448,7 +448,7 @@ config MVGBE config MVNETA bool "Marvell Armada XP/385/3700 network interface support" - depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 + depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 || ALLEYCAT_5 select PHYLIB select DM_MDIO helpdrivers/net/mvneta.c +42
-2@@ -91,6 +91,8 @@ DECLARE_GLOBAL_DATA_PTR;#define MVNETA_WIN_SIZE_MASK (0xffff0000)#define MVNETA_BASE_ADDR_ENABLE 0x2290#define MVNETA_BASE_ADDR_ENABLE_BIT 0x1 +#define MVNETA_AC5_CNM_DDR_TARGET 0x2 +#define MVNETA_AC5_CNM_DDR_ATTR 0xb#define MVNETA_PORT_ACCESS_PROTECT 0x2294#define MVNETA_PORT_ACCESS_PROTECT_WIN0_RW 0x3#define MVNETA_PORT_CONFIG 0x2400@@ -282,6 +284,8 @@ struct mvneta_port {struct gpio_desc phy_reset_gpio;struct gpio_desc sfp_tx_disable_gpio;#endif + +uintptr_t dma_base;/* base address for DMA address decoding */ };/* The mvneta_tx_desc and mvneta_rx_desc structures describe the @@ -1343,6 +1347,29 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp)mvreg_write (pp,MVNETA_BASE_ADDR_ENABLE , win_enable); } +static void mvneta_conf_ac5_cnm_xbar_windows (struct mvneta_port *pp) +{ +int i; + +/* Clear all windows */ +for (i =0 ; i <6 ; i++) { +mvreg_write (pp,MVNETA_WIN_BASE (i),0 ); +mvreg_write (pp,MVNETA_WIN_SIZE (i),0 ); + +if (i <4 ) +mvreg_write (pp,MVNETA_WIN_REMAP (i),0 ); + } + +/* +* Setup window #0 base 0x0 to target XBAR port 2 (AMB2), attribute 0xb, size 4GB +* AMB2 address decoder remaps 0x0 to DDR 64 bit base address +*/ +mvreg_write (pp,MVNETA_WIN_BASE (0 ), + (MVNETA_AC5_CNM_DDR_ATTR <<8 ) |MVNETA_AC5_CNM_DDR_TARGET ); +mvreg_write (pp,MVNETA_WIN_SIZE (0 ),0xffff0000 ); +mvreg_write (pp,MVNETA_BASE_ADDR_ENABLE ,0x3e ); +} +/* Power up the port */ static int mvneta_port_power_up (struct mvneta_port *pp,int phy_mode) {@@ -1525,7 +1552,7 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)* No cache invalidation needed here, since the rx_buffer's are * located in a uncached memory region */ - *packetp = data; + *packetp = data + pp->dma_base;/* * Only mark one descriptor as free @@ -1544,6 +1571,10 @@ static int mvneta_probe(struct udevice *dev)struct ofnode_phandle_args sfp_args;#endif void *bd_space; +phys_addr_t cpu; +dma_addr_t bus; +u64 size; +int ret;/* * Allocate buffer area for descs and rx_buffers. This is only @@ -1577,9 +1608,18 @@ static int mvneta_probe(struct udevice *dev)/* Configure MBUS address windows */ if (device_is_compatible (dev,"marvell,armada-3700-neta" ))mvneta_bypass_mbus_windows (pp); +else if (device_is_compatible (dev,"marvell,armada-ac5-neta" )) +mvneta_conf_ac5_cnm_xbar_windows (pp);else mvneta_conf_mbus_windows (pp); +/* fetch dma ranges property */ + ret =dev_get_dma_range (dev, &cpu, &bus, &size); +if (!ret) + pp->dma_base = cpu; +else + pp->dma_base =0 ; +#if CONFIG_IS_ENABLED (DM_GPIO )if (!dev_read_phandle_with_args (dev,"sfp" ,NULL ,0 ,0 , &sfp_args) &&ofnode_is_enabled (sfp_args.node))@@ -1620,6 +1660,7 @@ static const struct eth_ops mvneta_ops = {static const struct udevice_id mvneta_ids[] = { { .compatible ="marvell,armada-370-neta" }, + { .compatible ="marvell,armada-ac5-neta" }, { .compatible ="marvell,armada-xp-neta" }, { .compatible ="marvell,armada-3700-neta" }, { } --
Quoted 2 lines
2.38.1
Re: [PATCH v6 2/6] net: mvneta: Add support for AlleyCat5
Hi Ramon,
Quoted 127 lines · Ramon Fried
Quoted 126 lines · Chris Packham
Add support for the AlleyCat5 SoC. This lacks the mbus from the other users of the
mvneta.cdriver so a new compatible string is needed to allow for a different window configuration.Signed-off-by Chris Packham <[email protected]>Reviewed-by Stefan Roese <[email protected]>---
(no changes since v3)
Changes in v3:
- Remove unnecessary changes to RX descriptor handling
- Usedev_get_dma_range()to parse dma-ranges property from parent device.drivers/net/Kconfig | 2 +- drivers/net/mvneta.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-)drivers/net/Kconfig +1
-1@@ -448,7 +448,7 @@ config MVGBE config MVNETA bool "Marvell Armada XP/385/3700 network interface support" - depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 + depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 || ALLEYCAT_5 select PHYLIB select DM_MDIO helpdrivers/net/mvneta.c +41
-1@@ -91,6 +91,8 @@ DECLARE_GLOBAL_DATA_PTR;#define MVNETA_WIN_SIZE_MASK (0xffff0000)#define MVNETA_BASE_ADDR_ENABLE 0x2290#define MVNETA_BASE_ADDR_ENABLE_BIT 0x1 +#define MVNETA_AC5_CNM_DDR_TARGET 0x2 +#define MVNETA_AC5_CNM_DDR_ATTR 0xb#define MVNETA_PORT_ACCESS_PROTECT 0x2294#define MVNETA_PORT_ACCESS_PROTECT_WIN0_RW 0x3#define MVNETA_PORT_CONFIG 0x2400@@ -282,6 +284,8 @@ struct mvneta_port {struct gpio_desc phy_reset_gpio;struct gpio_desc sfp_tx_disable_gpio;#endif + +uintptr_t dma_base;/* base address for DMA address decoding */ };/* The mvneta_tx_desc and mvneta_rx_desc structures describe the @@ -1343,6 +1347,29 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp)mvreg_write (pp,MVNETA_BASE_ADDR_ENABLE , win_enable); } +static void mvneta_conf_ac5_cnm_xbar_windows (struct mvneta_port *pp) +{ +int i; + +/* Clear all windows */ +for (i =0 ; i <6 ; i++) { +mvreg_write (pp,MVNETA_WIN_BASE (i),0 ); +mvreg_write (pp,MVNETA_WIN_SIZE (i),0 ); + +if (i <4 ) +mvreg_write (pp,MVNETA_WIN_REMAP (i),0 ); + } + +/* +* Setup window #0 base 0x0 to target XBAR port 2 (AMB2), attribute 0xb, size 4GB +* AMB2 address decoder remaps 0x0 to DDR 64 bit base address +*/ +mvreg_write (pp,MVNETA_WIN_BASE (0 ), + (MVNETA_AC5_CNM_DDR_ATTR <<8 ) |MVNETA_AC5_CNM_DDR_TARGET ); +mvreg_write (pp,MVNETA_WIN_SIZE (0 ),0xffff0000 ); +mvreg_write (pp,MVNETA_BASE_ADDR_ENABLE ,0x3e ); +} +/* Power up the port */ static int mvneta_port_power_up (struct mvneta_port *pp,int phy_mode) {@@ -1525,7 +1552,7 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)* No cache invalidation needed here, since the rx_buffer's are * located in a uncached memory region */ - *packetp = data; + *packetp = data + pp->dma_base;/* * Only mark one descriptor as free @@ -1544,6 +1571,10 @@ static int mvneta_probe(struct udevice *dev)struct ofnode_phandle_args sfp_args;#endif void *bd_space; +phys_addr_t cpu; +dma_addr_t bus; +u64 size; +int ret;/* * Allocate buffer area for descs and rx_buffers. This is only @@ -1577,9 +1608,18 @@ static int mvneta_probe(struct udevice *dev)/* Configure MBUS address windows */ if (device_is_compatible (dev,"marvell,armada-3700-neta" ))mvneta_bypass_mbus_windows (pp); +else if (device_is_compatible (dev,"marvell,armada-ac5-neta" )) +mvneta_conf_ac5_cnm_xbar_windows (pp);else mvneta_conf_mbus_windows (pp); +/* fetch dma ranges property */ + ret =dev_get_dma_range (dev, &cpu, &bus, &size); +if (!ret) + pp->dma_base = cpu; +else + pp->dma_base =0 ; +#if CONFIG_IS_ENABLED (DM_GPIO )if (!dev_read_phandle_with_args (dev,"sfp" ,NULL ,0 ,0 , &sfp_args) &&ofnode_is_enabled (sfp_args.node))@@ -1620,6 +1660,7 @@ static const struct eth_ops mvneta_ops = {
Quoted 10 lines
Quoted 9 lines
drivers/net/mvneta.c +1
-1static const struct udevice_id mvneta_ids[] = { { .compatible ="marvell,armada-370-neta" }, + { .compatible ="marvell,armada-ac5-neta" }, { .compatible ="marvell,armada-xp-neta" }, { .compatible ="marvell,armada-3700-neta" }, { } --2.38.1
Reviewed-by Ramon Fried <[email protected]>
Thanks. But sorry, I already applied this patch via the marvell tree. I hope this okay. I will try to wait a bit longer next time for networks related patches.
Thanks,
Stefan
PATCH v6 3/6 usb: ehci: ehci-marvell: Support for marvell,ac5-ehci
In reply to Chris PackhamUnlike the other 64-bit mvebu SoCs the AlleyCat5 uses the older ehci block from the 32-bit SoCs. Adapt the ehci-marvell.c driver to cope with the fact that the ac5 does not have the mbus infrastructure the 32-bit SoCs have and ensure USB_EHCI_IS_TDI is selected.
---
(no changes since v5)
Changes in v5:
- Minor white space cleanups
- Collect review from Stefan
drivers/usb/host/Kconfig | 1 + drivers/usb/host/ehci-marvell.c | 53 ++++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 8 deletions(-)
drivers/usb/host/Kconfig +1 -0
@@ -178,6 +178,7 @@ config USB_EHCI_MARVELL depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X default y select USB_EHCI_IS_TDI if !ARM64 + select USB_EHCI_IS_TDI if ALLEYCAT_5 ---help--- Enables support for the on-chip EHCI controller on MVEBU SoCs.
drivers/usb/host/ehci-marvell.c +45 -8
92 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH v6 4/6 pinctrl: mvebu: Add AlleyCat5 support
In reply to Chris PackhamThis uses the same IP block as the Armada-8K SoCs.
---
(no changes since v4)
Changes in v4:
- Collect r-by from Stefan
drivers/pinctrl/mvebu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mvebu/Kconfig +1 -1
@@ -15,7 +15,7 @@ config PINCTRL_ARMADA_37XX Marvell's Armada-37xx SoC. config PINCTRL_ARMADA_8K - depends on ARMADA_8K && PINCTRL_FULL + depends on (ARMADA_8K || ALLEYCAT_5) && PINCTRL_FULL bool "Armada 7k/8k pin control driver" help Support pin multiplexing and pin configuration control on
Signature · 1 line
2.38.1
PATCH v6 5/6 arm: mvebu: Support for 98DX25xx/98DX35xx SoC
In reply to Chris PackhamAdd support for the Allecat5/Alleycat5X SoC. These are L3 switches with an integrated CPU (referred to as the CnM block in Marvell's documentation). These have dual ARMv8.2 CPUs (Cortex-A55). This support has been ported from Marvell's SDK which is based on a much older version of U-Boot.
---
(no changes since v5)
Changes in v5:
- Minor fixup for checkpatch.pl complaint
Changes in v4:
- Remove unused mvebu_get_nand_clock() (will return in a later series)
- Remove unnecessary #ifdefs
- Misc style cleanups
- Replace CONFIG_MVEBU_SAR with simpler code implemented directly in soc.c based around get_sar_freq which the 32-bit platforms already use.
Changes in v3:
- Remove unnecessary dma-ranges property from ethernet nodes (mvneta now correctly parses the property from the parent node).
- Keep soc_print_clock_info and soc_print_device_info local to alleycat5.
arch/arm/dts/ac5-98dx25xx.dtsi | 277 +++++++++++++++++++++++ arch/arm/dts/ac5-98dx35xx.dtsi | 17 ++ arch/arm/mach-mvebu/Kconfig | 4 + arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/alleycat5/Makefile | 8 + arch/arm/mach-mvebu/alleycat5/cpu.c | 124 ++++++++++ arch/arm/mach-mvebu/alleycat5/soc.c | 298 +++++++++++++++++++++++++ arch/arm/mach-mvebu/alleycat5/soc.h | 7 + arch/arm/mach-mvebu/arm64-common.c | 5 + arch/arm/mach-mvebu/include/mach/cpu.h | 4 + 10 files changed, 745 insertions(+) create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.h
arch/arm/dts/ac5-98dx25xx.dtsi new file +277 -0
@@ -0,0 +1,277 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree For AC5. + * + * Copyright (C) 2021 Marvell + * Copyright (C) 2022 Allied Telesis Labs + */ + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> + +/ { + model = "Marvell AC5 SoC"; + compatible = "marvell,ac5"; + interrupt-parent = <&gic>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <2>; + #size-cells = <0>; + + cpu-map { + cluster0 { + core0 { + cpu = <&cpu0>; + }; + core1 { + cpu = <&cpu1>; + }; + }; + }; + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a55"; + reg = <0x0 0x0>; + enable-method = "psci"; + next-level-cache = <&l2>; + }; + + cpu1: cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a55"; + reg = <0x0 0x100>; + enable-method = "psci"; + next-level-cache = <&l2>; + }; + + l2: l2-cache { + compatible = "cache"; + }; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>, + <GIC_PPI 8 IRQ_TYPE_LEVEL_HIGH>, + <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>, + <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>; + }; + + pmu { + compatible = "arm,armv8-pmuv3"; + interrupts = <GIC_PPI 12 IRQ_TYPE_LEVEL_HIGH>; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + dma-ranges; + + internal-regs@7f000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + /* 16M internal register @ 0x7f00_0000 */ + ranges = <0x0 0x0 0x7f000000 0x1000000>; + dma-coherent; + + uart0: serial@12000 { + compatible = "snps,dw-apb-uart"; + reg = <0x12000 0x100>; + reg-shift = <2>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + reg-io-width = <1>; + clocks = <&cnm_clock>; + status = "okay"; + }; + + uart1: serial@12100 { + compatible = "snps,dw-apb-uart"; + reg = <0x12100 0x100>; + reg-shift = <2>; + reg-io-width = <1>; + clocks = <&cnm_clock>; + status = "disabled"; + }; + + uart2: serial@12200 { + compatible = "snps,dw-apb-uart"; + reg = <0x12200 0x100>; + reg-shift = <2>; + reg-io-width = <1>; + clocks = <&cnm_clock>; + status = "disabled"; + }; + + uart3: serial@12300 { + compatible = "snps,dw-apb-uart"; + reg = <0x12300 0x100>; + reg-shift = <2>; + reg-io-width = <1>; + clocks = <&cnm_clock>; + status = "disabled"; + }; + + mdio: mdio@22004 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,orion-mdio"; + reg = <0x22004 0x4>; + clocks = <&cnm_clock>; + }; + + i2c0: i2c@11000 { + compatible = "marvell,mv78230-i2c"; + reg = <0x11000 0x20>; + #address-cells = <1>; + #size-cells = <0>; + + clocks = <&cnm_clock>; + clock-names = "core"; + interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency=<100000>; + status = "disabled"; + }; + + i2c1: i2c@11100 { + compatible = "marvell,mv78230-i2c"; + reg = <0x11100 0x20>; + #address-cells = <1>; + #size-cells = <0>; + + clocks = <&cnm_clock>; + clock-names = "core"; + interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency=<100000>; + status = "disabled"; + }; + + gpio0: gpio@18100 { + compatible = "marvell,orion-gpio"; + reg = <0x18100 0x40>; + ngpios = <32>; + gpio-controller; + #gpio-cells = <2>; + status = "okay"; + }; + + gpio1: gpio@18140 { + reg = <0x18140 0x40>; + compatible = "marvell,orion-gpio"; + ngpios = <14>; + gpio-controller; + #gpio-cells = <2>; + status = "okay"; + }; + }; + + /* + * Dedicated section for devices behind 32bit controllers so we + * can configure specific DMA mapping for them + */ + behind-32bit-controller@7f000000 { + compatible = "simple-bus"; + #address-cells = <0x2>; + #size-cells = <0x2>; + ranges = <0x0 0x0 0x0 0x7f000000 0x0 0x1000000>; + /* Host phy ram starts at 0x200M */ + dma-ranges = <0x0 0x0 0x2 0x0 0x1 0x0>; + dma-coherent; + + eth0: ethernet@20000 { + compatible = "marvell,armada-ac5-neta"; + reg = <0x0 0x20000 0x0 0x4000>; + interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cnm_clock>; + phy-mode = "sgmii"; + status = "disabled"; + }; + + eth1: ethernet@24000 { + compatible = "marvell,armada-ac5-neta"; + reg = <0x0 0x24000 0x0 0x4000>; + interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cnm_clock>; + phy-mode = "sgmii"; + status = "disabled"; + }; + + usb0: usb@80000 { + compatible = "marvell,ac5-ehci"; + reg = <0x0 0x80000 0x0 0x500>; + interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + usb1: usb@a0000 { + compatible = "marvell,ac5-ehci"; + reg = <0x0 0xa0000 0x0 0x500>; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + }; + + pinctrl0: pinctrl@80020100 { + compatible = "marvell,mvebu-pinctrl"; + reg = <0 0x80020100 0 0x20>; + pin-count = <46>; + max-func = <0xf>; + status = "okay"; + }; + + spi0: spi@805a0000 { + compatible = "marvell,armada-3700-spi"; + reg = <0x0 0x805a0000 0x0 0x50>; + #address-cells = <0x1>; + #size-cells = <0x0>; + clocks = <&spi_clock>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + num-cs = <1>; + status = "disabled"; + }; + + spi1: spi@805a8000 { + compatible = "marvell,armada-3700-spi"; + reg = <0x0 0x805a8000 0x0 0x50>; + #address-cells = <0x1>; + #size-cells = <0x0>; + clocks = <&spi_clock>; + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; + num-cs = <1>; + status = "disabled"; + }; + + gic: interrupt-controller@80600000 { + compatible = "arm,gic-v3"; + #interrupt-cells = <3>; + interrupt-controller; + reg = <0x0 0x80600000 0x0 0x10000>, /* GICD */ + <0x0 0x80660000 0x0 0x40000>; /* GICR */ + interrupts = <GIC_PPI 6 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + + clocks { + cnm_clock: cnm-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <328000000>; + }; + + spi_clock: spi-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <200000000>; + }; + }; +};
arch/arm/dts/ac5-98dx35xx.dtsi new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree For AC5X. + * + * Copyright (C) 2022 Allied Telesis Labs + */ + +#include "ac5-98dx25xx.dtsi" + +/ { + model = "Marvell AC5X SoC"; + compatible = "marvell,ac5x", "marvell,ac5"; +}; + +&cnm_clock { + clock-frequency = <325000000>; +};
arch/arm/mach-mvebu/Kconfig +4 -0
@@ -50,6 +50,10 @@ config ARMADA_8K bool select ARM64 +config ALLEYCAT_5 + bool + select ARM64 + # Armada PLL frequency (used for NAND clock generation) config SYS_MVEBU_PLL_CLOCK int
arch/arm/mach-mvebu/Makefile +1 -0
@@ -6,6 +6,7 @@ ifdef CONFIG_ARM64 obj-$(CONFIG_ARMADA_3700) += armada3700/ obj-$(CONFIG_ARMADA_8K) += armada8k/ +obj-$(CONFIG_ALLEYCAT_5) += alleycat5/ obj-y += arm64-common.o else # CONFIG_ARM64
arch/arm/mach-mvebu/alleycat5/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# +# Copyright (C) 2016 Stefan Roese <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y = cpu.o +obj-y += soc.o
arch/arm/mach-mvebu/alleycat5/cpu.c new file +124 -0
124 lines not on this page · raw message
arch/arm/mach-mvebu/alleycat5/soc.c new file +298 -0
298 lines not on this page · raw message
arch/arm/mach-mvebu/alleycat5/soc.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _ALLEYCAT5_SOC_H +#define _ALLEYCAT5_SOC_H +void soc_print_device_info (void ); +void soc_print_clock_info (void ); +#endif /* _ALLEYCAT5_SOC_H */
arch/arm/mach-mvebu/arm64-common.c +5 -0
@@ -53,6 +53,8 @@ __weak int dram_init_banksize(void)return a8k_dram_init_banksize (); else if (CONFIG_IS_ENABLED(ARMADA_3700)) return a3700_dram_init_banksize(); + else if (CONFIG_IS_ENABLED(ALLEYCAT_5)) + return alleycat5_dram_init_banksize(); else return fdtdec_setup_memory_banksize(); }
@@ -68,6 +70,9 @@ __weak int dram_init(void)if (CONFIG_IS_ENABLED (ARMADA_3700 ))return a3700_dram_init (); +if (CONFIG_IS_ENABLED (ALLEYCAT_5 )) +return alleycat5_dram_init (); +if (fdtdec_setup_mem_size_base () !=0 )return -EINVAL ;
arch/arm/mach-mvebu/include/mach/cpu.h +4 -0
@@ -174,6 +174,10 @@ int a3700_dram_init_banksize(void);/* A3700 PCIe regions fixer for device tree */ int a3700_fdt_fix_pcie_regions (void *blob); +/* Alleycat5 dram functions */ +int alleycat5_dram_init (void ); +int alleycat5_dram_init_banksize (void ); +/* * get_ref_clk *
Signature · 1 line
2.38.1
PATCH v6 6/6 arm: mvebu: Add RD-AC5X board
In reply to Chris PackhamThe RD-AC5X-32G16HVG6HLG-A0 development board main components and features include:
* Main 12V/54V power supply
* 270 Gbps throughput packet processor on the main board
* DDR4:
* SR1: 2GB DDR4 2400MT/S(1GB x 2 pcs ) with ECC(1GB x 1 pcs)
* SR2: 4GB DDR4 2400MT/S(2GB x 2 pcs ) with ECC(2GB x 1 pcs)
* PCB co-layout with 4GB device to support 8GB (Dual CS) requirement
* 16GB eMMC (Samsung KLMAG1JETD-B041006)
* 16MB SPI NOR(GD25Q127C)
* 32 x 1000 Base-T interfaces
* 16 x 2500 Base-T interfaces
* SR1: 88E2540*4
* SR2: 88E2580*1+88E2540*2
* Six (6) x 25G Base-R SFP28 interfaces
* One (1) x RJ-45 console connector, interfacing to the on board UART
* One (1) x USB Type-A connector, interfacing to the USB 2.0 port (0)
* One (1) x USB Type-mini B connector, interfacing to the USB 2.0 port (1)
* One (1) x RJ-45 1G Base-T Management port, interfacing to the host port (shared with PCIe) Connected to 88E1512 Gigabit Ethernet Phy
* One (1) x Oculink port, interfacing to the PCIe port for external CPU connection
* POE 802.3AT support on Port 1 ~ Port 32, 802.3BT support on Port 33 ~ Port 48 (Microsemi PD69208T4, PD69208M or TI TPS2388,TPS23881 solution)
* POE total power budget 780W
* LED interfaces per network port/POE
* LED interfaces (common) showing system status
* PTP TC mode Supported (Reserved M.2 connector to support BC mode)
---
Changes in v6:
- Set CONFIG_DEFAULT_DEVICE_TREE and CONFIG_TEXT_BASE
Changes in v5:
- Remove unused bpard_{early,late}_init{,_r,_f} functions
- Remove CPNFIG_PCI and CONFIG_E1000 as the PCI interface is not currently working (requires more vendor code)
- Use CONFIG_OF_SEPARATE instead of CONFIG_OF_EMBED
Changes in v4:
- Move CONFIG_DISPLAY_BOARDINFO_LATE and CONFIG_ENV_OVERWRITE to the defconfig.
- Remove CONFIG_BAUDRATE as this is already set in the default config
- Remove CONFIG_USB_MAX_CONTROLLER_COUNT as this is not needed with DM_USB
- Remove CONFIG_PREBOOT as we don't have anything to run
- Remove commented out CONFIG_BOARD_EARLY_INIT_R
- Remove DEBUG_UART configuration
- Remove unnecessary console environment variable
- Remove CONFIG_MVEBU_SAR
Changes in v3:
- Remove MMC and UBIFS distroboot options (MMC driver is not currently functional, NAND is not populated on the RD-AC5X board)
- Remove unnecessary Ethernet configuration
- Remove unnecessary NAND configuration
- Remove memory node from dts so the value passed by the DDR FW will be used
Changes in v2:
- Use distro boot by default
- remove unnecessary SPI-NOR partitions
arch/arm/dts/Makefile | 3 +- arch/arm/dts/ac5-98dx35xx-rd.dts | 129 +++++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 9 +- board/Marvell/mvebu_alleycat-5/MAINTAINERS | 6 + board/Marvell/mvebu_alleycat-5/Makefile | 3 + board/Marvell/mvebu_alleycat-5/board.c | 13 +++ configs/mvebu_ac5_rd_defconfig | 81 +++++++++++++ include/configs/mvebu_alleycat-5.h | 42 +++++++ 8 files changed, 284 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/ac5-98dx35xx-rd.dts create mode 100644 board/Marvell/mvebu_alleycat-5/MAINTAINERS create mode 100644 board/Marvell/mvebu_alleycat-5/Makefile create mode 100644 board/Marvell/mvebu_alleycat-5/board.c create mode 100644 configs/mvebu_ac5_rd_defconfig create mode 100644 include/configs/mvebu_alleycat-5.h
arch/arm/dts/Makefile +2 -1
@@ -278,7 +278,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ cn9132-db-A.dtb \ cn9132-db-B.dtb \ cn9130-crb-A.dtb \ - cn9130-crb-B.dtb + cn9130-crb-B.dtb \ + ac5-98dx35xx-rd.dtb endif dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
arch/arm/dts/ac5-98dx35xx-rd.dts new file +129 -0
129 lines not on this page · raw message
arch/arm/mach-mvebu/Kconfig +8 -1
@@ -98,7 +98,7 @@ config CUSTOMER_BOARD_SUPPORT bool choice - prompt "Armada XP/375/38x/3700/7K/8K board select" + prompt "Armada XP/375/38x/3700/7K/8K/Alleycat-5 board select" optional config TARGET_CLEARFOG
@@ -150,6 +150,10 @@ config TARGET_MVEBU_ARMADA_8K select BOARD_LATE_INIT imply SCSI +config TARGET_MVEBU_ALLEYCAT5 + bool "Support AlleyCat 5 platforms" + select ALLEYCAT_5 + config TARGET_OCTEONTX2_CN913x bool "Support CN913x platforms" select ARMADA_8K
@@ -258,6 +262,7 @@ config SYS_BOARD default "x530" if TARGET_X530 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 + default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5 config SYS_CONFIG_NAME default "clearfog" if TARGET_CLEARFOG
@@ -278,6 +283,7 @@ config SYS_CONFIG_NAME default "x530" if TARGET_X530 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 + default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5 config SYS_VENDOR default "Marvell" if TARGET_DB_MV784MP_GP
@@ -297,6 +303,7 @@ config SYS_VENDOR default "gdsys" if TARGET_CONTROLCENTERDC default "alliedtelesis" if TARGET_X530 default "mikrotik" if TARGET_CRS3XX_98DX3236 + default "Marvell" if TARGET_MVEBU_ALLEYCAT5 config SYS_SOC default "mvebu"
board/Marvell/mvebu_alleycat-5/MAINTAINERS new file +6 -0
@@ -0,0 +1,6 @@ +RD-AC5X BOARD +M: Chris Packham <[email protected]> +S: Maintained +F: board/Marvell/mvebu_alleycat-5/ +F: include/configs/mvebu_alleycat-5.h +F: configs/mvebu_ac5_rd_defconfig
board/Marvell/mvebu_alleycat-5/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-y := board.o
board/Marvell/mvebu_alleycat-5/board.c new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include <common.h> +#include <asm/global_data.h> + +DECLARE_GLOBAL_DATA_PTR ; + +int board_init (void ) +{ + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + +return 0 ; +}
configs/mvebu_ac5_rd_defconfig new file +81 -0
81 lines not on this page · raw message
include/configs/mvebu_alleycat-5.h new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.38.1
Quoted 89 lines · Chris Packham
These patches are based on Marvell's bootloader for the AlleyCat5/5X which was based on u-boot 2018.03. I've split that code into consumable chunks and dropped as much unnecessary stuff as I can. I've also tried to sync the device trees as much as possible with the support that will land in Linux 6.0 although there are still some differences
Changes in v6:
- SetCONFIG_DEFAULT_DEVICE_TREEandCONFIG_TEXT_BASEChanges in v5:
- Minor white space cleanups
- Collect review from Stefan
- Minor fixup for checkpatch.pl complaint
- Remove unused bpard_{early,late}_init{,_r,_f} functions
- RemoveCPNFIG_PCIandCONFIG_E1000as the PCI interface is not currently working (requires more vendor code)
- UseCONFIG_OF_SEPARATEinstead ofCONFIG_OF_EMBEDChanges in v4:
- Collect r-by from Stefan
- Remove unusedmvebu_get_nand_clock()(will return in a later series)
- Remove unnecessary #ifdefs
- Misc style cleanups
- ReplaceCONFIG_MVEBU_SARwith simpler code implemented directly insoc.cbased aroundget_sar_freqwhich the 32-bit platforms already use.
- MoveCONFIG_DISPLAY_BOARDINFO_LATEandCONFIG_ENV_OVERWRITEto the defconfig.
- RemoveCONFIG_BAUDRATEas this is already set in the default config
- RemoveCONFIG_USB_MAX_CONTROLLER_COUNTas this is not needed withDM_USB
- RemoveCONFIG_PREBOOTas we don't have anything to run
- Remove commented outCONFIG_BOARD_EARLY_INIT_R
- RemoveDEBUG_UARTconfiguration
- Remove unnecessary console environment variable
- RemoveCONFIG_MVEBU_SARChanges in v3:
- Remove unnecessary changes to RX descriptor handling
- Usedev_get_dma_range()to parse dma-ranges property from parent device.
- Remove unnecessary dma-ranges property from ethernet nodes (mvneta now correctly parses the property from the parent node).
- Keepsoc_print_clock_infoandsoc_print_device_infolocal to alleycat5.
- Remove MMC and UBIFS distroboot options (MMC driver is not currently functional, NAND is not populated on the RD-AC5X board)
- Remove unnecessary Ethernet configuration
- Remove unnecessary NAND configuration
- Remove memory node from dts so the value passed by the DDR FW will be usedChanges in v2:
- Use distro boot by default
- remove unnecessary SPI-NOR partitionsChris Packham (6):
arm: mvebu: Don't useCONFIG_TIMERon ARM64
net: mvneta: Add support for AlleyCat5
usb: ehci: ehci-marvell: Support for marvell,ac5-ehci
pinctrl: mvebu: Add AlleyCat5 support
arm: mvebu: Support for 98DX25xx/98DX35xx SoC
arm: mvebu: Add RD-AC5X boardarch/arm/Kconfig | 2 +- arch/arm/dts/Makefile | 3 +- arch/arm/dts/ac5-98dx25xx.dtsi | 277 +++++++++++++++++++ arch/arm/dts/ac5-98dx35xx-rd.dts | 129 +++++++++ arch/arm/dts/ac5-98dx35xx.dtsi | 17 ++ arch/arm/mach-mvebu/Kconfig | 13 +- arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/alleycat5/Makefile | 8 + arch/arm/mach-mvebu/alleycat5/cpu.c | 124 +++++++++ arch/arm/mach-mvebu/alleycat5/soc.c | 298 +++++++++++++++++++++ arch/arm/mach-mvebu/alleycat5/soc.h | 7 + arch/arm/mach-mvebu/arm64-common.c | 5 + arch/arm/mach-mvebu/include/mach/cpu.h | 4 + board/Marvell/mvebu_alleycat-5/MAINTAINERS | 6 + board/Marvell/mvebu_alleycat-5/Makefile | 3 + board/Marvell/mvebu_alleycat-5/board.c | 13 + configs/mvebu_ac5_rd_defconfig | 81 ++++++ drivers/net/Kconfig | 2 +- drivers/net/mvneta.c | 43 ++- drivers/pinctrl/mvebu/Kconfig | 2 +- drivers/usb/host/Kconfig | 1 + drivers/usb/host/ehci-marvell.c | 53 +++- include/configs/mvebu_alleycat-5.h | 42 +++ 23 files changed, 1120 insertions(+), 14 deletions(-)
Quoted 13 lines
create mode 100644
arch/arm/dts/ac5-98dx25xx.dtsicreate mode 100644arch/arm/dts/ac5-98dx35xx-rd.dtscreate mode 100644arch/arm/dts/ac5-98dx35xx.dtsicreate mode 100644arch/arm/mach-mvebu/alleycat5/Makefilecreate mode 100644arch/arm/mach-mvebu/alleycat5/cpu.ccreate mode 100644arch/arm/mach-mvebu/alleycat5/soc.ccreate mode 100644arch/arm/mach-mvebu/alleycat5/soc.hcreate mode 100644 board/Marvell/mvebu_alleycat-5/MAINTAINERS create mode 100644 board/Marvell/mvebu_alleycat-5/Makefile create mode 100644board/Marvell/mvebu_alleycat-5/board.ccreate mode 100644 configs/mvebu_ac5_rd_defconfig create mode 100644include/configs/mvebu_alleycat-5.h
Applied to u-boot-marvell/master
Thanks,
Stefan