]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arm: mvebu: Add Allied Telesis x960 board
authorChris Packham <judge.packham@gmail.com>
Wed, 29 Jul 2026 08:17:19 +0000 (20:17 +1200)
committerStefan Roese <stefan.roese@mailbox.org>
Thu, 30 Jul 2026 20:06:23 +0000 (22:06 +0200)
The  x960-28YSQ is a 25G/100G layer 3 switch from Allied Telesis.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <stefan.roese@mailbox.org>
[sr: fix DT file name in MAINTAINERS]

arch/arm/dts/Makefile
arch/arm/dts/cn9130-atl-x960-28ysq.dts [new file with mode: 0644]
arch/arm/mach-mvebu/Kconfig
board/alliedtelesis/x960/MAINTAINERS [new file with mode: 0644]
board/alliedtelesis/x960/Makefile [new file with mode: 0644]
board/alliedtelesis/x960/x960.c [new file with mode: 0644]
configs/x960_defconfig [new file with mode: 0644]
include/configs/x960.h [new file with mode: 0644]

index dada5f9eba261cc6a7d27d6a7ff47aa0bc9d9b7b..a02dad22f2742f0b981fb01e88359fc3d48ad918 100644 (file)
@@ -170,7 +170,8 @@ dtb-$(CONFIG_ARCH_MVEBU) +=                 \
        cn9130-crb-B.dtb                        \
        ac5-98dx35xx-rd.dtb                     \
        ac5-98dx35xx-atl-x240.dtb               \
-       cn9130-atl-x250.dtb
+       cn9130-atl-x250.dtb                     \
+       cn9130-atl-x960-28ysq.dtb
 endif
 
 dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
