arm: mvebu: Updates for xcat3
Subsystems (5)
v3 cover arm: mvebu: Updates for xcat3
This series fixes an issue I was seeing on some xcat3 boards. I've also included a new board that we've had in a downstream fork for some time.
Chris Packham (3):
mtd: nand: pxa3xx: Pass valid dev to dev_err()
arm: mvebu: db-xc3-24g4xg: Remove marvell,nand-keep-config
arm: mvebu: Add Allied Telesis x220
arch/arm/dts/Makefile | 1 + arch/arm/dts/armada-xp-atl-x220.dts | 162 ++++++++++++++++++ .../dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 1 - arch/arm/mach-mvebu/Kconfig | 7 + board/alliedtelesis/x220/.gitattributes | 1 + board/alliedtelesis/x220/.gitignore | 1 + board/alliedtelesis/x220/MAINTAINERS | 7 + board/alliedtelesis/x220/Makefile | 14 ++ board/alliedtelesis/x220/README | 4 + board/alliedtelesis/x220/binary.0 | Bin 0 -> 423 bytes board/alliedtelesis/x220/kwbimage.cfg.in | 12 ++ board/alliedtelesis/x220/x220.c | 67 ++++++++ configs/x220_defconfig | 76 ++++++++ drivers/mtd/nand/raw/pxa3xx_nand.c | 11 +- include/configs/x220.h | 20 +++ 15 files changed, 377 insertions(+), 7 deletions(-) create mode 100644 arch/arm/dts/armada-xp-atl-x220.dts create mode 100644 board/alliedtelesis/x220/.gitattributes create mode 100644 board/alliedtelesis/x220/.gitignore create mode 100644 board/alliedtelesis/x220/MAINTAINERS create mode 100644 board/alliedtelesis/x220/Makefile create mode 100644 board/alliedtelesis/x220/README create mode 100644 board/alliedtelesis/x220/binary.0 create mode 100644 board/alliedtelesis/x220/kwbimage.cfg.in create mode 100644 board/alliedtelesis/x220/x220.c create mode 100644 configs/x220_defconfig create mode 100644 include/configs/x220.h
Signature · 1 line
2.52.0
PATCH v3 1/3 mtd: nand: pxa3xx: Pass valid dev to dev_err()
info->controller.active is not initialised so the dev_err() call ends up dereferencing a null pointer causing a crash instead of outputting the error. Add a dev member to struct pxa3xx_nand_info and use that instead of info->controller.active->mtd.dev.
---
Cc: Sean Anderson <[email protected]>
Notes:
Changes in v2:
- Add a dev member to pxa3xx_nand_info so we can keep using dev_err()
drivers/mtd/nand/raw/pxa3xx_nand.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/mtd/nand/raw/pxa3xx_nand.c +5 -6
@@ -187,6 +187,7 @@ struct pxa3xx_nand_host {struct pxa3xx_nand_info {struct nand_hw_control controller;struct pxa3xx_nand_platform_data *pdata; +struct udevice *dev;struct clk *clk;void __iomem *mmio_base;
@@ -588,8 +589,7 @@ static void drain_fifo(struct pxa3xx_nand_info *info, void *data, int len) ts =get_timer (0 );while (!(nand_readl (info,NDSR ) &NDSR_RDDREQ )) {if (get_timer (ts) >TIMEOUT_DRAIN_FIFO ) { -dev_err (info->controller.active->mtd.dev, -"Timeout on RDDREQ while draining the FIFO\n" ); +dev_err (info->dev,"Timeout on RDDREQ while draining the FIFO\n" );return ; } }
@@ -641,8 +641,7 @@ static void handle_data_pio(struct pxa3xx_nand_info *info) DIV_ROUND_UP(info->step_spare_size, 4));break ;default : -dev_err (info->controller.active->mtd.dev, -"%s: invalid state %d\n" , __func__, info->state); +dev_err (info->dev,"%s: invalid state %d\n" , __func__, info->state);BUG (); }
@@ -1560,8 +1559,7 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info, ecc->size =512 ;if (ecc_stepsize !=512 || !(nfc_layouts[i].strength)) { -dev_err (info->controller.active->mtd.dev, -"ECC strength %d at page size %d is not supported\n" , +dev_err (info->dev,"ECC strength %d at page size %d is not supported\n" , strength, page_size);return -ENODEV ; }
@@ -1802,6 +1800,7 @@ static int pxa3xx_nand_probe(struct udevice *dev)if (ret)return ret; + info->dev = dev; pdata = info->pdata; ret =alloc_nand_resource (dev, info);
Signature · 1 line
2.52.0
Re: [PATCH v3 1/3] mtd: nand: pxa3xx: Pass valid dev to dev_err()
Quoted 9 lines · Chris Packham
info->controller.activeis not initialised so thedev_err()call ends up dereferencing a null pointer causing a crash instead of outputting the error. Add a dev member to structpxa3xx_nand_infoand use that instead ofinfo->controller.active->mtd.dev.Fixes 661c98121d49 ("mtd: nand: pxa3xx: Fix not calling dev_xxx with a device")Signed-off-by Chris Packham <[email protected]>---
Cc: Sean Anderson <[email protected]>
Thanks,
Stefan
Quoted 58 lines
Notes:
Changes in v2:
- Add a dev member topxa3xx_nand_infoso we can keep usingdev_err()drivers/mtd/nand/raw/pxa3xx_nand.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)drivers/mtd/nand/raw/pxa3xx_nand.c +5
-6@@ -187,6 +187,7 @@ struct pxa3xx_nand_host {struct pxa3xx_nand_info {struct nand_hw_control controller;struct pxa3xx_nand_platform_data *pdata; +struct udevice *dev;struct clk *clk;void __iomem *mmio_base;@@ -588,8 +589,7 @@ static void drain_fifo(struct pxa3xx_nand_info *info, void *data, int len) ts =get_timer (0 );while (!(nand_readl (info,NDSR ) &NDSR_RDDREQ )) {if (get_timer (ts) >TIMEOUT_DRAIN_FIFO ) { -dev_err (info->controller.active->mtd.dev, -"Timeout on RDDREQ while draining the FIFO\n" ); +dev_err (info->dev,"Timeout on RDDREQ while draining the FIFO\n" );return ; } }@@ -641,8 +641,7 @@ static void handle_data_pio(struct pxa3xx_nand_info *info) DIV_ROUND_UP(info->step_spare_size, 4));break ;default : -dev_err (info->controller.active->mtd.dev, -"%s: invalid state %d\n" , __func__, info->state); +dev_err (info->dev,"%s: invalid state %d\n" , __func__, info->state);BUG (); }@@ -1560,8 +1559,7 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info, ecc->size =512 ;if (ecc_stepsize !=512 || !(nfc_layouts[i].strength)) { -dev_err (info->controller.active->mtd.dev, -"ECC strength %d at page size %d is not supported\n" , +dev_err (info->dev,"ECC strength %d at page size %d is not supported\n" , strength, page_size);return -ENODEV ; }@@ -1802,6 +1800,7 @@ static int pxa3xx_nand_probe(struct udevice *dev)if (ret)return ret; + info->dev = dev; pdata = info->pdata; ret =alloc_nand_resource (dev, info);
Re: [PATCH v3 1/3] mtd: nand: pxa3xx: Pass valid dev to dev_err()
In reply to Chris PackhamQuoted 7 lines · Chris Packham
info->controller.activeis not initialised so thedev_err()call ends up dereferencing a null pointer causing a crash instead of outputting the error. Add a dev member to structpxa3xx_nand_infoand use that instead ofinfo->controller.active->mtd.dev.Fixes 661c98121d49 ("mtd: nand: pxa3xx: Fix not calling dev_xxx with a device")Signed-off-by Chris Packham <[email protected]>
Applied to u-boot-marvell/next
Thanks,
Stefan
PATCH v3 2/3 arm: mvebu: db-xc3-24g4xg: Remove marvell, nand-keep-config
In reply to Chris Packhamnand-keep-config is used to retain the NAND controller configuration from an earlier boot stage. In U-Boot's case there isn't an earlier boot stage so reconfiguring the NAND controller is required.
---
Notes:
Changes in v2:
- None
arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi +0 -1
@@ -5,7 +5,6 @@ status = "okay"; label = "pxa3xx_nand-0"; nand-rb = <0>; - marvell,nand-keep-config; nand-on-flash-bbt; nand-ecc-strength = <4>; nand-ecc-step-size = <512>;
Signature · 1 line
2.52.0
Re: [PATCH v3 2/3] arm: mvebu: db-xc3-24g4xg: Remove marvell,nand-keep-config
Quoted 5 lines · Chris Packham
nand-keep-config is used to retain the NAND controller configuration from an earlier boot stage. In U-Boot's case there isn't an earlier boot stage so reconfiguring the NAND controller is required.
Signed-off-by Chris Packham <[email protected]>
Thanks,
Stefan
Quoted 21 lines
---
Notes:
Changes in v2:
- Nonearch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 1 - 1 file changed, 1 deletion(-)arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi +0
-1@@ -5,7 +5,6 @@ status = "okay"; label = "pxa3xx_nand-0"; nand-rb = <0>; - marvell,nand-keep-config; nand-on-flash-bbt; nand-ecc-strength = <4>; nand-ecc-step-size = <512>;
Re: [PATCH v3 2/3] arm: mvebu: db-xc3-24g4xg: Remove marvell, nand-keep-config
In reply to Chris PackhamQuoted 5 lines · Chris Packham
nand-keep-config is used to retain the NAND controller configuration from an earlier boot stage. In U-Boot's case there isn't an earlier boot stage so reconfiguring the NAND controller is required.
Signed-off-by Chris Packham <[email protected]>
Applied to u-boot-marvell/next
Thanks,
Stefan
PATCH v3 3/3 arm: mvebu: Add Allied Telesis x220
In reply to Chris PackhamAdd the Allied Telesis x220 board. There are a number of other variants with the same CPU block that are sold under some different brand names but the x220 was first.
The x220 uses the AlleyCat3 switch chip with integrated ARMv7 CPU. Because of this it is reliant on a binary blob for the DDR training. In upstream u-boot this is replaced by an empty file.
---
Notes:
Changes in v3:
- Move README to new style doc/board
Changes in v2:
- None
arch/arm/dts/Makefile | 1 + arch/arm/dts/armada-xp-atl-x220.dts | 162 +++++++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 7 + board/alliedtelesis/x220/.gitattributes | 1 + board/alliedtelesis/x220/.gitignore | 1 + board/alliedtelesis/x220/MAINTAINERS | 8 ++ board/alliedtelesis/x220/Makefile | 14 ++ board/alliedtelesis/x220/binary.0 | Bin 0 -> 423 bytes board/alliedtelesis/x220/kwbimage.cfg.in | 12 ++ board/alliedtelesis/x220/x220.c | 67 ++++++++++ configs/x220_defconfig | 76 +++++++++++ doc/board/alliedtelesis/index.rst | 11 ++ doc/board/alliedtelesis/x220.rst | 39 ++++++ doc/board/index.rst | 1 + include/configs/x220.h | 20 +++ 15 files changed, 420 insertions(+) create mode 100644 arch/arm/dts/armada-xp-atl-x220.dts create mode 100644 board/alliedtelesis/x220/.gitattributes create mode 100644 board/alliedtelesis/x220/.gitignore create mode 100644 board/alliedtelesis/x220/MAINTAINERS create mode 100644 board/alliedtelesis/x220/Makefile create mode 100644 board/alliedtelesis/x220/binary.0 create mode 100644 board/alliedtelesis/x220/kwbimage.cfg.in create mode 100644 board/alliedtelesis/x220/x220.c create mode 100644 configs/x220_defconfig create mode 100644 doc/board/alliedtelesis/index.rst create mode 100644 doc/board/alliedtelesis/x220.rst create mode 100644 include/configs/x220.h
arch/arm/dts/Makefile +1 -0
@@ -155,6 +155,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-gp.dtb \ armada-388-helios4.dtb \ armada-38x-controlcenterdc.dtb \ + armada-xp-atl-x220.dtb \ armada-xp-crs305-1g-4s.dtb \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \
arch/arm/dts/armada-xp-atl-x220.dts new file +162 -0
162 lines not on this page · raw message
arch/arm/mach-mvebu/Kconfig +7 -0
@@ -226,6 +226,10 @@ config TARGET_X240 select ALLEYCAT_5 imply BOOTSTD_DEFAULTS +config TARGET_X220 + bool "Support Allied Telesis x220" + select 98DX3336 + config TARGET_DB_XC3_24G4XG bool "Support DB-XC3-24G4XG" select 98DX3336
@@ -310,6 +314,7 @@ config SYS_BOARD default "x530" if TARGET_X530 default "x250" if TARGET_X250 default "x240" if TARGET_X240 + default "x220" if TARGET_X220 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
@@ -335,6 +340,7 @@ config SYS_CONFIG_NAME default "x530" if TARGET_X530 default "x250" if TARGET_X250 default "x240" if TARGET_X240 + default "x220" if TARGET_X220 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
@@ -360,6 +366,7 @@ config SYS_VENDOR default "alliedtelesis" if TARGET_X530 default "alliedtelesis" if TARGET_X250 default "alliedtelesis" if TARGET_X240 + default "alliedtelesis" if TARGET_X220 default "mikrotik" if TARGET_CRS3XX_98DX3236 default "Marvell" if TARGET_MVEBU_ALLEYCAT5
board/alliedtelesis/x220/.gitattributes new file +1 -0
@@ -0,0 +1 @@ +binary.0 binary
board/alliedtelesis/x220/.gitignore new file +1 -0
@@ -0,0 +1 @@ +kwbimage.cfg
board/alliedtelesis/x220/MAINTAINERS new file +8 -0
@@ -0,0 +1,8 @@ +x220 BOARD +M: Chris Packham <[email protected]> +S: Maintained +F: board/alliedtelesis/x220 +F: include/configs/x220.h +F: configs/x220_defconfig +F: arch/arm/dts/armada-xp-atl-x220.dts +F: doc/board/alliedtelesis/x220.rst
board/alliedtelesis/x220/Makefile new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2025 Allied Telesis Labs + +obj-y := x220.o +extra-y := kwbimage.cfg + +quiet_cmd_sed = SED $@ + cmd_sed = sed $(SEDFLAGS_$(@F)) $< >$(dir $@)$(@F) + +SEDFLAGS_kwbimage.cfg =-e "s|^BINARY.*|BINARY $(srctree)/$(@D)/binary.0 0000005b 00000068|" +$(obj)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \ + include/config/auto.conf + $(call if_changed,sed)
board/alliedtelesis/x220/binary.0 new file binary +0 -0
board/alliedtelesis/x220/kwbimage.cfg.in new file +12 -0
@@ -0,0 +1,12 @@ +# +# Copyright (C) 2025 Allied Telesis Labs +# + +# Armada XP uses version 1 image format +VERSION 1 + +# Boot Media configurations +BOOT_FROM spi + +# Binary Header (bin_hdr) with DDR3 training code +BINARY board/alliedtelesis/x220/binary.0 0000005b 00000068
board/alliedtelesis/x220/x220.c new file +67 -0
67 lines not on this page · raw message
configs/x220_defconfig new file +76 -0
76 lines not on this page · raw message
doc/board/alliedtelesis/index.rst new file +11 -0
@@ -0,0 +1,11 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2026 Allied Telesis Labs + +Allied Telesis +============== + +.. toctree:: + :maxdepth: 2 + + x220 +
doc/board/alliedtelesis/x220.rst new file +39 -0
@@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2026 Allied Telesis Labs + +x220 Platforms +============== + +Introduction +------------ + +The x220 has is a range of L2+ switches using the Marvell AlleyCat3 switch with +integrated ARMv7 CPU. It is also sold under some different brands for different +markets. + +- x220-52GP +- x220-52GT +- x220-28GS +- GS980M/52PS +- GS980M/52 +- x230-52 + +DDR Traning (binhdr) +-------------------- + +The AlleyCat3 uses a binary blob for it's DDR training. This is launched by +the built-in bootloader prior to U-Boot starting. + +To generate binary.0 from Marvell's bin_hdr.elf use the following command + +.. prompt:: bash $ + + arm-softfloat-linux-gnueabi-objcopy -S -O binary bin_hdr.elf \ + board/alliedtelesis/x220/binary.0 + +Alternatively, it is possible to extract the binary.0 from an existing U-Boot +image + +.. prompt:: bash $ + + ./tools/dumpimage -T kwbimage -p 1 -o board/alliedtelesis/x220/binary.0 u-boot.kwb
doc/board/index.rst +1 -0
@@ -10,6 +10,7 @@ Board-specific doc actions/index advantech/index andestech/index + alliedtelesis/index allwinner/index amlogic/index anbernic/index
include/configs/x220.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2025 Allied Telesis Labs +*/ + +#ifndef _CONFIG_X220_H +#define _CONFIG_X220_H + +/* Keep device tree and initrd in lower memory so the kernel can access them */ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdt_high=0x10000000\0" \ + "initrd_high=0x10000000\0" + +/* +* mv-common.h should be defined after CMD configs since it used them +* to enable certain macros +*/ +#include "mv-common.h" + +#endif /* _CONFIG_X220_H */
Signature · 1 line
2.52.0
Re: [PATCH v3 3/3] arm: mvebu: Add Allied Telesis x220
Quoted 9 lines · Chris Packham
Add the Allied Telesis x220 board. There are a number of other variants with the same CPU block that are sold under some different brand names but the x220 was first.
The x220 uses the AlleyCat3 switch chip with integrated ARMv7 CPU. Because of this it is reliant on a binary blob for the DDR training. In upstream u-boot this is replaced by an empty file.
Signed-off-by Chris Packham <[email protected]>
Thanks,
Stefan
Quoted 592 lines
---
Notes:
Changes in v3:
- Move README to new style doc/board
Changes in v2:
- Nonearch/arm/dts/Makefile | 1 + arch/arm/dts/armada-xp-atl-x220.dts | 162 +++++++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 7 + board/alliedtelesis/x220/.gitattributes | 1 + board/alliedtelesis/x220/.gitignore | 1 + board/alliedtelesis/x220/MAINTAINERS | 8 ++ board/alliedtelesis/x220/Makefile | 14 ++ board/alliedtelesis/x220/binary.0 | Bin 0 -> 423 bytes board/alliedtelesis/x220/kwbimage.cfg.in | 12 ++ board/alliedtelesis/x220/x220.c | 67 ++++++++++ configs/x220_defconfig | 76 +++++++++++ doc/board/alliedtelesis/index.rst | 11 ++ doc/board/alliedtelesis/x220.rst | 39 ++++++ doc/board/index.rst | 1 + include/configs/x220.h | 20 +++ 15 files changed, 420 insertions(+)create mode 100644
arch/arm/dts/armada-xp-atl-x220.dtscreate mode 100644 board/alliedtelesis/x220/.gitattributes create mode 100644 board/alliedtelesis/x220/.gitignore create mode 100644 board/alliedtelesis/x220/MAINTAINERS create mode 100644 board/alliedtelesis/x220/Makefile create mode 100644 board/alliedtelesis/x220/binary.0 create mode 100644 board/alliedtelesis/x220/kwbimage.cfg.in create mode 100644board/alliedtelesis/x220/x220.ccreate mode 100644 configs/x220_defconfig
create mode 100644doc/board/alliedtelesis/index.rstcreate mode 100644doc/board/alliedtelesis/x220.rstcreate mode 100644include/configs/x220.harch/arm/dts/Makefile +1
-0@@ -155,6 +155,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-gp.dtb \ armada-388-helios4.dtb \ armada-38x-controlcenterdc.dtb \ + armada-xp-atl-x220.dtb \ armada-xp-crs305-1g-4s.dtb \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \arch/arm/dts/armada-xp-atl-x220.dts new file +162
-0@@ -0,0 +1,162 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for x220 board + * + * Copyright (C) 2025 Allied Telesis Labs + */ + +/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include "armada-xp-98dx3236.dtsi" +#include "mvebu-u-boot.dtsi" + +/ { + model = "x220"; + compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260", + "marvell,armadaxp", "marvell,armada-370-xp"; + + chosen { + stdout-path = "serial0:115200n8"; + bootargs = "console=ttyS0,115200"; + }; + + aliases { + i2c0 = &i2c0; + spi0 = &spi0; + }; + + memory { + device_type = "memory"; + reg = <0x00000000 0x00000000 0x00000000 0x20000000>; + }; +}; + +&L2 { + arm,parity-enable; + marvell,ecc-enable; +}; + +&devbus_bootcs { + status = "okay"; + + /* Device Bus parameters are required */ + + /* Read parameters */ + devbus,bus-width = <16>; + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* Write parameters */ + devbus,sync-enable = <0>; + devbus,wr-high-ps = <60000>; + devbus,wr-low-ps = <60000>; + devbus,ale-wr-ps = <60000>; +}; + +&uart0 { + status = "okay"; +}; + +&i2c0 { + clock-frequency = <100000>; + status = "okay"; + + rtc@68 { + compatible = "dallas,ds1340"; + reg = <0x68>; + }; + + adt7476a@2e { + compatible = "adi,adt7476"; + reg = <0x2e>; + }; + + sfpgpio: gpio@27 { + #address-cells = <2>; + #size-cells = <0>; + compatible = "nxp,pca9555"; + reg = <0x27>; + gpio-controller; + #gpio-cells = <2>; + }; + + systemgpio: gpio@25 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "nxp,pca9555"; + reg = <0x25>; + gpio-controller; + #gpio-cells = <2>; + + nand-protect { + gpio-hog; + gpios = <6 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "nand-protect"; + }; + + usb-enable { + gpio-hog; + gpios = <9 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "usb-enable"; + }; + + phy-reset { + gpio-hog; + gpios = <5 GPIO_ACTIVE_LOW>; + output-high; + line-name = "phy-reset"; + }; + + led-enable { + gpio-hog; + gpios = <13 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "led-enable"; + }; + }; +}; + +&watchdog { + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <20000000>; + }; +}; + +&nand_controller { + compatible = "marvell,armada370-nand-controller"; + label = "pxa3xx_nand-0"; + status = "okay"; + nand-rb = <0>; + nand-on-flash-bbt; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; +}; + +&{/} { + boot-board { + compatible = "atl,boot-board"; + present-gpio = <&systemgpio 12 GPIO_ACTIVE_HIGH>; + override-gpio = <&gpio0 31 GPIO_ACTIVE_HIGH>; + }; +}; +arch/arm/mach-mvebu/Kconfig +7
-0@@ -226,6 +226,10 @@ config TARGET_X240 select ALLEYCAT_5 imply BOOTSTD_DEFAULTS +config TARGET_X220 + bool "Support Allied Telesis x220" + select 98DX3336 + config TARGET_DB_XC3_24G4XG bool "Support DB-XC3-24G4XG" select 98DX3336@@ -310,6 +314,7 @@ config SYS_BOARD default "x530" if TARGET_X530 default "x250" if TARGET_X250 default "x240" if TARGET_X240 + default "x220" if TARGET_X220 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5@@ -335,6 +340,7 @@ config SYS_CONFIG_NAME default "x530" if TARGET_X530 default "x250" if TARGET_X250 default "x240" if TARGET_X240 + default "x220" if TARGET_X220 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5@@ -360,6 +366,7 @@ config SYS_VENDOR default "alliedtelesis" if TARGET_X530 default "alliedtelesis" if TARGET_X250 default "alliedtelesis" if TARGET_X240 + default "alliedtelesis" if TARGET_X220 default "mikrotik" if TARGET_CRS3XX_98DX3236 default "Marvell" if TARGET_MVEBU_ALLEYCAT5board/alliedtelesis/x220/.gitattributes new file +1
-0@@ -0,0 +1 @@ +binary.0 binaryboard/alliedtelesis/x220/.gitignore new file +1
-0@@ -0,0 +1 @@ +kwbimage.cfgboard/alliedtelesis/x220/MAINTAINERS new file +8
-0@@ -0,0 +1,8 @@ +x220 BOARD +M: Chris Packham <[email protected]> +S: Maintained +F: board/alliedtelesis/x220 +F: include/configs/x220.h +F: configs/x220_defconfig +F: arch/arm/dts/armada-xp-atl-x220.dts +F: doc/board/alliedtelesis/x220.rstboard/alliedtelesis/x220/Makefile new file +14
-0@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2025 Allied Telesis Labs + +obj-y := x220.o +extra-y := kwbimage.cfg + +quiet_cmd_sed = SED $@ + cmd_sed = sed $(SEDFLAGS_$(@F)) $< >$(dir $@)$(@F) + +SEDFLAGS_kwbimage.cfg =-e "s|^BINARY.*|BINARY $(srctree)/$(@D)/binary.0 0000005b 00000068|" +$(obj)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \ + include/config/auto.conf + $(call if_changed,sed)board/alliedtelesis/x220/binary.0 new file binary +0
-0board/alliedtelesis/x220/kwbimage.cfg.in new file +12
-0@@ -0,0 +1,12 @@ +# +# Copyright (C) 2025 Allied Telesis Labs +# + +# Armada XP uses version 1 image format +VERSION 1 + +# Boot Media configurations +BOOT_FROM spi + +# Binary Header (bin_hdr) with DDR3 training code +BINARY board/alliedtelesis/x220/binary.0 0000005b 00000068board/alliedtelesis/x220/x220.c new file +67
-0@@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2025 Allied Telesis Labs +*/ + +#include <i2c.h> +#include <init.h> +#include <asm/global_data.h> +#include <asm/gpio.h> +#include <linux/bitops.h> +#include <linux/mbus.h> +#include <linux/io.h> +#include <asm/arch/cpu.h> +#include <asm/arch/soc.h> + +DECLARE_GLOBAL_DATA_PTR ; + +#define X220_GPP_OUT_ENA_LOW (~(BIT(12) | BIT(17) | BIT(18) | BIT(31))) +#define X220_GPP_OUT_ENA_MID (~(0)) +#define X220_GPP_OUT_VAL_LOW (BIT(12) | BIT(18)) +#define X220_GPP_OUT_VAL_MID 0x0 +#define X220_GPP_POL_LOW 0x0 +#define X220_GPP_POL_MID 0x0 + +int board_early_init_f (void ) +{ +/* Configure MPP */ +writel (0x44042222 ,MVEBU_MPP_BASE +0x00 ); +writel (0x11000004 ,MVEBU_MPP_BASE +0x04 ); +writel (0x44444004 ,MVEBU_MPP_BASE +0x08 ); +writel (0x04444444 ,MVEBU_MPP_BASE +0x0c ); +writel (0x00000004 ,MVEBU_MPP_BASE +0x10 ); + +/* Set GPP Out value */ +writel (X220_GPP_OUT_VAL_LOW ,MVEBU_GPIO0_BASE +0x00 ); +writel (X220_GPP_OUT_VAL_MID ,MVEBU_GPIO1_BASE +0x00 ); + +/* Set GPP Polarity */ +writel (X220_GPP_POL_LOW ,MVEBU_GPIO0_BASE +0x0c ); +writel (X220_GPP_POL_MID ,MVEBU_GPIO1_BASE +0x0c ); + +/* Set GPP Out Enable */ +writel (X220_GPP_OUT_ENA_LOW ,MVEBU_GPIO0_BASE +0x04 ); +writel (X220_GPP_OUT_ENA_MID ,MVEBU_GPIO1_BASE +0x04 ); + +return 0 ; +} + +int board_init (void ) +{ +/* address of boot parameters */ + gd->bd->bi_boot_params =mvebu_sdram_bar (0 ) +0x100 ; + +/* Disable MBUS Err Prop - in order to avoid data aborts */ +clrbits_le32 (MVEBU_CPU_WIN_BASE +0x200 , (1 <<8 )); + +return 0 ; +} + +#ifdef CONFIG_DISPLAY_BOARDINFO +int checkboard (void ) +{ +puts ("Board: Allied Telesis x220\n" ); + +return 0 ; +} +#endif configs/x220_defconfig new file +76
-0@@ -0,0 +1,76 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_KWD_CONFIG="board/alliedtelesis/x220/kwbimage.cfg" +CONFIG_TEXT_BASE=0x00800000 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xff0000 +CONFIG_TARGET_X220=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x100000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-atl-x220" +CONFIG_SYS_LOAD_ADDR=0x800000 +CONFIG_PCI=y +CONFIG_SYS_MEMTEST_START=0x00800000 +CONFIG_SYS_MEMTEST_END=0x00ffffff +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_SYS_MAXARGS=96 +CONFIG_CMD_MEMTEST=y +CONFIG_SYS_ALT_MEMTEST=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=nand" +CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:112M(user),8M(errlog),8M(nand-bbt)" +CONFIG_CMD_UBI=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ARP_TIMEOUT=200 +CONFIG_NET_RETRY_COUNT=50 +CONFIG_GPIO_HOG=y +CONFIG_DM_PCA953X=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MVTWSI=y +# CONFIG_MMC is not set +CONFIG_MTD_RAW_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y +CONFIG_NAND_PXA3XX=y +CONFIG_SYS_NAND_ONFI_DETECTION=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_WDT=y +CONFIG_WDT_ORION=ydoc/board/alliedtelesis/index.rst new file +11
-0@@ -0,0 +1,11 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2026 Allied Telesis Labs + +Allied Telesis +============== + +.. toctree:: + :maxdepth: 2 + + x220 +doc/board/alliedtelesis/x220.rst new file +39
-0@@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2026 Allied Telesis Labs + +x220 Platforms +============== + +Introduction +------------ + +The x220 has is a range of L2+ switches using the Marvell AlleyCat3 switch with +integrated ARMv7 CPU. It is also sold under some different brands for different +markets. + +- x220-52GP +- x220-52GT +- x220-28GS +- GS980M/52PS +- GS980M/52 +- x230-52 + +DDR Traning (binhdr) +-------------------- + +The AlleyCat3 uses a binary blob for it's DDR training. This is launched by +the built-in bootloader prior to U-Boot starting. + +To generate binary.0 from Marvell's bin_hdr.elf use the following command + +.. prompt:: bash $ + + arm-softfloat-linux-gnueabi-objcopy -S -O binary bin_hdr.elf \ + board/alliedtelesis/x220/binary.0 + +Alternatively, it is possible to extract the binary.0 from an existing U-Boot +image + +.. prompt:: bash $ + + ./tools/dumpimage -T kwbimage -p 1 -o board/alliedtelesis/x220/binary.0 u-boot.kwbdoc/board/index.rst +1
-0@@ -10,6 +10,7 @@ Board-specific doc actions/index advantech/index andestech/index + alliedtelesis/index allwinner/index amlogic/index anbernic/indexinclude/configs/x220.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2025 Allied Telesis Labs +*/ + +#ifndef _CONFIG_X220_H +#define _CONFIG_X220_H + +/* Keep device tree and initrd in lower memory so the kernel can access them */ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdt_high=0x10000000\0" \ + "initrd_high=0x10000000\0" + +/* +* mv-common.h should be defined after CMD configs since it used them +* to enable certain macros +*/ +#include "mv-common.h" + +#endif /* _CONFIG_X220_H */
Re: [PATCH v3 3/3] arm: mvebu: Add Allied Telesis x220
In reply to Chris PackhamQuoted 9 lines · Chris Packham
Add the Allied Telesis x220 board. There are a number of other variants with the same CPU block that are sold under some different brand names but the x220 was first.
The x220 uses the AlleyCat3 switch chip with integrated ARMv7 CPU. Because of this it is reliant on a binary blob for the DDR training. In upstream u-boot this is replaced by an empty file.
Signed-off-by Chris Packham <[email protected]>
Applied to u-boot-marvell/next
Thanks,
Stefan