diff --git a/arch/arm/dts/cn9130-atl-x960-28ysq.dts b/arch/arm/dts/cn9130-atl-x960-28ysq.dts
new file mode 100644 (file)
index 0000000..177d09b
--- /dev/null
@@ -0,0 +1,313 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2026 Allied Telesis Labs
+ */
+
+#include "cn9130.dtsi"
+
+/ {
+       model = "Allied Telesis x960-28YSQ";
+       compatible = "alliedtelesis,x960-28ysq",
+               "marvell,cn9130",
+               "marvell,armada-ap806-quad",
+               "marvell,armada-ap806";
+
+       aliases {
+               serial0 = &uart0;
+               i2c0 = &cp0_i2c0;
+               i2c1 = &cp0_i2c1;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+
+};
+
+/*
+ * AP related configuration
+ */
+&ap_pinctl {
+       /* AP_MPP Pins:
+        * GPIO & NC [0-10,12]
+        * UART0 [11,19]
+        */
+               /*   0 1 2 3 4 5 6 7 8 9 */
+       pin-func = < 0 0 0 0 0 0 0 0 0 0
+                    0 3 0 0 0 0 0 0 0 3 >;
+};
+
+&ap_gpio0 {
+       pp-reset {
+               gpio-hog;
+               gpios = <0 GPIO_ACTIVE_LOW>;
+               output-high;
+               line-name = "pp-reset";
+       };
+
+       usb-en {
+               gpio-hog;
+               gpios = <7 GPIO_ACTIVE_HIGH>;
+               output-high;
+               line-name = "usb-en";
+       };
+
+       fan-en {
+               gpio-hog;
+               gpios = <8 GPIO_ACTIVE_HIGH>;
+               output-high;
+               line-name = "fan-en";
+       };
+};
+
+/*
+ * CP related configuration
+ */
+&cp0_pinctl {
+       /* MPP Bus:
+        *      [0-1]   DEV
+        *      [2-8]   GPIO
+        *      [9]     DEV
+        *      [10-12] GPIO
+        *      [13]    ND_RB
+        *      [14]    GPIO
+        *      [15-28] DEV
+        *      [29-30] GPIO
+        *      [31]    DEV
+        *      [32-34] GPIO
+        *      [35-36] I2C1
+        *      [37-38] I2C0
+        *      [39-46] GPIO
+        *      [47]    SMI
+        *      [48]    GPIO
+        *      [49]    SMI
+        *      [49-55] GPIO
+        *      [56-60] SPI
+        *      [61-62] GPIO
+        */
+               /*   0   1   2   3   4   5   6   7   8   9 */
+       pin-func = < 1   1   0   0   0   0   0   0   0   1
+                    0   0   0   2   0   1   1   1   1   1
+                    1   1   1   1   1   1   1   1   1   0
+                    0   1   0   0   0   2   2   2   2   0
+                    0   0   0   0   0   0   0   8   0   8
+                    0   0   0   0   0   0   6   6   6   6
+                    6   0   0>;
+
+       cp0_i2c0_pins: cp0-i2c-pins-0 {
+               marvell,pins = <37 38>;
+               marvell,function = <2>;
+       };
+
+       cp0_i2c1_pins: cp0-i2c-pins-1 {
+               marvell,pins = <35 36>;
+               marvell,function = <2>;
+       };
+
+       cp0_nand_pins: cp0-nand-pins {
+               marvell,pins = <0 1 9 15 16 17 18 19 20 21 22 23 24 25 26 27 28 31>;
+               marvell,function = <1>;
+       };
+
+       cp0_smi_pins: cp0-smi-pins {
+               marvell,pins = <47 49>;
+               marvell,function = <8>;
+       };
+
+       cp0_nand_rb: cp0-nand-rb {
+               marvell,pins = <13>;
+               marvell,function = <2>;
+       };
+
+       cp0_spi0_pins: cp0-spi-pins-0 {
+               marvell,pins = <56 57 58 59 60>;
+               marvell,function = <6>;
+       };
+};
+
+&cp0_i2c0 {
+       status = "okay";
+       pinctrl-names = "default", "gpio";
+       pinctrl-0 = <&cp0_i2c0_pins>;
+
+       mux@70 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "nxp,pca9546";
+               reg = <0x70>;
+               i2c-mux-idle-disconnect;
+               reset-gpios = <&ap_gpio0 2 GPIO_ACTIVE_LOW>;
+
+               i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+
+                       hwmon@2d {
+                               compatible = "adi,adt7476";
+                               reg = <0x2d>;
+                               adi,pwm-active-state = <0 0 0>;
+                       };
+
+                       hwmon@2e {
+                               compatible = "adi,adt7476";
+                               reg = <0x2e>;
+                       };
+
+                       rtc:rtc@68 {
+                               compatible = "adi,max31343";
+                               reg = <0x68>;
+                       };
+               };
+
+               /* Switch/EEPROM */
+               i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+               };
+
+               /* PSU0 */
+               i2c@5 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <5>;
+
+                       eeprom@51 {
+                               compatible = "i2c-eeprom";
+                               reg = <0x51>;
+                       };
+               };
+
+               /* PSU1 */
+               i2c@6 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <6>;
+
+                       eeprom@51 {
+                               compatible = "i2c-eeprom";
+                               reg = <0x51>;
+                       };
+               };
+
+       };
+};
+
+&cp0_i2c1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&cp0_i2c1_pins>;
+};
+
+&cp0_comphy {
+       phy0 {
+               phy-type = <COMPHY_TYPE_PEX0>;
+       };
+
+       phy1 {
+               phy-type = <COMPHY_TYPE_IGNORE>;
+       };
+
+       phy2 {
+               phy-type = <COMPHY_TYPE_IGNORE>;
+       };
+
+       phy3 {
+               phy-type = <COMPHY_TYPE_IGNORE>;
+       };
+
+       phy4 {
+               phy-type = <COMPHY_TYPE_IGNORE>;
+       };
+
+       phy5 {
+               phy-type = <COMPHY_TYPE_SGMII0>;
+               phy-speed = <COMPHY_SPEED_1_25G>;
+       };
+};
+
+&cp0_mdio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&cp0_smi_pins>;
+       status = "okay";
+       cp0_phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
+&cp0_ethernet {
+       status = "okay";
+};
+
+&cp0_eth2 {
+       status = "okay";
+       phy = <&cp0_phy0>;
+       phy-mode = "sgmii";
+       phy-reset-gpios = <&cp0_gpio0 10 GPIO_ACTIVE_LOW>;
+};
+
+&cp0_pcie0 {
+       num-lanes = <1>;
+               /* non-prefetchable memory */
+       ranges =<0x82000000 0 0xc0000000 0 0xc0000000 0 0x2000000>;
+       status = "disabled";
+};
+
+&uart0 {
+       status = "okay";
+};
+
+&cp0_utmi0 {
+       status = "okay";
+};
+
+&cp0_usb3_0 {
+       status = "okay";
+};
+
+&cp0_spi0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&cp0_spi0_pins>;
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <50000000>;
+               m25p,fast-read;
+       };
+};
+
+&cp0_nand {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&cp0_nand_pins &cp0_nand_rb>;
+       nand-ecc-strength = <8>;
+       nand-ecc-step-size = <512>;
+       nand-timing-mode = <4>;
+
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partition@user {
+                       reg = <0x00000000 0x20000000>;
+                       label = "user";
+               };
+       };
+};
+
+&cp0_gpio0
+{
+       nand-protect {
+               gpio-hog;
+               gpios = <29 GPIO_ACTIVE_LOW>;
+               output-low;
+               line-name = "nand-protect";
+       };
+};
index 3465ccfc1510128cccdbdb597bbd875f56199d55..1a8dbf2792ef6edcae617393675bcb1a233b5d48 100644 (file)
@@ -238,6 +238,11 @@ config TARGET_X220
        bool "Support Allied Telesis x220"
        select 98DX3336
 
+config TARGET_X960
+       bool "Support Allied Telesis x960"
+       select ARMADA_8K
+       imply BOOTSTD_DEFAULTS
+
 config TARGET_DB_XC3_24G4XG
        bool "Support DB-XC3-24G4XG"
        select 98DX3336
@@ -323,6 +328,7 @@ config SYS_BOARD
        default "x250" if TARGET_X250
        default "x240" if TARGET_X240
        default "x220" if TARGET_X220
+       default "x960" if TARGET_X960
        default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
        default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
        default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
@@ -349,6 +355,7 @@ config SYS_CONFIG_NAME
        default "x250" if TARGET_X250
        default "x240" if TARGET_X240
        default "x220" if TARGET_X220
+       default "x960" if TARGET_X960
        default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
        default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
        default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
@@ -375,6 +382,7 @@ config SYS_VENDOR
        default "alliedtelesis" if TARGET_X250
        default "alliedtelesis" if TARGET_X240
        default "alliedtelesis" if TARGET_X220
+       default "alliedtelesis" if TARGET_X960
        default "mikrotik" if TARGET_CRS3XX_98DX3236
        default "Marvell" if TARGET_MVEBU_ALLEYCAT5
 
diff --git a/board/alliedtelesis/x960/MAINTAINERS b/board/alliedtelesis/x960/MAINTAINERS
new file mode 100644 (file)
index 0000000..1717a67
--- /dev/null
@@ -0,0 +1,7 @@
+X960 BOARD
+M:     Chris Packham <chris.packham@alliedtelesis.co.nz>
+S:     Maintained
+F:     board/alliedtelesis/x960/
+F:     arch/arm/dts/cn9130-atl-x960-28ysq.dts
+F:     include/configs/x960.h
+F:     configs/x960_defconfig
diff --git a/board/alliedtelesis/x960/Makefile b/board/alliedtelesis/x960/Makefile
new file mode 100644 (file)
index 0000000..d5c32c0
--- /dev/null
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2026 Allied Telesis
+#
+
+obj-y  += x960.o
diff --git a/board/alliedtelesis/x960/x960.c b/board/alliedtelesis/x960/x960.c
new file mode 100644 (file)
index 0000000..66c7826
--- /dev/null
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier:    GPL-2.0+
+
+#include <config.h>
+#include <asm/global_data.h>
+#include <linux/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define DEVICE_BUS_SYNC_CTRL   0xF27004C8
+
+int board_init(void)
+{
+       gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
+
+       /* DEV_READYn is not needed for NVS, ignore it when accessing CS1 */
+       writel(0x00004001, DEVICE_BUS_SYNC_CTRL);
+
+       return 0;
+}
diff --git a/configs/x960_defconfig b/configs/x960_defconfig
new file mode 100644 (file)
index 0000000..f03bca3
--- /dev/null
@@ -0,0 +1,104 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_TEXT_BASE=0x00000000
+CONFIG_NR_DRAM_BANKS=2
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xff0000
+CONFIG_TARGET_X960=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0xf80000
+CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="cn9130-atl-x960-28ysq"
+CONFIG_SYS_LOAD_ADDR=0x10000000
+CONFIG_DEBUG_UART_BASE=0xf0512000
+CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_PCI=y
+CONFIG_DEBUG_UART=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_FIT=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BOOTCOMMAND="run distro_bootcmd"
+CONFIG_USE_PREBOOT=y
+CONFIG_SPL_SILENT_CONSOLE=y
+CONFIG_TPL_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_UBI=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_MMC_DEVICE_INDEX=1
+CONFIG_ARP_TIMEOUT=200
+CONFIG_NET_RETRY_COUNT=50
+CONFIG_IPV6=y
+CONFIG_SYS_64BIT_LBA=y
+CONFIG_GPIO_HOG=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_GPIO=y
+CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+# CONFIG_INPUT is not set
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_MISC=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_ATMEL=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
+CONFIG_MVPP2=y
+CONFIG_PHY_MARVELL=y
+CONFIG_NVME_PCI=y
+CONFIG_PCIE_DW_MVEBU=y
+CONFIG_PHY=y
+CONFIG_MVEBU_COMPHY_SUPPORT=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_8K=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_DS1307=y
+CONFIG_RTC_MAX313XX=y
+CONFIG_SCSI=y
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=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_TOOLS_MKEFICAPSULE is not set
diff --git a/include/configs/x960.h b/include/configs/x960.h
new file mode 100644 (file)
index 0000000..b969951
--- /dev/null
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2026 Allied Telesis
+ */
+
+#ifndef __X960_H_
+#define __X960_H_
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CFG_SYS_TCLK           250000000       /* 250MHz */
+
+/* additions for new ARM relocation support */
+#define CFG_SYS_SDRAM_BASE     0x00000000
+
+#define BOOT_TARGETS   "usb scsi pxe dhcp"
+
+#define CFG_EXTRA_ENV_SETTINGS \
+       "scriptaddr=0x6d00000\0"        \
+       "pxefile_addr_r=0x6e00000\0"    \
+       "fdt_addr_r=0x6f00000\0"        \
+       "kernel_addr_r=0x7000000\0"     \
+       "ramdisk_addr_r=0xa000000\0"    \
+       "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+       "boot_targets=" BOOT_TARGETS "\0"
+
+#endif /* __X960_H_ */