Add Aspeed AST2600 support
Subsystems (9)
Chia-Wei
cover Add Aspeed AST2600 support
The patch series add the U-boot support for AST2600, which is the 7th generation BMC chip introduced by ASPEED technogology.
The change includes the newly added low level platform code, Kconfig, and device tree of AST2600. In addition, certain fundamental drivers such as DRAM, reset, and watchodg are implemented for the AST2600 new design.
Note that these patches currently supports only memory mapped SPI flash booting.
Chia-Wei, Wang (5):
wdt: aspeed: Add AST2600 watchdog support
reset: aspeed: Add AST2600 reset support
ARM: dts: aspeed: Add AST2600 SoC support
aspeed: Add AST2600 platform support
configs: aspeed: Add defconfig for AST2600 EVB
Dylan Hung (1):
ram: aspeed: Add AST2600 DRAM control support
Ryan Chen (1):
clk: aspeed: Add AST2600 clock support
arch/arm/dts/Makefile | 1 + arch/arm/dts/ast2600-evb.dts | 179 ++ arch/arm/dts/ast2600-u-boot.dtsi | 44 + arch/arm/dts/ast2600.dtsi | 1946 +++++++++++++++++ arch/arm/include/asm/arch-aspeed/boot0.h | 23 + arch/arm/include/asm/arch-aspeed/platform.h | 5 + .../arm/include/asm/arch-aspeed/scu_ast2600.h | 338 +++ .../include/asm/arch-aspeed/sdram_ast2600.h | 163 ++ .../arm/include/asm/arch-aspeed/wdt_ast2600.h | 129 ++ arch/arm/mach-aspeed/Kconfig | 20 + arch/arm/mach-aspeed/Makefile | 1 + arch/arm/mach-aspeed/ast2600/Kconfig | 17 + arch/arm/mach-aspeed/ast2600/Makefile | 2 + arch/arm/mach-aspeed/ast2600/board_common.c | 105 + arch/arm/mach-aspeed/ast2600/lowlevel_init.S | 233 ++ arch/arm/mach-aspeed/ast2600/spl.c | 55 + board/aspeed/evb_ast2600/Kconfig | 12 + board/aspeed/evb_ast2600/Makefile | 1 + board/aspeed/evb_ast2600/evb_ast2600.c | 5 + configs/evb-ast2600_defconfig | 69 + drivers/clk/aspeed/Makefile | 1 + drivers/clk/aspeed/clk_ast2600.c | 1173 ++++++++++ drivers/ram/aspeed/Kconfig | 61 +- drivers/ram/aspeed/Makefile | 3 +- drivers/ram/aspeed/sdram_ast2600.c | 1061 +++++++++ drivers/reset/Kconfig | 9 + drivers/reset/Makefile | 1 + drivers/reset/reset-ast2600.c | 108 + drivers/sysreset/sysreset_ast.c | 5 + drivers/watchdog/Kconfig | 9 + drivers/watchdog/Makefile | 1 + drivers/watchdog/ast2600_wdt.c | 110 + include/configs/evb_ast2600.h | 16 + include/dt-bindings/clock/ast2600-clock.h | 62 + include/dt-bindings/reset/ast2600-reset.h | 70 + 35 files changed, 6036 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/ast2600-evb.dts create mode 100644 arch/arm/dts/ast2600-u-boot.dtsi create mode 100644 arch/arm/dts/ast2600.dtsi create mode 100644 arch/arm/include/asm/arch-aspeed/boot0.h create mode 100644 arch/arm/include/asm/arch-aspeed/scu_ast2600.h create mode 100644 arch/arm/include/asm/arch-aspeed/sdram_ast2600.h create mode 100644 arch/arm/include/asm/arch-aspeed/wdt_ast2600.h create mode 100644 arch/arm/mach-aspeed/ast2600/Kconfig create mode 100644 arch/arm/mach-aspeed/ast2600/Makefile create mode 100644 arch/arm/mach-aspeed/ast2600/board_common.c create mode 100644 arch/arm/mach-aspeed/ast2600/lowlevel_init.S create mode 100644 arch/arm/mach-aspeed/ast2600/spl.c create mode 100644 board/aspeed/evb_ast2600/Kconfig create mode 100644 board/aspeed/evb_ast2600/Makefile create mode 100644 board/aspeed/evb_ast2600/evb_ast2600.c create mode 100644 configs/evb-ast2600_defconfig create mode 100644 drivers/clk/aspeed/clk_ast2600.c create mode 100644 drivers/ram/aspeed/sdram_ast2600.c create mode 100644 drivers/reset/reset-ast2600.c create mode 100644 drivers/watchdog/ast2600_wdt.c create mode 100644 include/configs/evb_ast2600.h create mode 100644 include/dt-bindings/clock/ast2600-clock.h create mode 100644 include/dt-bindings/reset/ast2600-reset.h
Signature · 1 line
2.17.1
Chia-Wei
PATCH 1/7 clk: aspeed: Add AST2600 clock support
From: Ryan Chen <[email protected]>
This patch adds the clock control driver
for the AST2600 SoC.
--- .../arm/include/asm/arch-aspeed/scu_ast2600.h | 338 +++++ drivers/clk/aspeed/Makefile | 1 + drivers/clk/aspeed/clk_ast2600.c | 1173 +++++++++++++++++ include/dt-bindings/clock/ast2600-clock.h | 62 + 4 files changed, 1574 insertions(+) create mode 100644 arch/arm/include/asm/arch-aspeed/scu_ast2600.h create mode 100644 drivers/clk/aspeed/clk_ast2600.c create mode 100644 include/dt-bindings/clock/ast2600-clock.h
arch/arm/include/asm/arch-aspeed/scu_ast2600.h new file +338 -0
@@ -0,0 +1,338 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) Aspeed Technology Inc. +*/ +#ifndef _ASM_ARCH_SCU_AST2600_H +#define _ASM_ARCH_SCU_AST2600_H + +#define SCU_UNLOCK_KEY 0x1688a8a8 + +#define SCU_CLKGATE1_EMMC BIT(27) +#define SCU_CLKGATE1_MAC2 BIT(21) +#define SCU_CLKGATE1_MAC1 BIT(20) +#define SCU_CLKGATE1_USB_HUB BIT(14) +#define SCU_CLKGATE1_USB_HOST2 BIT(7) + +#define SCU_CLKGATE2_FSI BIT(30) +#define SCU_CLKGATE2_MAC4 BIT(21) +#define SCU_CLKGATE2_MAC3 BIT(20) +#define SCU_CLKGATE2_SDIO BIT(4) + +#define SCU_DRAM_HDSHK_SOC_INIT BIT(7) +#define SCU_DRAM_HDSHK_RDY BIT(6) + +#define SCU_CLKSRC1_ECC_RSA_DIV_MASK GENMASK(27, 26) +#define SCU_CLKSRC1_ECC_RSA_DIV_SHIFT 26 +#define SCU_CLKSRC1_PCLK_DIV_MASK GENMASK(25, 23) +#define SCU_CLKSRC1_PCLK_DIV_SHIFT 23 +#define SCU_CLKSRC1_BCLK_DIV_MASK GENMASK(22, 20) +#define SCU_CLKSRC1_BCLK_DIV_SHIFT 20 +#define SCU_CLKSRC1_ECC_RSA BIT(19) +#define SCU_CLKSRC1_MAC_DIV_MASK GENMASK(18, 16) +#define SCU_CLKSRC1_MAC_DIV_SHIFT 16 +#define SCU_CLKSRC1_EMMC_EN BIT(15) +#define SCU_CLKSRC1_EMMC_DIV_MASK GENMASK(14, 12) +#define SCU_CLKSRC1_EMMC_DIV_SHIFT 12 +#define SCU_CLKSRC1_EMMC BIT(11) + +#define SCU_CLKSRC2_RMII12 BIT(19) +#define SCU_CLKSRC2_RMII12_DIV_MASK GENMASK(18, 16) +#define SCU_CLKSRC2_RMII12_DIV_SHIFT 16 +#define SCU_CLKSRC2_UART5 BIT(14) + +#define SCU_CLKSRC4_SDIO_EN BIT(31) +#define SCU_CLKSRC4_SDIO_DIV_MASK GENMASK(30, 28) +#define SCU_CLKSRC4_SDIO_DIV_SHIFT 28 +#define SCU_CLKSRC4_MAC_DIV_MASK GENMASK(26, 24) +#define SCU_CLKSRC4_MAC_DIV_SHIFT 24 +#define SCU_CLKSRC4_RMII34_DIV_MASK GENMASK(18, 16) +#define SCU_CLKSRC4_RMII34_DIV_SHIFT 16 +#define SCU_CLKSRC4_PCLK_DIV_MASK GENMASK(11, 9) +#define SCU_CLKSRC4_PCLK_DIV_SHIFT 9 +#define SCU_CLKSRC4_SDIO BIT(8) +#define SCU_CLKSRC4_UART6 BIT(5) +#define SCU_CLKSRC4_UART4 BIT(3) +#define SCU_CLKSRC4_UART3 BIT(2) +#define SCU_CLKSRC4_UART2 BIT(1) +#define SCU_CLKSRC4_UART1 BIT(0) + +#define SCU_CLKSRC5_UART13 BIT(12) +#define SCU_CLKSRC5_UART12 BIT(11) +#define SCU_CLKSRC5_UART11 BIT(10) +#define SCU_CLKSRC5_UART10 BIT(9) +#define SCU_CLKSRC5_UART9 BIT(8) +#define SCU_CLKSRC5_UART8 BIT(7) +#define SCU_CLKSRC5_UART7 BIT(6) +#define SCU_CLKSRC5_HUXCLK_MASK GENMASK(5, 3) +#define SCU_CLKSRC5_HUXCLK_SHIFT 3 +#define SCU_CLKSRC5_UXCLK_MASK GENMASK(2, 0) +#define SCU_CLKSRC5_UXCLK_SHIFT 0 + +#define SCU_PINCTRL1_EMMC_MASK GENMASK(31, 24) +#define SCU_PINCTRL1_EMMC_SHIFT 24 + +#define SCU_PINCTRL16_MAC4_DRIVING_MASK GENMASK(3, 2) +#define SCU_PINCTRL16_MAC4_DRIVING_SHIFT 2 +#define SCU_PINCTRL16_MAC3_DRIVING_MASK GENMASK(1, 0) +#define SCU_PINCTRL16_MAC3_DRIVING_SHIFT 0 + +#define SCU_HWSTRAP1_CPU_AXI_CLK_RATIO BIT(16) +#define SCU_HWSTRAP1_VGA_MEM_MASK GENMASK(14, 13) +#define SCU_HWSTRAP1_VGA_MEM_SHIFT 13 +#define SCU_HWSTRAP1_AXI_AHB_CLK_RATIO_MASK GENMASK(12, 11) +#define SCU_HWSTRAP1_AXI_AHB_CLK_RATIO_SHIFT 11 +#define SCU_HWSTRAP1_CPU_FREQ_MASK GENMASK(10, 8) +#define SCU_HWSTRAP1_CPU_FREQ_SHIFT 8 +#define SCU_HWSTRAP1_MAC2_INTF BIT(7) +#define SCU_HWSTRAP1_MAC1_INTF BIT(6) + +#define SCU_EFUSE_DIS_DP BIT(17) +#define SCU_EFUSE_DIS_VGA BIT(14) +#define SCU_EFUSE_DIS_PCIE_EP BIT(13) +#define SCU_EFUSE_DIS_USB BIT(12) +#define SCU_EFUSE_DIS_RVAS BIT(10) +#define SCU_EFUSE_DIS_VIDEO_DEC BIT(9) +#define SCU_EFUSE_DIS_VIDEO BIT(8) +#define SCU_EFUSE_DIS_PCIE_RC BIT(7) +#define SCU_EFUSE_DIS_CM3 BIT(6) +#define SCU_EFUSE_DIS_CA7 BIT(5) + +#define SCU_PLL_RST BIT(25) +#define SCU_PLL_BYPASS BIT(24) +#define SCU_PLL_OFF BIT(23) +#define SCU_PLL_DIV_MASK GENMASK(22, 19) +#define SCU_PLL_DIV_SHIFT 19 +#define SCU_PLL_DENUM_MASK GENMASK(18, 13) +#define SCU_PLL_DENUM_SHIFT 13 +#define SCU_PLL_NUM_MASK GENMASK(12, 0) +#define SCU_PLL_NUM_SHIFT 0 + +#define SCU_UART_CLKGEN_N_MASK GENMASK(17, 8) +#define SCU_UART_CLKGEN_N_SHIFT 8 +#define SCU_UART_CLKGEN_R_MASK GENMASK(7, 0) +#define SCU_UART_CLKGEN_R_SHIFT 0 + +#define SCU_HUART_CLKGEN_N_MASK GENMASK(17, 8) +#define SCU_HUART_CLKGEN_N_SHIFT 8 +#define SCU_HUART_CLKGEN_R_MASK GENMASK(7, 0) +#define SCU_HUART_CLKGEN_R_SHIFT 0 + +#define SCU_MISC_CTRL1_UART5_DIV BIT(12) + +#ifndef __ASSEMBLY__ +struct ast2600_scu { +uint32_t prot_key1;/* 0x000 */ +uint32_t chip_id1;/* 0x004 */ +uint32_t rsv_0x08;/* 0x008 */ +uint32_t rsv_0x0c;/* 0x00C */ +uint32_t prot_key2;/* 0x010 */ +uint32_t chip_id2;/* 0x014 */ +uint32_t rsv_0x18[10 ];/* 0x018 ~ 0x03C */ +uint32_t modrst_ctrl1;/* 0x040 */ +uint32_t modrst_clr1;/* 0x044 */ +uint32_t rsv_0x48;/* 0x048 */ +uint32_t rsv_0x4C;/* 0x04C */ +uint32_t modrst_ctrl2;/* 0x050 */ +uint32_t modrst_clr2;/* 0x054 */ +uint32_t rsv_0x58;/* 0x058 */ +uint32_t rsv_0x5C;/* 0x05C */ +uint32_t extrst_sel1;/* 0x060 */ +uint32_t sysrst_sts1_1;/* 0x064 */ +uint32_t sysrst_sts1_2;/* 0x068 */ +uint32_t sysrst_sts1_3;/* 0x06C */ +uint32_t extrst_sel2;/* 0x070 */ +uint32_t sysrst_sts2_1;/* 0x074 */ +uint32_t sysrst_sts2_2;/* 0x078 */ +uint32_t stsrst_sts3_2;/* 0x07C */ +uint32_t clkgate_ctrl1;/* 0x080 */ +uint32_t clkgate_clr1;/* 0x084 */ +uint32_t rsv_0x88;/* 0x088 */ +uint32_t rsv_0x8C;/* 0x08C */ +uint32_t clkgate_ctrl2;/* 0x090 */ +uint32_t clkgate_clr2;/* 0x094 */ +uint32_t rsv_0x98[10 ];/* 0x098 ~ 0x0BC */ +uint32_t misc_ctrl1;/* 0x0C0 */ +uint32_t misc_ctrl2;/* 0x0C4 */ +uint32_t debug_ctrl1;/* 0x0C8 */ +uint32_t rsv_0xCC;/* 0x0CC */ +uint32_t misc_ctrl3;/* 0x0D0 */ +uint32_t misc_ctrl4;/* 0x0D4 */ +uint32_t debug_ctrl2;/* 0x0D8 */ +uint32_t rsv_0xdc[9 ];/* 0x0DC ~ 0x0FC */ +uint32_t dram_hdshk;/* 0x100 */ +uint32_t soc_scratch[3 ];/* 0x104 ~ 0x10C */ +uint32_t rsv_0x110[4 ];/* 0x110 ~ 0x11C*/ +uint32_t cpu_scratch_wp;/* 0x120 */ +uint32_t rsv_0x124[23 ];/* 0x124 */ +uint32_t smp_boot[12 ];/* 0x180 */ +uint32_t cpu_scratch[20 ];/* 0x1b0 */ +uint32_t hpll;/* 0x200 */ +uint32_t hpll_ext;/* 0x204 */ +uint32_t rsv_0x208[2 ];/* 0x208 ~ 0x20C */ +uint32_t apll;/* 0x210 */ +uint32_t apll_ext;/* 0x214 */ +uint32_t rsv_0x218[2 ];/* 0x218 ~ 0x21C */ +uint32_t mpll;/* 0x220 */ +uint32_t mpll_ext;/* 0x224 */ +uint32_t rsv_0x228[6 ];/* 0x228 ~ 0x23C */ +uint32_t epll;/* 0x240 */ +uint32_t epll_ext;/* 0x244 */ +uint32_t rsv_0x248[6 ];/* 0x248 ~ 0x25C */ +uint32_t dpll;/* 0x260 */ +uint32_t dpll_ext;/* 0x264 */ +uint32_t rsv_0x268[38 ];/* 0x268 ~ 0x2FC */ +uint32_t clksrc1;/* 0x300 */ +uint32_t clksrc2;/* 0x304 */ +uint32_t clksrc3;/* 0x308 */ +uint32_t rsv_0x30c;/* 0x30C */ +uint32_t clksrc4;/* 0x310 */ +uint32_t clksrc5;/* 0x314 */ +uint32_t rsv_0x318[2 ];/* 0x318 ~ 0x31C */ +uint32_t freq_counter_ctrl1;/* 0x320 */ +uint32_t freq_counter_cmp1;/* 0x324 */ +uint32_t rsv_0x328[2 ];/* 0x328 ~ 0x32C */ +uint32_t freq_counter_ctrl2;/* 0x330 */ +uint32_t freq_counter_cmp2;/* 0x334 */ +uint32_t uart_clkgen;/* 0x338 */ +uint32_t huart_clkgen;/* 0x33C */ +uint32_t mac12_clk_delay;/* 0x340 */ +uint32_t rsv_0x344;/* 0x344 */ +uint32_t mac12_clk_delay_100M;/* 0x348 */ +uint32_t mac12_clk_delay_10M;/* 0x34C */ +uint32_t mac34_clk_delay;/* 0x350 */ +uint32_t rsv_0x354;/* 0x354 */ +uint32_t mac34_clk_delay_100M;/* 0x358 */ +uint32_t mac34_clk_delay_10M;/* 0x35C */ +uint32_t clkduty_meas_ctrl;/* 0x360 */ +uint32_t clkduty1;/* 0x364 */ +uint32_t clkduty2;/* 0x368 */ +uint32_t clkduty_meas_res;/* 0x36C */ +uint32_t clkduty_meas_ctrl2;/* 0x370 */ +uint32_t clkduty3;/* 0x374 */ +uint32_t rsv_0x378[34 ];/* 0x378 ~ 0x3FC */ +uint32_t pinmux1;/* 0x400 */ +uint32_t pinmux2;/* 0x404 */ +uint32_t rsv_0x408;/* 0x408 */ +uint32_t pinmux3;/* 0x40C */ +uint32_t pinmux4;/* 0x410 */ +uint32_t pinmux5;/* 0x414 */ +uint32_t pinmux6;/* 0x418 */ +uint32_t pinmux7;/* 0x41C */ +uint32_t rsv_0x420[4 ];/* 0x420 ~ 0x42C */ +uint32_t pinmux8;/* 0x430 */ +uint32_t pinmux9;/* 0x434 */ +uint32_t pinmux10;/* 0x438 */ +uint32_t rsv_0x43c;/* 0x43C */ +uint32_t pinmux12;/* 0x440 */ +uint32_t pinmux13;/* 0x444 */ +uint32_t rsv_0x448[2 ];/* 0x448 ~ 0x44C */ +uint32_t pinmux14;/* 0x450 */ +uint32_t pinmux15;/* 0x454 */ +uint32_t pinmux16;/* 0x458 */ +uint32_t rsv_0x45c[21 ];/* 0x45C ~ 0x4AC */ +uint32_t pinmux17;/* 0x4B0 */ +uint32_t pinmux18;/* 0x4B4 */ +uint32_t pinmux19;/* 0x4B8 */ +uint32_t pinmux20;/* 0x4BC */ +uint32_t rsv_0x4c0[5 ];/* 0x4C0 ~ 0x4D0 */ +uint32_t pinmux22;/* 0x4D4 */ +uint32_t pinmux23;/* 0x4D8 */ +uint32_t rsv_0x4dc[9 ];/* 0x4DC ~ 0x4FC */ +uint32_t hwstrap1;/* 0x500 */ +uint32_t hwstrap_clr1;/* 0x504 */ +uint32_t hwstrap_prot1;/* 0x508 */ +uint32_t rsv_0x50c;/* 0x50C */ +uint32_t hwstrap2;/* 0x510 */ +uint32_t hwstrap_clr2;/* 0x514 */ +uint32_t hwstrap_prot2;/* 0x518 */ +uint32_t rsv_0x51c;/* 0x51C */ +uint32_t rng_ctrl;/* 0x520 */ +uint32_t rng_data;/* 0x524 */ +uint32_t rsv_0x528[6 ];/* 0x528 ~ 0x53C */ +uint32_t pwr_save_wakeup_en1;/* 0x540 */ +uint32_t pwr_save_wakeup_ctrl1;/* 0x544 */ +uint32_t rsv_0x548[2 ];/* 0x548 */ +uint32_t pwr_save_wakeup_en2;/* 0x550 */ +uint32_t pwr_save_wakeup_ctrl2;/* 0x554 */ +uint32_t rsv_0x558[2 ];/* 0x558 */ +uint32_t intr1_ctrl_sts;/* 0x560 */ +uint32_t rsv_0x564[3 ];/* 0x564 */ +uint32_t intr2_ctrl_sts;/* 0x570 */ +uint32_t rsv_0x574[7 ];/* 0x574 ~ 0x58C */ +uint32_t otp_ctrl;/* 0x590 */ +uint32_t efuse;/* 0x594 */ +uint32_t rsv_0x598[6 ];/* 0x598 */ +uint32_t chip_unique_id[8 ];/* 0x5B0 */ +uint32_t rsv_0x5e0[8 ];/* 0x5E0 ~ 0x5FC */ +uint32_t disgpio_in_pull_down0;/* 0x610 */ +uint32_t disgpio_in_pull_down1;/* 0x614 */ +uint32_t disgpio_in_pull_down2;/* 0x618 */ +uint32_t disgpio_in_pull_down3;/* 0x61C */ +uint32_t rsv_0x620[4 ];/* 0x620 ~ 0x62C */ +uint32_t disgpio_in_pull_down4;/* 0x630 */ +uint32_t disgpio_in_pull_down5;/* 0x634 */ +uint32_t disgpio_in_pull_down6;/* 0x638 */ +uint32_t rsv_0x63c[5 ];/* 0x63C ~ 0x64C */ +uint32_t sli_driving_strength;/* 0x650 */ +uint32_t rsv_0x654[107 ];/* 0x654 ~ 0x7FC */ +uint32_t ca7_ctrl1;/* 0x800 */ +uint32_t ca7_ctrl2;/* 0x804 */ +uint32_t ca7_ctrl3;/* 0x808 */ +uint32_t ca7_ctrl4;/* 0x80C */ +uint32_t rsv_0x810[4 ];/* 0x810 ~ 0x81C */ +uint32_t ca7_parity_chk;/* 0x820 */ +uint32_t ca7_parity_clr;/* 0x824 */ +uint32_t rsv_0x828[118 ];/* 0x828 ~ 0x9FC */ +uint32_t cm3_ctrl;/* 0xA00 */ +uint32_t cm3_base;/* 0xA04 */ +uint32_t cm3_imem_addr;/* 0xA08 */ +uint32_t cm3_dmem_addr;/* 0xA0C */ +uint32_t rsv_0xa10[12 ];/* 0xA10 ~ 0xA3C */ +uint32_t cm3_cache_area;/* 0xA40 */ +uint32_t cm3_cache_invd_ctrl;/* 0xA44 */ +uint32_t cm3_cache_func_ctrl;/* 0xA48 */ +uint32_t rsv_0xa4c[108 ];/* 0xA4C ~ 0xBFC */ +uint32_t pci_cfg[3 ];/* 0xC00 */ +uint32_t rsv_0xc0c[5 ];/* 0xC0C ~ 0xC1C */ +uint32_t pcie_cfg;/* 0xC20 */ +uint32_t mmio_decode;/* 0xC24 */ +uint32_t reloc_ctrl_decode[2 ];/* 0xC28 */ +uint32_t rsv_0xc30[4 ];/* 0xC30 ~ 0xC3C */ +uint32_t mbox_decode;/* 0xC40 */ +uint32_t shared_sram_decode[2 ];/* 0xC44 */ +uint32_t bmc_rev_id;/* 0xC4C */ +uint32_t rsv_0xc50[5 ];/* 0xC50 ~ 0xC60 */ +uint32_t bmc_device_id;/* 0xC64 */ +uint32_t rsv_0xc68[102 ];/* 0xC68 ~ 0xDFC */ +uint32_t vga_scratch1;/* 0xE00 */ +uint32_t vga_scratch2;/* 0xE04 */ +uint32_t vga_scratch3;/* 0xE08 */ +uint32_t vga_scratch4;/* 0xE0C */ +uint32_t rsv_0xe10[4 ];/* 0xE10 ~ 0xE1C */ +uint32_t vga_scratch5;/* 0xE20 */ +uint32_t vga_scratch6;/* 0xE24 */ +uint32_t vga_scratch7;/* 0xE28 */ +uint32_t vga_scratch8;/* 0xE2C */ +uint32_t rsv_0xe30[52 ];/* 0xE30 ~ 0xEFC */ +uint32_t wr_prot1;/* 0xF00 */ +uint32_t wr_prot2;/* 0xF04 */ +uint32_t wr_prot3;/* 0xF08 */ +uint32_t wr_prot4;/* 0xF0C */ +uint32_t wr_prot5;/* 0xF10 */ +uint32_t wr_prot6;/* 0xF18 */ +uint32_t wr_prot7;/* 0xF1C */ +uint32_t wr_prot8;/* 0xF20 */ +uint32_t wr_prot9;/* 0xF24 */ +uint32_t rsv_0xf28[2 ];/* 0xF28 ~ 0xF2C */ +uint32_t wr_prot10;/* 0xF30 */ +uint32_t wr_prot11;/* 0xF34 */ +uint32_t wr_prot12;/* 0xF38 */ +uint32_t wr_prot13;/* 0xF3C */ +uint32_t wr_prot14;/* 0xF40 */ +uint32_t rsv_0xf44;/* 0xF44 */ +uint32_t wr_prot15;/* 0xF48 */ +uint32_t rsv_0xf4c[5 ];/* 0xF4C ~ 0xF5C */ +uint32_t wr_prot16;/* 0xF60 */ +}; +#endif +#endif
drivers/clk/aspeed/Makefile +1 -0
@@ -4,3 +4,4 @@ # obj-$(CONFIG_ASPEED_AST2500) += clk_ast2500.o +obj-$(CONFIG_ASPEED_AST2600) += clk_ast2600.o
drivers/clk/aspeed/clk_ast2600.c new file +1173 -0
1,173 lines not on this page · raw message
include/dt-bindings/clock/ast2600-clock.h new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
2.17.1
Chia-Wei
PATCH 2/7 ram: aspeed: Add AST2600 DRAM control support
In reply to Chia-WeiFrom: Dylan Hung <[email protected]>
AST2600 supports DDR4 SDRAM with maximum speed DDR4-1600. The DDR4 DRAM types including 128MbX16 (2Gb), 256MbX16 (4Gb), 512MbX16 (8Gb), 1GbX16 (16Gb), and 1GbX8 TwinDie (16Gb) are supported.
--- .../include/asm/arch-aspeed/sdram_ast2600.h | 163 +++ drivers/ram/aspeed/Kconfig | 61 +- drivers/ram/aspeed/Makefile | 3 +- drivers/ram/aspeed/sdram_ast2600.c | 1061 +++++++++++++++++ 4 files changed, 1286 insertions(+), 2 deletions(-) create mode 100644 arch/arm/include/asm/arch-aspeed/sdram_ast2600.h create mode 100644 drivers/ram/aspeed/sdram_ast2600.c
arch/arm/include/asm/arch-aspeed/sdram_ast2600.h new file +163 -0
@@ -0,0 +1,163 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) Aspeed Technology Inc. +*/ +#ifndef _ASM_ARCH_SDRAM_AST2600_H +#define _ASM_ARCH_SDRAM_AST2600_H + +/* keys for unlocking HW */ +#define SDRAM_UNLOCK_KEY 0xFC600309 +#define SDRAM_VIDEO_UNLOCK_KEY 0x00440003 + +/* Fixed priority DRAM Requests mask */ +#define REQ_PRI_VGA_HW_CURSOR_R 0 +#define REQ_PRI_VGA_CRT_R 1 +#define REQ_PRI_SOC_DISPLAY_CTRL_R 2 +#define REQ_PRI_PCIE_BUS1_RW 3 +#define REQ_PRI_VIDEO_HIGH_PRI_W 4 +#define REQ_PRI_CPU_RW 5 +#define REQ_PRI_SLI_RW 6 +#define REQ_PRI_PCIE_BUS2_RW 7 +#define REQ_PRI_USB2_0_HUB_EHCI1_DMA_RW 8 +#define REQ_PRI_USB2_0_DEV_EHCI2_DMA_RW 9 +#define REQ_PRI_USB1_1_UHCI_HOST_RW 10 +#define REQ_PRI_AHB_BUS_RW 11 +#define REQ_PRI_CM3_DATA_RW 12 +#define REQ_PRI_CM3_INST_R 13 +#define REQ_PRI_MAC0_DMA_RW 14 +#define REQ_PRI_MAC1_DMA_RW 15 +#define REQ_PRI_SDIO_DMA_RW 16 +#define REQ_PRI_PILOT_ENGINE_RW 17 +#define REQ_PRI_XDMA1_RW 18 +#define REQ_PRI_MCTP1_RW 19 +#define REQ_PRI_VIDEO_FLAG_RW 20 +#define REQ_PRI_VIDEO_LOW_PRI_W 21 +#define REQ_PRI_2D_ENGINE_DATA_RW 22 +#define REQ_PRI_ENC_ENGINE_RW 23 +#define REQ_PRI_MCTP2_RW 24 +#define REQ_PRI_XDMA2_RW 25 +#define REQ_PRI_ECC_RSA_RW 26 + +#define MCR30_RESET_DLL_DELAY_EN BIT(4) +#define MCR30_MODE_REG_SEL_SHIFT 1 +#define MCR30_MODE_REG_SEL_MASK GENMASK(3, 1) +#define MCR30_SET_MODE_REG BIT(0) + +#define MCR30_SET_MR (mr) ((mr << MCR30_MODE_REG_SEL_SHIFT) | MCR30_SET_MODE_REG) + +#define MCR34_SELF_REFRESH_STATUS_MASK GENMASK(30, 28) + +#define MCR34_ODT_DELAY_SHIFT 12 +#define MCR34_ODT_DELAY_MASK GENMASK(15, 12) +#define MCR34_ODT_EXT_SHIFT 10 +#define MCR34_ODT_EXT_MASK GENMASK(11, 10) +#define MCR34_ODT_AUTO_ON BIT(9) +#define MCR34_ODT_EN BIT(8) +#define MCR34_RESETN_DIS BIT(7) +#define MCR34_MREQI_DIS BIT(6) +#define MCR34_MREQ_BYPASS_DIS BIT(5) +#define MCR34_RGAP_CTRL_EN BIT(4) +#define MCR34_CKE_OUT_IN_SELF_REF_DIS BIT(3) +#define MCR34_FOURCE_SELF_REF_EN BIT(2) +#define MCR34_AUTOPWRDN_EN BIT(1) +#define MCR34_CKE_EN BIT(0) + +#define MCR38_RW_MAX_GRANT_CNT_RQ_SHIFT 16 +#define MCR38_RW_MAX_GRANT_CNT_RQ_MASK GENMASK(20, 16) + +/* default request queued limitation mask (0xFFBBFFF4) */ +#define MCR3C_DEFAULT_MASK \ + ~(REQ_PRI_VGA_HW_CURSOR_R | REQ_PRI_VGA_CRT_R | REQ_PRI_PCIE_BUS1_RW | \ + REQ_PRI_XDMA1_RW | REQ_PRI_2D_ENGINE_DATA_RW) + +#define MCR50_RESET_ALL_INTR BIT(31) +#define SDRAM_CONF_ECC_AUTO_SCRUBBING BIT(9) +#define SDRAM_CONF_SCRAMBLE BIT(8) +#define SDRAM_CONF_ECC_EN BIT(7) +#define SDRAM_CONF_DUALX8 BIT(5) +#define SDRAM_CONF_DDR4 BIT(4) +#define SDRAM_CONF_VGA_SIZE_SHIFT 2 +#define SDRAM_CONF_VGA_SIZE_MASK GENMASK(3, 2) +#define SDRAM_CONF_CAP_SHIFT 0 +#define SDRAM_CONF_CAP_MASK GENMASK(1, 0) + +#define SDRAM_CONF_CAP_256M 0 +#define SDRAM_CONF_CAP_512M 1 +#define SDRAM_CONF_CAP_1024M 2 +#define SDRAM_CONF_CAP_2048M 3 +#define SDRAM_CONF_ECC_SETUP (SDRAM_CONF_ECC_AUTO_SCRUBBING | SDRAM_CONF_ECC_EN) + +#define SDRAM_MISC_DDR4_TREFRESH (1 << 3) + +#define SDRAM_PHYCTRL0_PLL_LOCKED BIT(4) +#define SDRAM_PHYCTRL0_NRST BIT(2) +#define SDRAM_PHYCTRL0_INIT BIT(0) + +/* MCR0C */ +#define SDRAM_REFRESH_PERIOD_ZQCS_SHIFT 16 +#define SDRAM_REFRESH_PERIOD_ZQCS_MASK GENMASK(31, 16) +#define SDRAM_REFRESH_PERIOD_SHIFT 8 +#define SDRAM_REFRESH_PERIOD_MASK GENMASK(15, 8) +#define SDRAM_REFRESH_ZQCS_EN BIT(7) +#define SDRAM_RESET_DLL_ZQCL_EN BIT(6) +#define SDRAM_LOW_PRI_REFRESH_EN BIT(5) +#define SDRAM_FORCE_PRECHARGE_EN BIT(4) +#define SDRAM_REFRESH_EN BIT(0) + +#define SDRAM_TEST_LEN_SHIFT 4 +#define SDRAM_TEST_LEN_MASK 0xfffff +#define SDRAM_TEST_START_ADDR_SHIFT 24 +#define SDRAM_TEST_START_ADDR_MASK 0x3f + +#define SDRAM_TEST_EN (1 << 0) +#define SDRAM_TEST_MODE_SHIFT 1 +#define SDRAM_TEST_MODE_MASK (0x3 << SDRAM_TEST_MODE_SHIFT) +#define SDRAM_TEST_MODE_WO (0x0 << SDRAM_TEST_MODE_SHIFT) +#define SDRAM_TEST_MODE_RB (0x1 << SDRAM_TEST_MODE_SHIFT) +#define SDRAM_TEST_MODE_RW (0x2 << SDRAM_TEST_MODE_SHIFT) + +#define SDRAM_TEST_GEN_MODE_SHIFT 3 +#define SDRAM_TEST_GEN_MODE_MASK (7 << SDRAM_TEST_GEN_MODE_SHIFT) +#define SDRAM_TEST_TWO_MODES (1 << 6) +#define SDRAM_TEST_ERRSTOP (1 << 7) +#define SDRAM_TEST_DONE (1 << 12) +#define SDRAM_TEST_FAIL (1 << 13) + +#define SDRAM_AC_TRFC_SHIFT 0 +#define SDRAM_AC_TRFC_MASK 0xff + +#define SDRAM_ECC_RANGE_ADDR_MASK GENMASK(30, 20) +#define SDRAM_ECC_RANGE_ADDR_SHIFT 20 + +#ifndef __ASSEMBLY__ +struct ast2600_sdrammc_regs { +u32 protection_key;/* offset 0x00 */ +u32 config;/* offset 0x04 */ +u32 gm_protection_key;/* offset 0x08 */ +u32 refresh_timing;/* offset 0x0C */ +u32 ac_timing[4 ];/* offset 0x10 ~ 0x1C */ +u32 mr01_mode_setting;/* offset 0x20 */ +u32 mr23_mode_setting;/* offset 0x24 */ +u32 mr45_mode_setting;/* offset 0x28 */ +u32 mr6_mode_setting;/* offset 0x2C */ +u32 mode_setting_control;/* offset 0x30 */ +u32 power_ctrl;/* offset 0x34 */ +u32 arbitration_ctrl;/* offset 0x38 */ +u32 req_limit_mask;/* offset 0x3C */ +u32 max_grant_len[4 ];/* offset 0x40 ~ 0x4C */ +u32 intr_ctrl;/* offset 0x50 */ +u32 ecc_range_ctrl;/* offset 0x54 */ +u32 first_ecc_err_addr;/* offset 0x58 */ +u32 last_ecc_err_addr;/* offset 0x5C */ +u32 phy_ctrl[4 ];/* offset 0x60 ~ 0x6C */ +u32 ecc_test_ctrl;/* offset 0x70 */ +u32 test_addr;/* offset 0x74 */ +u32 test_fail_dq_bit;/* offset 0x78 */ +u32 test_init_val;/* offset 0x7C */ +u32 req_input_ctrl;/* offset 0x80 */ +u32 req_high_pri_ctrl;/* offset 0x84 */ +u32 reserved0[6 ];/* offset 0x88 ~ 0x9C */ +}; +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_ARCH_SDRAM_AST2600_H */
drivers/ram/aspeed/Kconfig +60 -1
68 lines not on this page · raw message
drivers/ram/aspeed/Makefile +2 -1
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_ASPEED_AST2500) += sdram_ast2500.o +obj-$(CONFIG_ASPEED_AST2500) += sdram_ast2500.o +obj-$(CONFIG_ASPEED_AST2600) += sdram_ast2600.o
drivers/ram/aspeed/sdram_ast2600.c new file +1061 -0
1,061 lines not on this page · raw message
Signature · 1 line
2.17.1
Chia-Wei
PATCH 3/7 wdt: aspeed: Add AST2600 watchdog support
In reply to Chia-WeiAST2600 has 8 watchdog timers including 8 sets of
32-bit decrement counters, based on 1MHz clock.
A 64-bit reset mask is also supported to specify which controllers should be reset by the WDT reset.
--- .../arm/include/asm/arch-aspeed/wdt_ast2600.h | 129 ++++++++++++++++++ drivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/ast2600_wdt.c | 110 +++++++++++++++ 4 files changed, 249 insertions(+) create mode 100644 arch/arm/include/asm/arch-aspeed/wdt_ast2600.h create mode 100644 drivers/watchdog/ast2600_wdt.c
arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +129 -0
@@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) 2020 Aspeed Technology Inc. +*/ + +#ifndef _ASM_ARCH_WDT_AST2600_H +#define _ASM_ARCH_WDT_AST2600_H + +#define WDT_BASE 0x1e785000 + +/* +* Special value that needs to be written to counter_restart register to +* (re)start the timer +*/ +#define WDT_COUNTER_RESTART_VAL 0x4755 + +/* reset mode */ +#define WDT_RESET_MODE_SOC 0 +#define WDT_RESET_MODE_CHIP 1 +#define WDT_RESET_MODE_CPU 2 + +/* bit-fields of WDT control register */ +#define WDT_CTRL_2ND_BOOT BIT(7) +#define WDT_CTRL_RESET_MODE_MASK GENMASK(6, 5) +#define WDT_CTRL_RESET_MODE_SHIFT 5 +#define WDT_CTRL_CLK1MHZ BIT(4) +#define WDT_CTRL_RESET BIT(1) +#define WDT_CTRL_EN BIT(0) + +/* bit-fields of WDT reset mask1 register */ +#define WDT_RESET_MASK1_RVAS BIT(25) +#define WDT_RESET_MASK1_GPIO1 BIT(24) +#define WDT_RESET_MASK1_XDMA2 BIT(23) +#define WDT_RESET_MASK1_XDMA1 BIT(22) +#define WDT_RESET_MASK1_MCTP2 BIT(21) +#define WDT_RESET_MASK1_MCTP1 BIT(20) +#define WDT_RESET_MASK1_JTAG1 BIT(19) +#define WDT_RESET_MASK1_SD_SDIO1 BIT(18) +#define WDT_RESET_MASK1_MAC2 BIT(17) +#define WDT_RESET_MASK1_MAC1 BIT(16) +#define WDT_RESET_MASK1_GPMCU BIT(15) +#define WDT_RESET_MASK1_DPMCU BIT(14) +#define WDT_RESET_MASK1_DP BIT(13) +#define WDT_RESET_MASK1_HAC BIT(12) +#define WDT_RESET_MASK1_VIDEO BIT(11) +#define WDT_RESET_MASK1_CRT BIT(10) +#define WDT_RESET_MASK1_GCRT BIT(9) +#define WDT_RESET_MASK1_USB11_UHCI BIT(8) +#define WDT_RESET_MASK1_USB_PORTA BIT(7) +#define WDT_RESET_MASK1_USB_PORTB BIT(6) +#define WDT_RESET_MASK1_COPROC BIT(5) +#define WDT_RESET_MASK1_SOC BIT(4) +#define WDT_RESET_MASK1_SLI BIT(3) +#define WDT_RESET_MASK1_AHB BIT(2) +#define WDT_RESET_MASK1_SDRAM BIT(1) +#define WDT_RESET_MASK1_ARM BIT(0) + +/* bit-fields of WDT reset mask2 register */ +#define WDT_RESET_MASK2_ESPI BIT(26) +#define WDT_RESET_MASK2_I3C_BUS8 BIT(25) +#define WDT_RESET_MASK2_I3C_BUS7 BIT(24) +#define WDT_RESET_MASK2_I3C_BUS6 BIT(23) +#define WDT_RESET_MASK2_I3C_BUS5 BIT(22) +#define WDT_RESET_MASK2_I3C_BUS4 BIT(21) +#define WDT_RESET_MASK2_I3C_BUS3 BIT(20) +#define WDT_RESET_MASK2_I3C_BUS2 BIT(19) +#define WDT_RESET_MASK2_I3C_BUS1 BIT(18) +#define WDT_RESET_MASK2_I3C_GLOBAL BIT(17) +#define WDT_RESET_MASK2_I2C BIT(16) +#define WDT_RESET_MASK2_FSI BIT(15) +#define WDT_RESET_MASK2_ADC BIT(14) +#define WDT_RESET_MASK2_PWM BIT(13) +#define WDT_RESET_MASK2_PECI BIT(12) +#define WDT_RESET_MASK2_LPC BIT(11) +#define WDT_RESET_MASK2_MDC_MDIO BIT(10) +#define WDT_RESET_MASK2_GPIO2 BIT(9) +#define WDT_RESET_MASK2_JTAG2 BIT(8) +#define WDT_RESET_MASK2_SD_SDIO2 BIT(7) +#define WDT_RESET_MASK2_MAC4 BIT(6) +#define WDT_RESET_MASK2_MAC3 BIT(5) +#define WDT_RESET_MASK2_SOC BIT(4) +#define WDT_RESET_MASK2_SLI2 BIT(3) +#define WDT_RESET_MASK2_AHB2 BIT(2) +#define WDT_RESET_MASK2_SPI1_SPI2 BIT(1) +#define WDT_RESET_MASK2_ARM BIT(0) + +#define WDT_RESET_MASK1_DEFAULT \ + (WDT_RESET_MASK1_RVAS | WDT_RESET_MASK1_GPIO1 | \ + WDT_RESET_MASK1_JTAG1 | WDT_RESET_MASK1_SD_SDIO1 | \ + WDT_RESET_MASK1_MAC2 | WDT_RESET_MASK1_MAC1 | \ + WDT_RESET_MASK1_HAC | WDT_RESET_MASK1_VIDEO | \ + WDT_RESET_MASK1_CRT | WDT_RESET_MASK1_GCRT | \ + WDT_RESET_MASK1_USB11_UHCI | WDT_RESET_MASK1_USB_PORTA | \ + WDT_RESET_MASK1_USB_PORTB | WDT_RESET_MASK1_COPROC | \ + WDT_RESET_MASK1_SOC | WDT_RESET_MASK1_ARM) + +#define WDT_RESET_MASK2_DEFAULT \ + (WDT_RESET_MASK2_I3C_BUS8 | WDT_RESET_MASK2_I3C_BUS7 | \ + WDT_RESET_MASK2_I3C_BUS6 | WDT_RESET_MASK2_I3C_BUS5 | \ + WDT_RESET_MASK2_I3C_BUS4 | WDT_RESET_MASK2_I3C_BUS3 | \ + WDT_RESET_MASK2_I3C_BUS2 | WDT_RESET_MASK2_I3C_BUS1 | \ + WDT_RESET_MASK2_I3C_GLOBAL | WDT_RESET_MASK2_I2C | \ + WDT_RESET_MASK2_FSI | WDT_RESET_MASK2_ADC | \ + WDT_RESET_MASK2_PWM | WDT_RESET_MASK2_PECI | \ + WDT_RESET_MASK2_LPC | WDT_RESET_MASK2_MDC_MDIO | \ + WDT_RESET_MASK2_GPIO2 | WDT_RESET_MASK2_JTAG2 | \ + WDT_RESET_MASK2_SD_SDIO2 | WDT_RESET_MASK2_MAC4 | \ + WDT_RESET_MASK2_MAC3 | WDT_RESET_MASK2_SOC | \ + WDT_RESET_MASK2_ARM) + +#ifndef __ASSEMBLY__ +struct ast2600_wdt { +u32 counter_status; +u32 counter_reload_val; +u32 counter_restart; +u32 ctrl; +u32 timeout_status; +u32 clr_timeout_status; +u32 reset_width; +u32 reset_mask1; +u32 reset_mask2; +u32 sw_reset_ctrl; +u32 sw_reset_mask1; +u32 sw_reset_mask2; +u32 sw_reset_disable; +}; +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_ARCH_WDT_AST2600_H */
drivers/watchdog/Kconfig +9 -0
@@ -86,6 +86,15 @@ config WDT_ASPEED It currently does not support Boot Flash Addressing Mode Detection or Second Boot. +config WDT_AST2600 + bool "Aspeed AST2600 watchdog timer support" + depends on WDT + default y if ASPEED_AST2600 + help + Select this to enable watchdog timer for Aspeed ast2500/ast2400 devices. + The watchdog timer is stopped when initialized. It performs reset, either + full SoC reset or CPU or just some peripherals, based on the flags. + config WDT_AT91 bool "AT91 watchdog timer support" depends on WDT
drivers/watchdog/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_$(SPL_TPL_)WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o obj-$(CONFIG_WDT_ARMADA_37XX) += armada-37xx-wdt.o obj-$(CONFIG_WDT_ASPEED) += ast_wdt.o +obj-$(CONFIG_WDT_AST2600) += ast2600_wdt.o obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o obj-$(CONFIG_WDT_CORTINA) += cortina_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o
drivers/watchdog/ast2600_wdt.c new file +110 -0
110 lines not on this page · raw message
Signature · 1 line
2.17.1
Chia-Wei
PATCH 4/7 reset: aspeed: Add AST2600 reset support
In reply to Chia-WeiAdd controller reset support through the
System Control Unit (SCU) of AST2600 SoC.
--- drivers/reset/Kconfig | 9 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-ast2600.c | 108 ++++++++++++++++++++++ include/dt-bindings/reset/ast2600-reset.h | 70 ++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 drivers/reset/reset-ast2600.c create mode 100644 include/dt-bindings/reset/ast2600-reset.h
drivers/reset/Kconfig +9 -0
@@ -81,6 +81,15 @@ config RESET_AST2500 Say Y if you want to control reset signals of different peripherals through System Control Unit (SCU). +config RESET_AST2600 + bool "Reset controller driver for AST2600 SoCs" + depends on DM_RESET + default y if ASPEED_AST2600 + help + Support for reset controller on AST2600 SoC. + Say Y if you want to control reset signals of different peripherals + through System Control Unit (SCU). + config RESET_ROCKCHIP bool "Reset controller driver for Rockchip SoCs" depends on DM_RESET && ARCH_ROCKCHIP && CLK
drivers/reset/Makefile +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o obj-$(CONFIG_RESET_BCM6345) += reset-bcm6345.o obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o obj-$(CONFIG_RESET_AST2500) += reset-ast2500.o +obj-$(CONFIG_RESET_AST2600) += reset-ast2600.o obj-$(CONFIG_RESET_ROCKCHIP) += reset-rockchip.o obj-$(CONFIG_RESET_MESON) += reset-meson.o obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o
drivers/reset/reset-ast2600.c new file +108 -0
108 lines not on this page · raw message
include/dt-bindings/reset/ast2600-reset.h new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
2.17.1
Chia-Wei
PATCH 5/7 ARM: dts: aspeed: Add AST2600 SoC support
In reply to Chia-WeiAST2600 is the 7th generation of Aspeed SoC designated for Interated Remote Management Processor.
AST2600 has significant performance improvement by integrating 1.2GHz dual-core ARM Cortex A7 (r0p5) CPU with FPU. Most of the controllers are also improved with more features and better performance than preceding AST24xx/AST25xx.
--- arch/arm/dts/Makefile | 1 + arch/arm/dts/ast2600-evb.dts | 179 +++ arch/arm/dts/ast2600-u-boot.dtsi | 44 + arch/arm/dts/ast2600.dtsi | 1946 ++++++++++++++++++++++++++++++ 4 files changed, 2170 insertions(+) create mode 100644 arch/arm/dts/ast2600-evb.dts create mode 100644 arch/arm/dts/ast2600-u-boot.dtsi create mode 100644 arch/arm/dts/ast2600.dtsi
arch/arm/dts/Makefile +1 -0
@@ -947,6 +947,7 @@ dtb-$(CONFIG_ARCH_BCM6858) += \ dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb dtb-$(CONFIG_ASPEED_AST2500) += ast2500-evb.dtb +dtb-$(CONFIG_ASPEED_AST2600) += ast2600-evb.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
arch/arm/dts/ast2600-evb.dts new file +179 -0
179 lines not on this page · raw message
arch/arm/dts/ast2600-u-boot.dtsi new file +44 -0
44 lines not on this page · raw message
arch/arm/dts/ast2600.dtsi new file +1946 -0
1,946 lines not on this page · raw message
Signature · 1 line
2.17.1
Chia-Wei
PATCH 6/7 aspeed: Add AST2600 platform support
In reply to Chia-WeiAdd low level platform initialization for the AST2600 SoC. The 2-stage booting with U-Boot SPL are leveraged to support different booting mode.
However, currently the patch supports only the booting from memory-mapped SPI flash.
--- arch/arm/include/asm/arch-aspeed/boot0.h | 23 ++ arch/arm/include/asm/arch-aspeed/platform.h | 5 + arch/arm/mach-aspeed/Kconfig | 20 ++ arch/arm/mach-aspeed/Makefile | 1 + arch/arm/mach-aspeed/ast2600/Kconfig | 17 ++ arch/arm/mach-aspeed/ast2600/Makefile | 2 + arch/arm/mach-aspeed/ast2600/board_common.c | 105 +++++++++ arch/arm/mach-aspeed/ast2600/lowlevel_init.S | 233 +++++++++++++++++++ arch/arm/mach-aspeed/ast2600/spl.c | 55 +++++ board/aspeed/evb_ast2600/Kconfig | 12 + board/aspeed/evb_ast2600/Makefile | 1 + board/aspeed/evb_ast2600/evb_ast2600.c | 5 + drivers/sysreset/sysreset_ast.c | 5 + include/configs/evb_ast2600.h | 16 ++ 14 files changed, 500 insertions(+) create mode 100644 arch/arm/include/asm/arch-aspeed/boot0.h create mode 100644 arch/arm/mach-aspeed/ast2600/Kconfig create mode 100644 arch/arm/mach-aspeed/ast2600/Makefile create mode 100644 arch/arm/mach-aspeed/ast2600/board_common.c create mode 100644 arch/arm/mach-aspeed/ast2600/lowlevel_init.S create mode 100644 arch/arm/mach-aspeed/ast2600/spl.c create mode 100644 board/aspeed/evb_ast2600/Kconfig create mode 100644 board/aspeed/evb_ast2600/Makefile create mode 100644 board/aspeed/evb_ast2600/evb_ast2600.c create mode 100644 include/configs/evb_ast2600.h
arch/arm/include/asm/arch-aspeed/boot0.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) Aspeed Technology Inc. +*/ + +#ifndef _ASM_ARCH_BOOT0_H +#define _ASM_ARCH_BOOT0_H + +_start: +ARM_VECTORS + + .word 0x0 /* key location */ + .word 0x0 /* start address of image */ + .word 0xfc00 /* maximum image size: 63KB */ + .word 0x0 /* signature address */ + .word 0x0 /* header revision ID low */ + .word 0x0 /* header revision ID high */ + .word 0x0 /* reserved */ + .word 0x0 /* checksum */ + .word 0x0 /* BL2 secure header */ + .word 0x0 /* public key or digest offset for BL2 */ + +#endif
arch/arm/include/asm/arch-aspeed/platform.h +5 -0
@@ -13,6 +13,11 @@#define ASPEED_DRAM_BASE 0x80000000#define ASPEED_SRAM_BASE 0x1e720000#define ASPEED_SRAM_SIZE 0x9000 +#elif defined(CONFIG_ASPEED_AST2600 ) +#define ASPEED_MAC_COUNT 4 +#define ASPEED_DRAM_BASE 0x80000000 +#define ASPEED_SRAM_BASE 0x10000000 +#define ASPEED_SRAM_SIZE 0x10000#else #err "Unrecognized Aspeed platform."#endif
arch/arm/mach-aspeed/Kconfig +20 -0
@@ -9,6 +9,11 @@ config SYS_SOC config SYS_TEXT_BASE default 0x00000000 +choice + prompt "Aspeed SoC select" + depends on ARCH_ASPEED + default ASPEED_AST2500 + config ASPEED_AST2500 bool "Support Aspeed AST2500 SoC" depends on DM_RESET
@@ -18,6 +23,21 @@ config ASPEED_AST2500 It is used as Board Management Controller on many server boards, which is enabled by support of LPC and eSPI peripherals. +config ASPEED_AST2600 + bool "Support Aspeed AST2600 SoC" + select CPU_V7A + select CPU_V7_HAS_NONSEC + select SYS_ARCH_TIMER + select SUPPORT_SPL + select ENABLE_ARM_SOC_BOOT0_HOOK + help + The Aspeed AST2600 is a ARM-based SoC with Cortex-A7 CPU. + It is used as Board Management Controller on many server boards, + which is enabled by support of LPC and eSPI peripherals. + +endchoice + source "arch/arm/mach-aspeed/ast2500/Kconfig" +source "arch/arm/mach-aspeed/ast2600/Kconfig" endif
arch/arm/mach-aspeed/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_ARCH_ASPEED) += ast_wdt.o obj-$(CONFIG_ASPEED_AST2500) += ast2500/ +obj-$(CONFIG_ASPEED_AST2600) += ast2600/
arch/arm/mach-aspeed/ast2600/Kconfig new file +17 -0
@@ -0,0 +1,17 @@ +if ASPEED_AST2600 + +config SYS_CPU + default "armv7" + +config TARGET_EVB_AST2600 + bool "EVB-AST2600" + depends on ASPEED_AST2600 + help + EVB-AST2600 is Aspeed evaluation board for AST2600A0 chip. + It has 512M of RAM, 32M of SPI flash, two Ethernet ports, + 4 Serial ports, 4 USB ports, VGA port, PCIe, SD card slot, + 20 pin JTAG, pinouts for 14 I2Cs, 3 SPIs and eSPI, 8 PWMs. + +source "board/aspeed/evb_ast2600/Kconfig" + +endif
arch/arm/mach-aspeed/ast2600/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +obj-y += lowlevel_init.o board_common.o +obj-$(CONFIG_SPL_BUILD) += spl.o
arch/arm/mach-aspeed/ast2600/board_common.c new file +105 -0
105 lines not on this page · raw message
arch/arm/mach-aspeed/ast2600/lowlevel_init.S new file +233 -0
233 lines not on this page · raw message
arch/arm/mach-aspeed/ast2600/spl.c new file +55 -0
55 lines not on this page · raw message
board/aspeed/evb_ast2600/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +if TARGET_EVB_AST2600 + +config SYS_BOARD + default "evb_ast2600" + +config SYS_VENDOR + default "aspeed" + +config SYS_CONFIG_NAME + default "evb_ast2600" + +endif
board/aspeed/evb_ast2600/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-y += evb_ast2600.o
board/aspeed/evb_ast2600/evb_ast2600.c new file +5 -0
@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) Aspeed Technology Inc. +*/ +#include <common.h>
drivers/sysreset/sysreset_ast.c +5 -0
@@ -12,6 +12,7 @@#include <asm/io.h> #include <asm/arch/wdt.h> #include <linux/err.h> +#include <hang.h> static int ast_sysreset_request (struct udevice *dev,enum sysreset_t type) {
@@ -33,11 +34,15 @@ static int ast_sysreset_request(struct udevice *dev, enum sysreset_t type)return -EPROTONOSUPPORT ; } +#if !defined(CONFIG_SPL_BUILD ) ret =wdt_expire_now (wdt, reset_mode);if (ret) {debug ("Sysreset failed: %d" , ret);return ret; } +#else +hang (); +#endif return -EINPROGRESS ; }
include/configs/evb_ast2600.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) Aspeed Technology Inc. +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/aspeed-common.h> + +#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE + +/* Memory Info */ +#define CONFIG_SYS_LOAD_ADDR 0x83000000 + +#endif /* __CONFIG_H */
Signature · 1 line
2.17.1
Chia-Wei
PATCH 7/7 configs: aspeed: Add defconfig for AST2600 EVB
In reply to Chia-WeiAdd the default configuration for the AST2600 EVB.
--- configs/evb-ast2600_defconfig | 69 +++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 configs/evb-ast2600_defconfig
configs/evb-ast2600_defconfig new file +69 -0
@@ -0,0 +1,69 @@ +CONFIG_ARM=y +CONFIG_SYS_DCACHE_OFF=y +CONFIG_ARCH_ASPEED=y +CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_ASPEED_AST2600=y +CONFIG_TARGET_EVB_AST2600=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x800 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x10000 +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_SIZE_LIMIT=0x10000 +CONFIG_SPL=y +# CONFIG_ARMV7_NONSEC is not set +CONFIG_DEFAULT_DEVICE_TREE="ast2600-evb" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_FIT=y +# CONFIG_LEGACY_IMAGE_FORMAT is not set +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="bootm 20100000" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y +CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_DM_RESET=y +CONFIG_SPL_RAM_SUPPORT=y +CONFIG_SPL_RAM_DEVICE=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_ENV_OVERWRITE=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SPL_DM=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_REGMAP=y +CONFIG_SPL_OF_TRANSLATE=y +CONFIG_CLK=y +CONFIG_SPL_CLK=y +CONFIG_DM_I2C=y +CONFIG_MISC=y +CONFIG_SPL_MISC=y +CONFIG_DM_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ASPEED=y +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH=y +CONFIG_FTGMAC100=y +CONFIG_PHY=y +CONFIG_PINCTRL=y +CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y +CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y +CONFIG_WDT=y +CONFIG_HEXDUMP=y +# CONFIG_SPL_HEXDUMP is not set +# CONFIG_EFI_LOADER is not set
Signature · 1 line
2.17.1
Ryan Chen
maintainerPATCH 2/7 ram: aspeed: Add AST2600 DRAM control support
In reply to Chia-WeiQuoted 9 lines
-----Original Message-----
From: ChiaWei Wang <[email protected]>
Sent: Monday, December 14, 2020 1:54 PM
To: trini at konsulko.com; u-boot at lists.denx.de; Ryan Chen <[email protected]>
Cc: BMC-SW <[email protected]>; Dylan Hung <[email protected]>
Subject: [PATCH 2/7] ram: aspeed: Add AST2600 DRAM control support
Quoted 8 lines
From: Dylan Hung <[email protected]>
AST2600 supports DDR4 SDRAM with maximum speed DDR4-1600. The DDR4 DRAM types including 128MbX16 (2Gb), 256MbX16 (4Gb), 512MbX16 (8Gb), 1GbX16 (16Gb), and 1GbX8 TwinDie (16Gb) are supported.
Signed-off-by Dylan Hung <[email protected]>Signed-off-by Chia-Wei, Wang <[email protected]>
Quoted 1,336 lines
--- .../include/asm/arch-aspeed/sdram_ast2600.h | 163 +++ drivers/ram/aspeed/Kconfig | 61 +- drivers/ram/aspeed/Makefile | 3 +- drivers/ram/aspeed/sdram_ast2600.c | 1061 +++++++++++++++++ 4 files changed, 1286 insertions(+), 2 deletions(-) create mode 100644 arch/arm/include/asm/arch-aspeed/sdram_ast2600.h create mode 100644 drivers/ram/aspeed/sdram_ast2600.carch/arm/include/asm/arch-aspeed/sdram_ast2600.h new file +70
-0@@ -0,0 +1,163 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) Aspeed Technology Inc. +*/ +#ifndef _ASM_ARCH_SDRAM_AST2600_H +#define _ASM_ARCH_SDRAM_AST2600_H + +/* keys for unlocking HW */ +#define SDRAM_UNLOCK_KEY 0xFC600309 +#define SDRAM_VIDEO_UNLOCK_KEY 0x00440003 + +/* Fixed priority DRAM Requests mask */ +#define REQ_PRI_VGA_HW_CURSOR_R 0 +#define REQ_PRI_VGA_CRT_R 1 +#define REQ_PRI_SOC_DISPLAY_CTRL_R 2 +#define REQ_PRI_PCIE_BUS1_RW 3 +#define REQ_PRI_VIDEO_HIGH_PRI_W 4 +#define REQ_PRI_CPU_RW 5 +#define REQ_PRI_SLI_RW 6 +#define REQ_PRI_PCIE_BUS2_RW 7 +#define REQ_PRI_USB2_0_HUB_EHCI1_DMA_RW 8 #define +REQ_PRI_USB2_0_DEV_EHCI2_DMA_RW 9 +#define REQ_PRI_USB1_1_UHCI_HOST_RW 10 +#define REQ_PRI_AHB_BUS_RW 11 +#define REQ_PRI_CM3_DATA_RW 12 +#define REQ_PRI_CM3_INST_R 13 +#define REQ_PRI_MAC0_DMA_RW 14 +#define REQ_PRI_MAC1_DMA_RW 15 +#define REQ_PRI_SDIO_DMA_RW 16 +#define REQ_PRI_PILOT_ENGINE_RW 17 +#define REQ_PRI_XDMA1_RW 18 +#define REQ_PRI_MCTP1_RW 19 +#define REQ_PRI_VIDEO_FLAG_RW 20 +#define REQ_PRI_VIDEO_LOW_PRI_W 21 +#define REQ_PRI_2D_ENGINE_DATA_RW 22 +#define REQ_PRI_ENC_ENGINE_RW 23 +#define REQ_PRI_MCTP2_RW 24 +#define REQ_PRI_XDMA2_RW 25 +#define REQ_PRI_ECC_RSA_RW 26 + +#define MCR30_RESET_DLL_DELAY_EN BIT(4) +#define MCR30_MODE_REG_SEL_SHIFT 1 +#define MCR30_MODE_REG_SEL_MASK GENMASK(3, 1) +#define MCR30_SET_MODE_REG BIT(0) + +#define MCR30_SET_MR (mr) ((mr << MCR30_MODE_REG_SEL_SHIFT) | +MCR30_SET_MODE_REG) + +#define MCR34_SELF_REFRESH_STATUS_MASK GENMASK(30, 28) + +#define MCR34_ODT_DELAY_SHIFT 12 +#define MCR34_ODT_DELAY_MASK GENMASK(15, 12) +#define MCR34_ODT_EXT_SHIFT 10 +#define MCR34_ODT_EXT_MASK GENMASK(11, 10) +#define MCR34_ODT_AUTO_ON BIT(9) +#define MCR34_ODT_EN BIT(8) +#define MCR34_RESETN_DIS BIT(7) +#define MCR34_MREQI_DIS BIT(6) +#define MCR34_MREQ_BYPASS_DIS BIT(5) +#define MCR34_RGAP_CTRL_EN BIT(4) +#define MCR34_CKE_OUT_IN_SELF_REF_DIS BIT(3) +#define MCR34_FOURCE_SELF_REF_EN BIT(2) +#define MCR34_AUTOPWRDN_EN BIT(1) +#define MCR34_CKE_EN BIT(0) + +#define MCR38_RW_MAX_GRANT_CNT_RQ_SHIFT 16 +#define MCR38_RW_MAX_GRANT_CNT_RQ_MASK GENMASK(20, 16) + +/* default request queued limitation mask (0xFFBBFFF4) */ +#define MCR3C_DEFAULT_MASK \
arch/arm/include/asm/arch-aspeed/sdram_ast2600.h new file +1
-0+ ~(REQ_PRI_VGA_HW_CURSOR_R | REQ_PRI_VGA_CRT_R |
REQ_PRI_PCIE_BUS1_RW| \arch/arm/include/asm/arch-aspeed/sdram_ast2600.h new file +18
-0+ REQ_PRI_XDMA1_RW | REQ_PRI_2D_ENGINE_DATA_RW) + +#define MCR50_RESET_ALL_INTR BIT(31) +#define SDRAM_CONF_ECC_AUTO_SCRUBBING BIT(9) +#define SDRAM_CONF_SCRAMBLE BIT(8) +#define SDRAM_CONF_ECC_EN BIT(7) +#define SDRAM_CONF_DUALX8 BIT(5) +#define SDRAM_CONF_DDR4 BIT(4) +#define SDRAM_CONF_VGA_SIZE_SHIFT 2 +#define SDRAM_CONF_VGA_SIZE_MASK GENMASK(3, 2) +#define SDRAM_CONF_CAP_SHIFT 0 +#define SDRAM_CONF_CAP_MASK GENMASK(1, 0) + +#define SDRAM_CONF_CAP_256M 0 +#define SDRAM_CONF_CAP_512M 1 +#define SDRAM_CONF_CAP_1024M 2 +#define SDRAM_CONF_CAP_2048M 3 +#define SDRAM_CONF_ECC_SETUP (
SDRAM_CONF_ECC_AUTO_SCRUBBING|SDRAM_CONF_ECC_EN)arch/arm/include/asm/arch-aspeed/sdram_ast2600.h new file +26
-0+ +#define SDRAM_MISC_DDR4_TREFRESH (1 << 3) + +#define SDRAM_PHYCTRL0_PLL_LOCKED BIT(4) +#define SDRAM_PHYCTRL0_NRST BIT(2) +#define SDRAM_PHYCTRL0_INIT BIT(0) + +/* MCR0C */ +#define SDRAM_REFRESH_PERIOD_ZQCS_SHIFT 16 +#define SDRAM_REFRESH_PERIOD_ZQCS_MASK GENMASK(31, 16) +#define SDRAM_REFRESH_PERIOD_SHIFT 8 +#define SDRAM_REFRESH_PERIOD_MASK GENMASK(15, 8) +#define SDRAM_REFRESH_ZQCS_EN BIT(7) +#define SDRAM_RESET_DLL_ZQCL_EN BIT(6) +#define SDRAM_LOW_PRI_REFRESH_EN BIT(5) +#define SDRAM_FORCE_PRECHARGE_EN BIT(4) +#define SDRAM_REFRESH_EN BIT(0) + +#define SDRAM_TEST_LEN_SHIFT 4 +#define SDRAM_TEST_LEN_MASK 0xfffff +#define SDRAM_TEST_START_ADDR_SHIFT 24 +#define SDRAM_TEST_START_ADDR_MASK 0x3f + +#define SDRAM_TEST_EN (1 << 0) +#define SDRAM_TEST_MODE_SHIFT 1 +#define SDRAM_TEST_MODE_MASK (0x3 <<
SDRAM_TEST_MODE_SHIFT)
+#defineSDRAM_TEST_MODE_WO(0x0<<SDRAM_TEST_MODE_SHIFT)
+#defineSDRAM_TEST_MODE_RB(0x1<<SDRAM_TEST_MODE_SHIFT)
+#defineSDRAM_TEST_MODE_RW(0x2<<SDRAM_TEST_MODE_SHIFT)arch/arm/include/asm/arch-aspeed/sdram_ast2600.h new file +3
-0+ +#define SDRAM_TEST_GEN_MODE_SHIFT 3 +#define SDRAM_TEST_GEN_MODE_MASK (7 <<
SDRAM_TEST_GEN_MODE_SHIFT)arch/arm/include/asm/arch-aspeed/sdram_ast2600.h new file +43
-0+#define SDRAM_TEST_TWO_MODES (1 << 6) +#define SDRAM_TEST_ERRSTOP (1 << 7) +#define SDRAM_TEST_DONE (1 << 12) +#define SDRAM_TEST_FAIL (1 << 13) + +#define SDRAM_AC_TRFC_SHIFT 0 +#define SDRAM_AC_TRFC_MASK 0xff + +#define SDRAM_ECC_RANGE_ADDR_MASK GENMASK(30, 20) +#define SDRAM_ECC_RANGE_ADDR_SHIFT 20 + +#ifndef __ASSEMBLY__ +struct ast2600_sdrammc_regs { +u32 protection_key;/* offset 0x00 */ +u32 config;/* offset 0x04 */ +u32 gm_protection_key;/* offset 0x08 */ +u32 refresh_timing;/* offset 0x0C */ +u32 ac_timing[4 ];/* offset 0x10 ~ 0x1C */ +u32 mr01_mode_setting;/* offset 0x20 */ +u32 mr23_mode_setting;/* offset 0x24 */ +u32 mr45_mode_setting;/* offset 0x28 */ +u32 mr6_mode_setting;/* offset 0x2C */ +u32 mode_setting_control;/* offset 0x30 */ +u32 power_ctrl;/* offset 0x34 */ +u32 arbitration_ctrl;/* offset 0x38 */ +u32 req_limit_mask;/* offset 0x3C */ +u32 max_grant_len[4 ];/* offset 0x40 ~ 0x4C */ +u32 intr_ctrl;/* offset 0x50 */ +u32 ecc_range_ctrl;/* offset 0x54 */ +u32 first_ecc_err_addr;/* offset 0x58 */ +u32 last_ecc_err_addr;/* offset 0x5C */ +u32 phy_ctrl[4 ];/* offset 0x60 ~ 0x6C */ +u32 ecc_test_ctrl;/* offset 0x70 */ +u32 test_addr;/* offset 0x74 */ +u32 test_fail_dq_bit;/* offset 0x78 */ +u32 test_init_val;/* offset 0x7C */ +u32 req_input_ctrl;/* offset 0x80 */ +u32 req_high_pri_ctrl;/* offset 0x84 */ +u32 reserved0[6 ];/* offset 0x88 ~ 0x9C */ +}; +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_ARCH_SDRAM_AST2600_H */ drivers/ram/aspeed/Kconfig index renamed from drivers/ram/aspeed/Kconfig +0
-0
020c913188..049b9dc249100644drivers/ram/aspeed/Kconfig +1
-0@@ -1,4 +1,5 @@ if RAM || SPL_RAM + config ASPEED_DDR4_DUALX8 bool "Enable Dual X8 DDR4 die" depends on DM && OF_CONTROL && ARCH_ASPEED @@ -7,4 +8,62 @@config
ASPEED_DDR4_DUALX8
Say Y if dual X8 DDR4 die is used on the board. The aspeed ddr
sdram
controller needs to know if the memory chip mounted on the board
is dualdrivers/ram/aspeed/Kconfig +58
-1x8 die or not. Or it may get the wrong size of the memory space. -endif + +if ASPEED_AST2600 + +choice + prompt "DDR4 target date rate" + default ASPEED_DDR4_1600 + +config ASPEED_DDR4_400 + bool "DDR4 targets at 400Mbps" + depends on DM && OF_CONTROL && ARCH_ASPEED + help + select DDR4 target data rate at 400M + +config ASPEED_DDR4_800 + bool "DDR4 targets at 800Mbps" + depends on DM && OF_CONTROL && ARCH_ASPEED + help + select DDR4 target data rate at 800M + +config ASPEED_DDR4_1333 + bool "DDR4 targets at 1333Mbps" + depends on DM && OF_CONTROL && ARCH_ASPEED + help + select DDR4 target data rate at 1333M + +config ASPEED_DDR4_1600 + bool "DDR4 targets at 1600Mbps" + depends on DM && OF_CONTROL && ARCH_ASPEED + help + select DDR4 target data rate at 1600M endchoice + +config ASPEED_BYPASS_SELFTEST + bool "bypass self test during DRAM initialization" + default n + help + Say Y here to bypass DRAM self test to speed up the boot time + +config ASPEED_ECC + bool "aspeed SDRAM error correcting code" + depends on DM && OF_CONTROL && ARCH_ASPEED + default n + help + enable SDRAM ECC function + +if ASPEED_ECC +config ASPEED_ECC_SIZE + int "ECC size: 0=driver auto-caluated" + depends on ASPEED_ECC + default 0 + help + SDRAM size with the error correcting code enabled. The unit is + in Megabytes. Noted that only the 8/9 of the configured size + can be used by the system. The remaining 1/9 will be used by + the ECC engine. If the size is set to 0, the sdram driver will + calculate the SDRAM size and set the whole range be ECC enabled. +endif # end of ASPEED_ECC +endif # end of ASPEED_AST2600 +endif # end of RAM || SPL_RAMdrivers/ram/aspeed/Makefile index renamed from drivers/ram/aspeed/Makefile +0
-0
af604f8a4b..7ac10af1c2100644drivers/ram/aspeed/Makefile +0
-1@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_ASPEED_AST2500) += sdram_ast2500.o \ No newline at end offile
drivers/ram/aspeed/Makefile +2
-0+obj-$(CONFIG_ASPEED_AST2500) += sdram_ast2500.o +obj-$(CONFIG_ASPEED_AST2600) += sdram_ast2600.odrivers/ram/aspeed/sdram_ast2600.c new file +444
-0@@ -0,0 +1,1061 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) ASPEED Technology Inc. +*/ +#include <common.h> +#include <clk.h> +#include <dm.h> +#include <errno.h> +#include <ram.h> +#include <regmap.h> +#include <reset.h> +#include <asm/io.h> +#include <asm/arch/scu_ast2600.h> +#include <asm/arch/sdram_ast2600.h> +#include <linux/err.h> +#include <linux/kernel.h> +#include <dt-bindings/clock/ast2600-clock.h> + +#define DDR_PHY_TBL_CHG_ADDR 0xaeeddeea +#define DDR_PHY_TBL_END 0xaeededed + +#if defined(CONFIG_ASPEED_DDR4_800 ) +u32 ast2600_sdramphy_config[165 ] = { +0x1e6e0100 ,// start address +0x00000000 ,// phyr000 +0x0c002062 ,// phyr004 +0x1a7a0063 ,// phyr008 +0x5a7a0063 ,// phyr00c +0x1a7a0063 ,// phyr010 +0x1a7a0063 ,// phyr014 +0x20000000 ,// phyr018 +0x20000000 ,// phyr01c +0x20000000 ,// phyr020 +0x20000000 ,// phyr024 +0x00000008 ,// phyr028 +0x00000000 ,// phyr02c +0x00077600 ,// phyr030 +0x00000000 ,// phyr034 +0x00000000 ,// phyr038 +0x20000000 ,// phyr03c +0x50506000 ,// phyr040 +0x50505050 ,// phyr044 +0x00002f07 ,// phyr048 +0x00003080 ,// phyr04c +0x04000000 ,// phyr050 +0x00000200 ,// phyr054 +0x03140201 ,// phyr058 +0x04800000 ,// phyr05c +0x0800044e ,// phyr060 +0x00000000 ,// phyr064 +0x00180008 ,// phyr068 +0x00e00400 ,// phyr06c +0x00140206 ,// phyr070 +0x1d4c0000 ,// phyr074 +0x493e0107 ,// phyr078 +0x08060404 ,// phyr07c +0x90000a00 ,// phyr080 +0x06420618 ,// phyr084 +0x00001002 ,// phyr088 +0x05701016 ,// phyr08c +0x10000000 ,// phyr090 +0xaeeddeea ,// change address +0x1e6e019c ,// new address +0x20202020 ,// phyr09c +0x20202020 ,// phyr0a0 +0x00002020 ,// phyr0a4 +0x00002020 ,// phyr0a8 +0x00000001 ,// phyr0ac +0xaeeddeea ,// change address +0x1e6e01cc ,// new address +0x01010101 ,// phyr0cc +0x01010101 ,// phyr0d0 +0x80808080 ,// phyr0d4 +0x80808080 ,// phyr0d8 +0xaeeddeea ,// change address +0x1e6e0288 ,// new address +0x80808080 ,// phyr188 +0x80808080 ,// phyr18c +0x80808080 ,// phyr190 +0x80808080 ,// phyr194 +0xaeeddeea ,// change address +0x1e6e02f8 ,// new address +0x90909090 ,// phyr1f8 +0x88888888 ,// phyr1fc +0xaeeddeea ,// change address +0x1e6e0300 ,// new address +0x00000000 ,// phyr200 +0xaeeddeea ,// change address +0x1e6e0194 ,// new address +0x80118260 ,// phyr094 +0xaeeddeea ,// change address +0x1e6e019c ,// new address +0x20202020 ,// phyr09c +0x20202020 ,// phyr0a0 +0x00002020 ,// phyr0a4 +0x80000000 ,// phyr0a8 +0x00000001 ,// phyr0ac +0xaeeddeea ,// change address +0x1e6e0318 ,// new address +0x09222719 ,// phyr218 +0x00aa4403 ,// phyr21c +0xaeeddeea ,// change address +0x1e6e0198 ,// new address +0x08060000 ,// phyr098 +0xaeeddeea ,// change address +0x1e6e01b0 ,// new address +0x00000000 ,// phyr0b0 +0x00000000 ,// phyr0b4 +0x00000000 ,// phyr0b8 +0x00000000 ,// phyr0bc +0x00000000 ,// phyr0c0 +0x00000000 ,// phyr0c4 +0x000aff2c ,// phyr0c8 +0xaeeddeea ,// change address +0x1e6e01dc ,// new address +0x00080000 ,// phyr0dc +0x00000000 ,// phyr0e0 +0xaa55aa55 ,// phyr0e4 +0x55aa55aa ,// phyr0e8 +0xaaaa5555 ,// phyr0ec +0x5555aaaa ,// phyr0f0 +0xaa55aa55 ,// phyr0f4 +0x55aa55aa ,// phyr0f8 +0xaaaa5555 ,// phyr0fc +0x5555aaaa ,// phyr100 +0xaa55aa55 ,// phyr104 +0x55aa55aa ,// phyr108 +0xaaaa5555 ,// phyr10c +0x5555aaaa ,// phyr110 +0xaa55aa55 ,// phyr114 +0x55aa55aa ,// phyr118 +0xaaaa5555 ,// phyr11c +0x5555aaaa ,// phyr120 +0x20202020 ,// phyr124 +0x20202020 ,// phyr128 +0x20202020 ,// phyr12c +0x20202020 ,// phyr130 +0x20202020 ,// phyr134 +0x20202020 ,// phyr138 +0x20202020 ,// phyr13c +0x20202020 ,// phyr140 +0x20202020 ,// phyr144 +0x20202020 ,// phyr148 +0x20202020 ,// phyr14c +0x20202020 ,// phyr150 +0x20202020 ,// phyr154 +0x20202020 ,// phyr158 +0x20202020 ,// phyr15c +0x20202020 ,// phyr160 +0x20202020 ,// phyr164 +0x20202020 ,// phyr168 +0x20202020 ,// phyr16c +0x20202020 ,// phyr170 +0xaeeddeea ,// change address +0x1e6e0298 ,// new address +0x20200800 ,// phyr198 +0x20202020 ,// phyr19c +0x20202020 ,// phyr1a0 +0x20202020 ,// phyr1a4 +0x20202020 ,// phyr1a8 +0x20202020 ,// phyr1ac +0x20202020 ,// phyr1b0 +0x20202020 ,// phyr1b4 +0x20202020 ,// phyr1b8 +0x20202020 ,// phyr1bc +0x20202020 ,// phyr1c0 +0x20202020 ,// phyr1c4 +0x20202020 ,// phyr1c8 +0x20202020 ,// phyr1cc +0x20202020 ,// phyr1d0 +0x20202020 ,// phyr1d4 +0x20202020 ,// phyr1d8 +0x20202020 ,// phyr1dc +0x20202020 ,// phyr1e0 +0x20202020 ,// phyr1e4 +0x00002020 ,// phyr1e8 +0xaeeddeea ,// change address +0x1e6e0304 ,// new address +0x00000800 ,// phyr204 +0xaeeddeea ,// change address +0x1e6e027c ,// new address +0x4e400000 ,// phyr17c +0x59595959 ,// phyr180 +0x40404040 ,// phyr184 +0xaeeddeea ,// change address +0x1e6e02f4 ,// new address +0x00000059 ,// phyr1f4 +0xaeededed ,// end +}; +#else +u32 ast2600_sdramphy_config[165 ] = { +0x1e6e0100 ,// start address +0x00000000 ,// phyr000 +0x0c002062 ,// phyr004 +0x1a7a0063 ,// phyr008 +0x5a7a0063 ,// phyr00c +0x1a7a0063 ,// phyr010 +0x1a7a0063 ,// phyr014 +0x20000000 ,// phyr018 +0x20000000 ,// phyr01c +0x20000000 ,// phyr020 +0x20000000 ,// phyr024 +0x00000008 ,// phyr028 +0x00000000 ,// phyr02c +0x00077600 ,// phyr030 +0x00000000 ,// phyr034 +0x00000000 ,// phyr038 +0x20000000 ,// phyr03c +0x50506000 ,// phyr040 +0x50505050 ,// phyr044 +0x00002f07 ,// phyr048 +0x00003080 ,// phyr04c +0x04000000 ,// phyr050 +0x00000200 ,// phyr054 +0x03140501 ,// phyr058-rtt:40 +0x04800000 ,// phyr05c +0x0800044e ,// phyr060 +0x00000000 ,// phyr064 +0x00180008 ,// phyr068 +0x00e00400 ,// phyr06c +0x00140206 ,// phyr070 +0x1d4c0000 ,// phyr074 +0x493e0107 ,// phyr078 +0x08060404 ,// phyr07c +0x90000a00 ,// phyr080 +0x06420c30 ,// phyr084 +0x00001002 ,// phyr088 +0x05701016 ,// phyr08c +0x10000000 ,// phyr090 +0xaeeddeea ,// change address +0x1e6e019c ,// new address +0x20202020 ,// phyr09c +0x20202020 ,// phyr0a0 +0x00002020 ,// phyr0a4 +0x00002020 ,// phyr0a8 +0x00000001 ,// phyr0ac +0xaeeddeea ,// change address +0x1e6e01cc ,// new address +0x01010101 ,// phyr0cc +0x01010101 ,// phyr0d0 +0x80808080 ,// phyr0d4 +0x80808080 ,// phyr0d8 +0xaeeddeea ,// change address +0x1e6e0288 ,// new address +0x80808080 ,// phyr188 +0x80808080 ,// phyr18c +0x80808080 ,// phyr190 +0x80808080 ,// phyr194 +0xaeeddeea ,// change address +0x1e6e02f8 ,// new address +0x90909090 ,// phyr1f8 +0x88888888 ,// phyr1fc +0xaeeddeea ,// change address +0x1e6e0300 ,// new address +0x00000000 ,// phyr200 +0xaeeddeea ,// change address +0x1e6e0194 ,// new address +0x801112e0 ,// phyr094 - bit12=1,15=0,- write window is ok +0xaeeddeea ,// change address +0x1e6e019c ,// new address +0x20202020 ,// phyr09c +0x20202020 ,// phyr0a0 +0x00002020 ,// phyr0a4 +0x80000000 ,// phyr0a8 +0x00000001 ,// phyr0ac +0xaeeddeea ,// change address +0x1e6e0318 ,// new address +0x09222719 ,// phyr218 +0x00aa4403 ,// phyr21c +0xaeeddeea ,// change address +0x1e6e0198 ,// new address +0x08060000 ,// phyr098 +0xaeeddeea ,// change address +0x1e6e01b0 ,// new address +0x00000000 ,// phyr0b0 +0x00000000 ,// phyr0b4 +0x00000000 ,// phyr0b8 +0x00000000 ,// phyr0bc +0x00000000 ,// phyr0c0 - ori +0x00000000 ,// phyr0c4 +0x000aff2c ,// phyr0c8 +0xaeeddeea ,// change address +0x1e6e01dc ,// new address +0x00080000 ,// phyr0dc +0x00000000 ,// phyr0e0 +0xaa55aa55 ,// phyr0e4 +0x55aa55aa ,// phyr0e8 +0xaaaa5555 ,// phyr0ec +0x5555aaaa ,// phyr0f0 +0xaa55aa55 ,// phyr0f4 +0x55aa55aa ,// phyr0f8 +0xaaaa5555 ,// phyr0fc +0x5555aaaa ,// phyr100 +0xaa55aa55 ,// phyr104 +0x55aa55aa ,// phyr108 +0xaaaa5555 ,// phyr10c +0x5555aaaa ,// phyr110 +0xaa55aa55 ,// phyr114 +0x55aa55aa ,// phyr118 +0xaaaa5555 ,// phyr11c +0x5555aaaa ,// phyr120 +0x20202020 ,// phyr124 +0x20202020 ,// phyr128 +0x20202020 ,// phyr12c +0x20202020 ,// phyr130 +0x20202020 ,// phyr134 +0x20202020 ,// phyr138 +0x20202020 ,// phyr13c +0x20202020 ,// phyr140 +0x20202020 ,// phyr144 +0x20202020 ,// phyr148 +0x20202020 ,// phyr14c +0x20202020 ,// phyr150 +0x20202020 ,// phyr154 +0x20202020 ,// phyr158 +0x20202020 ,// phyr15c +0x20202020 ,// phyr160 +0x20202020 ,// phyr164 +0x20202020 ,// phyr168 +0x20202020 ,// phyr16c +0x20202020 ,// phyr170 +0xaeeddeea ,// change address +0x1e6e0298 ,// new address +0x20200800 ,// phyr198 +0x20202020 ,// phyr19c +0x20202020 ,// phyr1a0 +0x20202020 ,// phyr1a4 +0x20202020 ,// phyr1a8 +0x20202020 ,// phyr1ac +0x20202020 ,// phyr1b0 +0x20202020 ,// phyr1b4 +0x20202020 ,// phyr1b8 +0x20202020 ,// phyr1bc +0x20202020 ,// phyr1c0 +0x20202020 ,// phyr1c4 +0x20202020 ,// phyr1c8 +0x20202020 ,// phyr1cc +0x20202020 ,// phyr1d0 +0x20202020 ,// phyr1d4 +0x20202020 ,// phyr1d8 +0x20202020 ,// phyr1dc +0x20202020 ,// phyr1e0 +0x20202020 ,// phyr1e4 +0x00002020 ,// phyr1e8 +0xaeeddeea ,// change address +0x1e6e0304 ,// new address +0x00000800 ,// phyr204 +0xaeeddeea ,// change address +0x1e6e027c ,// new address +0x4e400000 ,// phyr17c +0x59595959 ,// phyr180 +0x40404040 ,// phyr184 +0xaeeddeea ,// change address +0x1e6e02f4 ,// new address +0x00000059 ,// phyr1f4 +0xaeededed ,// end +}; +#endif + +/* MPLL configuration */ +#define SCU_MPLL_FREQ_400M 0x0008405F +#define SCU_MPLL_EXT_400M 0x0000002F +#define SCU_MPLL_FREQ_333M 0x00488299 +#define SCU_MPLL_EXT_333M 0x0000014C +#define SCU_MPLL_FREQ_200M 0x0078007F +#define SCU_MPLL_EXT_200M 0x0000003F +#define SCU_MPLL_FREQ_100M 0x0078003F +#define SCU_MPLL_EXT_100M 0x0000001F + +#if defined(CONFIG_ASPEED_DDR4_1600 ) +#define SCU_MPLL_FREQ_CFG SCU_MPLL_FREQ_400M +#define SCU_MPLL_EXT_CFG SCU_MPLL_EXT_400M +#elif defined(CONFIG_ASPEED_DDR4_1333 ) +#define SCU_MPLL_FREQ_CFG SCU_MPLL_FREQ_333M +#define SCU_MPLL_EXT_CFG SCU_MPLL_EXT_333M +#elif defined(CONFIG_ASPEED_DDR4_800 ) +#define SCU_MPLL_FREQ_CFG SCU_MPLL_FREQ_200M +#define SCU_MPLL_EXT_CFG SCU_MPLL_EXT_200M +#elif defined(CONFIG_ASPEED_DDR4_400 ) +#define SCU_MPLL_FREQ_CFG SCU_MPLL_FREQ_100M +#define SCU_MPLL_EXT_CFG SCU_MPLL_EXT_100M +#else +#error "undefined DDR4 target rate\n" +#endif + +/* +* AC timing and SDRAM mode register setting +* for real chip are derived from the model GDDR4-1600 */ +#define DDR4_MR01_MODE 0x03010510 +#define DDR4_MR23_MODE 0x00000000 +#define DDR4_MR45_MODE 0x04000000 +#define DDR4_MR6_MODE 0x00000400 +#define DDR4_TRFC_1600 0x467299f1 +#define DDR4_TRFC_1333 0x3a5f80c9 +#define DDR4_TRFC_800 0x23394c78 +#define DDR4_TRFC_400 0x111c263c + +#if defined(CONFIG_ASPEED_DDR4_1600 ) +#define DDR4_TRFC DDR4_TRFC_1600 +#define DDR4_PHY_TRAIN_TRFC 0xc30 +#elif defined(CONFIG_ASPEED_DDR4_1333 ) +#define DDR4_TRFC DDR4_TRFC_1333 +#define DDR4_PHY_TRAIN_TRFC 0xa25 +#elif defined(CONFIG_ASPEED_DDR4_800 ) +#define DDR4_TRFC DDR4_TRFC_800 +#define DDR4_PHY_TRAIN_TRFC 0x618 +#elif defined(CONFIG_ASPEED_DDR4_400 ) +#define DDR4_TRFC DDR4_TRFC_400 +#define DDR4_PHY_TRAIN_TRFC 0x30c +#else +#error "undefined tRFC setting" +#endif + +/* supported SDRAM size */ +#define SDRAM_SIZE_1KB (1024U) +#define SDRAM_SIZE_1MB (SDRAM_SIZE_1KB * SDRAM_SIZE_1KB) +#define SDRAM_MIN_SIZE (256 * SDRAM_SIZE_1MB) +#define SDRAM_MAX_SIZE (2048 * SDRAM_SIZE_1MB) + +DECLARE_GLOBAL_DATA_PTR ; + +static const u32 ddr4_ac_timing[4 ] = { +0x040e0307 ,0x0f4711f1 ,0x0e060304 ,0x00001240 };static const u32 +ddr_max_grant_params[4 ] = { +0x44444444 ,0x44444444 ,0x44444444 ,0x44444444 }; + +struct dram_info { +struct ram_info info; +struct clk ddr_clk; +struct ast2600_sdrammc_regs *regs; +struct ast2600_scu *scu; +struct ast2600_ddr_phy *phy; +void __iomem *phy_setting; +void __iomem *phy_status; +ulong clock_rate; +}; + +static void ast2600_sdramphy_kick_training (struct dram_info *info) { +u32 data; +struct ast2600_sdrammc_regs *regs = info->regs; + +writel (SDRAM_PHYCTRL0_NRST , ®s->phy_ctrl[0 ]); +udelay (5 ); + writel(SDRAM_PHYCTRL0_NRST | SDRAM_PHYCTRL0_INIT,®s->phy_ctrl[0]);
drivers/ram/aspeed/sdram_ast2600.c new file +245
-0+udelay (1000 ); + +while (1 ) { + data =readl (®s->phy_ctrl[0 ]) &SDRAM_PHYCTRL0_INIT ; +if (~data) +break ; + } +} + +/** +* @brief load DDR-PHY configurations table to the PHY registers +* @param[in] p_tbl - pointer to the configuration table +* @param[in] info - pointer to the DRAM info struct +* +* There are two sets of MRS (Mode Registers) configuration in ast2600 +memory +* system: one is in the SDRAM MC (memory controller) which is used in +run +* time, and the other is in the DDR-PHY IP which is used during +DDR-PHY +* training. +*/ +static void ast2600_sdramphy_init (u32 *p_tbl,struct dram_info *info) { +u32 reg_base = (u32 )info->phy_setting; +u32 addr = p_tbl[0 ]; +u32 data; +int i =1 ; + +writel (0 , &info->regs->phy_ctrl[0 ]); +udelay (10 ); + +while (1 ) { +if (addr < reg_base) { +debug ("invalid DDR-PHY addr: 0x%08x\n" , addr); +break ; + } + data = p_tbl[i++]; + +if (data ==DDR_PHY_TBL_END ) { +break ; + }else if (data ==DDR_PHY_TBL_CHG_ADDR ) { + addr = p_tbl[i++]; + }else { +writel (data, addr); + addr +=4 ; + } + } + + data =readl (info->phy_setting +0x84 ) & ~GENMASK (16 ,0 ); + data |=DDR4_PHY_TRAIN_TRFC ; +writel (data, info->phy_setting +0x84 ); } + +static int ast2600_sdramphy_check_status (struct dram_info *info) { +u32 value, tmp; +u32 reg_base = (u32 )info->phy_status; +int need_retrain =0 ; + +debug ("\nSDRAM PHY training report:\n" ); + +/* training status */ + value =readl (reg_base +0x00 ); +debug ("rO_DDRPHY_reg offset 0x00 = 0x%08x\n" , value); + +if (value &BIT (3 )) +debug ("\tinitial PVT calibration fail\n" ); + +if (value &BIT (5 )) +debug ("\truntime calibration fail\n" ); + +/* PU & PD */ + value =readl (reg_base +0x30 ); +debug ("rO_DDRPHY_reg offset 0x30 = 0x%08x\n" , value); +debug (" PU = 0x%02x\n" , value &0xff ); +debug (" PD = 0x%02x\n" , (value >>16 ) &0xff ); + +/* read eye window */ + value =readl (reg_base +0x68 ); +if (0 == (value &GENMASK (7 ,0 ))) + need_retrain =1 ; + +debug ("rO_DDRPHY_reg offset 0x68 = 0x%08x\n" , value); +debug (" rising edge of read data eye training pass window\n" ); + tmp = (((value &GENMASK (7 ,0 )) >>0 ) *100 ) /255 ; +debug (" B0:%d%%\n" , tmp); + tmp = (((value &GENMASK (15 ,8 )) >>8 ) *100 ) /255 ; +debug (" B1:%d%%\n" , tmp); + + value =readl (reg_base +0xC8 ); +debug ("rO_DDRPHY_reg offset 0xC8 = 0x%08x\n" , value); +debug (" falling edge of read data eye training pass window\n" ); + tmp = (((value &GENMASK (7 ,0 )) >>0 ) *100 ) /255 ; +debug (" B0:%d%%\n" , tmp); + tmp = (((value &GENMASK (15 ,8 )) >>8 ) *100 ) /255 ; +debug (" B1:%d%%\n" , tmp); + +/* write eye window */ + value =readl (reg_base +0x7c ); +if (0 == (value &GENMASK (7 ,0 ))) + need_retrain =1 ; + +debug ("rO_DDRPHY_reg offset 0x7C = 0x%08x\n" , value); +debug (" rising edge of write data eye training pass window\n" ); + tmp = (((value &GENMASK (7 ,0 )) >>0 ) *100 ) /255 ; +debug (" B0:%d%%\n" , tmp); + tmp = (((value &GENMASK (15 ,8 )) >>8 ) *100 ) /255 ; +debug (" B1:%d%%\n" , tmp); + +/* read Vref training result */ + value =readl (reg_base +0x88 ); +debug ("rO_DDRPHY_reg offset 0x88 = 0x%08x\n" , value); +debug (" read Vref training result\n" ); + tmp = (((value &GENMASK (7 ,0 )) >>0 ) *100 ) /127 ; +debug (" B0:%d%%\n" , tmp); + tmp = (((value &GENMASK (15 ,8 )) >>8 ) *100 ) /127 ; +debug (" B1:%d%%\n" , tmp); + +/* write Vref training result */ + value =readl (reg_base +0x90 ); +debug ("rO_DDRPHY_reg offset 0x90 = 0x%08x\n" , value); + +/* gate train */ + value =readl (reg_base +0x50 ); +if ((0 == (value &GENMASK (15 ,0 ))) || + (0 == (value &GENMASK (31 ,16 )))) { + need_retrain =1 ; + } + +debug ("rO_DDRPHY_reg offset 0x50 = 0x%08x\n" , value); + +return need_retrain; +} + +#ifndef CONFIG_ASPEED_BYPASS_SELFTEST +#define MC_TEST_PATTERN_N 8 +static u32 as2600_sdrammc_test_pattern[MC_TEST_PATTERN_N ] = { +0xcc33cc33 ,0xff00ff00 ,0xaa55aa55 ,0x88778877 , +0x92cc4d6e ,0x543d3cde ,0xf1e843c7 ,0x7c61d253 }; + +#define TIMEOUT_DRAM 5000000 +int ast2600_sdrammc_dg_test (struct dram_info *info,unsigned int +datagen,u32 mode) { +unsigned int data; +unsigned int timeout =0 ; +struct ast2600_sdrammc_regs *regs = info->regs; + +writel (0 , ®s->ecc_test_ctrl); + +if (mode ==0 ) +writel (0x00000085 | (datagen <<3 ), ®s->ecc_test_ctrl); +else +writel (0x000000C1 | (datagen <<3 ), ®s->ecc_test_ctrl); + +do { + data =readl (®s->ecc_test_ctrl) &GENMASK (13 ,12 ); + +if (data &BIT (13 )) +return 0 ; + +if (++timeout >TIMEOUT_DRAM ) { +debug ("Timeout!!\n" ); +writel (0 , ®s->ecc_test_ctrl); +return -1 ; + } + }while (!data); + +writel (0 , ®s->ecc_test_ctrl); + +return 0 ; +} + +int ast2600_sdrammc_cbr_test (struct dram_info *info) { +u32 i; +struct ast2600_sdrammc_regs *regs = info->regs; + +clrsetbits_le32 (®s->test_addr,GENMASK (30 ,4 ),0x7ffff0 ); + +/* single */ +for (i =0 ; i <8 ; i++) +if (ast2600_sdrammc_dg_test (info, i,0 )) +return -1 ; + +/* burst */ +for (i =0 ; i <8 ; i++) +if (ast2600_sdrammc_dg_test (info, i, i)) +return -1 ; + +return 0 ; +} + +static int ast2600_sdrammc_test (struct dram_info *info) { +struct ast2600_sdrammc_regs *regs = info->regs; + +u32 pass_cnt =0 ; +u32 fail_cnt =0 ; +u32 target_cnt =2 ; +u32 test_cnt =0 ; +u32 pattern; +u32 i =0 ; +bool finish = false; + +debug ("sdram mc test:\n" ); +while (!finish) { + pattern = as2600_sdrammc_test_pattern[i++]; + i = i %MC_TEST_PATTERN_N ; +debug (" pattern = %08X : " , pattern); +writel (pattern, ®s->test_init_val); + +if (ast2600_sdrammc_cbr_test (info)) { +debug ("fail\n" ); + fail_cnt++; + }else { +debug ("pass\n" ); + pass_cnt++; + } + +if (++test_cnt == target_cnt) + finish = true; + } +debug ("statistics: pass/fail/total:%d/%d/%d\n" , pass_cnt, fail_cnt, + target_cnt); + +return fail_cnt; +} +#endif + +/* +* scu500[14:13] +* 2b'00: VGA memory size = 16MB +* 2b'01: VGA memory size = 16MB +* 2b'10: VGA memory size = 32MB +* 2b'11: VGA memory size = 64MB +* +* mcr04[3:2] +* 2b'00: VGA memory size = 8MB +* 2b'01: VGA memory size = 16MB +* 2b'10: VGA memory size = 32MB +* 2b'11: VGA memory size = 64MB +*/ +static size_t ast2600_sdrammc_get_vga_mem_size (struct dram_info *info) +{ +u32 vga_hwconf; +size_t vga_mem_size_base =8 *1024 *1024 ; + + vga_hwconf = + (readl (&info->scu->hwstrap1) &SCU_HWSTRAP1_VGA_MEM_MASK )Quoted 1 line
Quoted 1 line
drivers/ram/aspeed/sdram_ast2600.c new file +30
-0+SCU_HWSTRAP1_VGA_MEM_SHIFT ; + +if (vga_hwconf ==0 ) { + vga_hwconf =1 ; +writel (vga_hwconf <<SCU_HWSTRAP1_VGA_MEM_SHIFT , + &info->scu->hwstrap1); + } + +clrsetbits_le32 (&info->regs->config,SDRAM_CONF_VGA_SIZE_MASK , + ((vga_hwconf <<SDRAM_CONF_VGA_SIZE_SHIFT ) & +SDRAM_CONF_VGA_SIZE_MASK )); + +/* no need to reserve VGA memory if efuse[VGA disable] is set */ +if (readl (&info->scu->efuse) &SCU_EFUSE_DIS_VGA ) +return 0 ; + +return vga_mem_size_base << vga_hwconf; } + +/* +* Find out RAM size and save it in dram_info +* +* The procedure is taken from Aspeed SDK */ static void +ast2600_sdrammc_calc_size (struct dram_info *info) { +/* The controller supports 256/512/1024/2048 MB ram */ +size_t ram_size =SDRAM_MIN_SIZE ; +const int write_test_offset =0x100000 ; +u32 test_pattern =0xdeadbeef ; +u32 cap_param =SDRAM_CONF_CAP_2048M ; +u32 refresh_timing_param =DDR4_TRFC ; + const u32 write_addr_base = CONFIG_SYS_SDRAM_BASE +
write_test_offset;drivers/ram/aspeed/sdram_ast2600.c new file +32
-0+ +for (ram_size =SDRAM_MAX_SIZE ; ram_size >SDRAM_MIN_SIZE ; + ram_size >>=1 ) { +writel (test_pattern, write_addr_base + (ram_size >>1 )); + test_pattern = (test_pattern >>4 ) | (test_pattern <<28 ); + } + +/* One last write to overwrite all wrapped values */ +writel (test_pattern, write_addr_base); + +/* Reset the pattern and see which value was really written */ + test_pattern =0xdeadbeef ; +for (ram_size =SDRAM_MAX_SIZE ; ram_size >SDRAM_MIN_SIZE ; + ram_size >>=1 ) { +if (readl (write_addr_base + (ram_size >>1 )) == test_pattern) +break ; + + --cap_param; + refresh_timing_param >>=8 ; + test_pattern = (test_pattern >>4 ) | (test_pattern <<28 ); + } + +clrsetbits_le32 (&info->regs->ac_timing[1 ], + (SDRAM_AC_TRFC_MASK <<SDRAM_AC_TRFC_SHIFT ), + ((refresh_timing_param &SDRAM_AC_TRFC_MASK ) + <<SDRAM_AC_TRFC_SHIFT )); + + info->info.base =CONFIG_SYS_SDRAM_BASE ; + info->info.size = ram_size -ast2600_sdrammc_get_vga_mem_size (info); + + clrsetbits_le32(&info->regs->config, SDRAM_CONF_CAP_MASK, + ((cap_param << SDRAM_CONF_CAP_SHIFT) &
SDRAM_CONF_CAP_MASK)); }drivers/ram/aspeed/sdram_ast2600.c new file +117
-0+ +static int ast2600_sdrammc_init_ddr4 (struct dram_info *info) { +const u32 power_ctrl =MCR34_CKE_EN |MCR34_AUTOPWRDN_EN | +MCR34_MREQ_BYPASS_DIS |MCR34_RESETN_DIS | +MCR34_ODT_EN |MCR34_ODT_AUTO_ON | + (0x1 <<MCR34_ODT_EXT_SHIFT ); + +/* init SDRAM-PHY only on real chip */ +ast2600_sdramphy_init (ast2600_sdramphy_config, info); +writel ((MCR34_CKE_EN |MCR34_MREQI_DIS |MCR34_RESETN_DIS ), + &info->regs->power_ctrl); +udelay (5 ); +ast2600_sdramphy_kick_training (info); +udelay (500 ); +writel (SDRAM_RESET_DLL_ZQCL_EN , &info->regs->refresh_timing); + +writel (MCR30_SET_MR (3 ), &info->regs->mode_setting_control); +writel (MCR30_SET_MR (6 ), &info->regs->mode_setting_control); +writel (MCR30_SET_MR (5 ), &info->regs->mode_setting_control); +writel (MCR30_SET_MR (4 ), &info->regs->mode_setting_control); +writel (MCR30_SET_MR (2 ), &info->regs->mode_setting_control); +writel (MCR30_SET_MR (1 ), &info->regs->mode_setting_control); +writel (MCR30_SET_MR (0 ) |MCR30_RESET_DLL_DELAY_EN , + &info->regs->mode_setting_control); + +writel (SDRAM_REFRESH_EN |SDRAM_RESET_DLL_ZQCL_EN | + (0x5f <<SDRAM_REFRESH_PERIOD_SHIFT ), + &info->regs->refresh_timing); + +/* wait self-refresh idle */ +while (readl (&info->regs->power_ctrl) & +MCR34_SELF_REFRESH_STATUS_MASK ) + ; + +writel (SDRAM_REFRESH_EN |SDRAM_LOW_PRI_REFRESH_EN | +SDRAM_REFRESH_ZQCS_EN | + (0x5f <<SDRAM_REFRESH_PERIOD_SHIFT ) | + (0x42aa <<SDRAM_REFRESH_PERIOD_ZQCS_SHIFT ), + &info->regs->refresh_timing); + +writel (power_ctrl, &info->regs->power_ctrl); +udelay (500 ); + +return 0 ; +} + +static void ast2600_sdrammc_unlock (struct dram_info *info) { +writel (SDRAM_UNLOCK_KEY , &info->regs->protection_key); +while (!readl (&info->regs->protection_key)) + ; +} + +static void ast2600_sdrammc_lock (struct dram_info *info) { +writel (~SDRAM_UNLOCK_KEY , &info->regs->protection_key); +while (readl (&info->regs->protection_key)) + ; +} + +static void ast2600_sdrammc_common_init (struct ast2600_sdrammc_regs +*regs) { +int i; + +writel (MCR34_MREQI_DIS |MCR34_RESETN_DIS , ®s->power_ctrl); +writel (SDRAM_VIDEO_UNLOCK_KEY , ®s->gm_protection_key); +writel (0x10 <<MCR38_RW_MAX_GRANT_CNT_RQ_SHIFT , + ®s->arbitration_ctrl); +writel (0xFFBBFFF4 , ®s->req_limit_mask); + +for (i =0 ; i <ARRAY_SIZE (ddr_max_grant_params); ++i) +writel (ddr_max_grant_params[i], ®s->max_grant_len[i]); + +writel (MCR50_RESET_ALL_INTR , ®s->intr_ctrl); + +writel (0x07FFFFFF , ®s->ecc_range_ctrl); + +writel (0 , ®s->ecc_test_ctrl); +writel (0x80000001 , ®s->test_addr); +writel (0 , ®s->test_fail_dq_bit); +writel (0 , ®s->test_init_val); + +writel (0xFFFFFFFF , ®s->req_input_ctrl); +writel (0 , ®s->req_high_pri_ctrl); + +udelay (600 ); + +#ifdef CONFIG_ASPEED_DDR4_DUALX8 +writel (0x37 , ®s->config); +#else +writel (0x17 , ®s->config); +#endif + +/* load controller setting */ +for (i =0 ; i <ARRAY_SIZE (ddr4_ac_timing); ++i) +writel (ddr4_ac_timing[i], ®s->ac_timing[i]); + +writel (DDR4_MR01_MODE , ®s->mr01_mode_setting); +writel (DDR4_MR23_MODE , ®s->mr23_mode_setting); +writel (DDR4_MR45_MODE , ®s->mr45_mode_setting); +writel (DDR4_MR6_MODE , ®s->mr6_mode_setting); } + +/* +* Update size info according to the ECC HW setting +* +* Assume SDRAM has been initialized by SPL or the host. To get the +RAM size, we +* don't need to calculate the ECC size again but read from MCR04 and +derive the +* size from its value. +*/ +static void ast2600_sdrammc_update_size (struct dram_info *info) { +struct ast2600_sdrammc_regs *regs = info->regs; +u32 conf =readl (®s->config); +u32 cap_param; +size_t ram_size =SDRAM_MAX_SIZE ; +size_t hw_size; + + cap_param = (conf & SDRAM_CONF_CAP_MASK) >>
SDRAM_CONF_CAP_SHIFT;drivers/ram/aspeed/sdram_ast2600.c new file +22
-0+switch (cap_param) { +case SDRAM_CONF_CAP_2048M : + ram_size =2048 *SDRAM_SIZE_1MB ; +break ; +case SDRAM_CONF_CAP_1024M : + ram_size =1024 *SDRAM_SIZE_1MB ; +break ; +case SDRAM_CONF_CAP_512M : + ram_size =512 *SDRAM_SIZE_1MB ; +break ; +case SDRAM_CONF_CAP_256M : + ram_size =256 *SDRAM_SIZE_1MB ; +break ; + } + + info->info.base =CONFIG_SYS_SDRAM_BASE ; + info->info.size = ram_size -ast2600_sdrammc_get_vga_mem_size (info); + +if (0 == (conf &SDRAM_CONF_ECC_SETUP )) +return ; + + hw_size = readl(®s->ecc_range_ctrl) &
SDRAM_ECC_RANGE_ADDR_MASK;drivers/ram/aspeed/sdram_ast2600.c new file +156
-1+ hw_size += (1 <<SDRAM_ECC_RANGE_ADDR_SHIFT ); + + info->info.size = hw_size; +} + +#ifdef CONFIG_ASPEED_ECC +static void ast2600_sdrammc_ecc_enable (struct dram_info *info) { +struct ast2600_sdrammc_regs *regs = info->regs; +size_t conf_size; +u32 reg; + + conf_size =CONFIG_ASPEED_ECC_SIZE *SDRAM_SIZE_1MB ; +if (conf_size > info->info.size) { +printf ("warning: ECC configured %dMB but actual size is %dMB\n" , +CONFIG_ASPEED_ECC_SIZE , + info->info.size /SDRAM_SIZE_1MB ); + conf_size = info->info.size; + }else if (conf_size ==0 ) { + conf_size = info->info.size; + } + + info->info.size = (((conf_size /9 ) *8 ) >>20 ) <<20 ; +writel (((info->info.size >>20 ) -1 ) <<20 , ®s->ecc_range_ctrl); + reg =readl (®s->config) |SDRAM_CONF_ECC_SETUP ; +writel (reg, ®s->config); + +writel (0 , ®s->test_init_val); +writel (0x80000001 , ®s->test_addr); +writel (0x221 , ®s->ecc_test_ctrl); +while (0 == (readl (®s->ecc_test_ctrl) &BIT (12 ))) + ; +writel (0 , ®s->ecc_test_ctrl); +writel (BIT (31 ), ®s->intr_ctrl); +writel (0 , ®s->intr_ctrl); +} +#endif + +static int ast2600_sdrammc_probe (struct udevice *dev) { +int ret; +u32 reg; +struct dram_info *priv = (struct dram_info *)dev_get_priv (dev); +struct ast2600_sdrammc_regs *regs = priv->regs; +struct udevice *clk_dev; + +/* find SCU base address from clock device */ + ret =uclass_get_device_by_driver (UCLASS_CLK , +DM_GET_DRIVER (aspeed_ast2600_scu), &clk_dev); +if (ret) { +debug ("clock device not defined\n" ); +return ret; + } + + priv->scu =devfdt_get_addr_ptr (clk_dev); +if (IS_ERR (priv->scu)) { +debug ("%s(): can't get SCU\n" , __func__); +return PTR_ERR (priv->scu); + } + +if (readl (&priv->scu->dram_hdshk) &SCU_DRAM_HDSHK_RDY ) { +printf ("already initialized, " ); +ast2600_sdrammc_update_size (priv); +return 0 ; + } + + reg =readl (&priv->scu->mpll); + reg &= ~(SCU_PLL_BYPASS |SCU_PLL_DIV_MASK | +SCU_PLL_DENUM_MASK |SCU_PLL_NUM_MASK ); + reg |= (SCU_PLL_RST |SCU_PLL_OFF |SCU_MPLL_FREQ_CFG ); +writel (reg, &priv->scu->mpll); +writel (SCU_MPLL_EXT_CFG , &priv->scu->mpll_ext); +udelay (100 ); + reg &= ~(SCU_PLL_RST |SCU_PLL_OFF ); +writel (reg, &priv->scu->mpll); + +while ((readl (&priv->scu->mpll_ext) &BIT (31 )) ==0 ) + ; + +ast2600_sdrammc_unlock (priv); +ast2600_sdrammc_common_init (regs); +L_ast2600_sdramphy_train: +ast2600_sdrammc_init_ddr4 (priv); + +/* make sure DDR-PHY is ready before access */ +do { + reg =readl (priv->phy_status) &BIT (1 ); + }while (reg ==0 ); + +if (ast2600_sdramphy_check_status (priv) !=0 ) { +printf ("DDR4 PHY training fail, retrain\n" ); + goto L_ast2600_sdramphy_train; + } + +ast2600_sdrammc_calc_size (priv); + +#ifndef CONFIG_ASPEED_BYPASS_SELFTEST +if (ast2600_sdrammc_test (priv) !=0 ) { +printf ("%s: DDR4 init fail\n" , __func__); +return -EINVAL ; + } +#endif + +#ifdef CONFIG_ASPEED_ECC +ast2600_sdrammc_ecc_enable (priv); +#endif + +writel (readl (&priv->scu->dram_hdshk) |SCU_DRAM_HDSHK_RDY , + &priv->scu->dram_hdshk); + +clrbits_le32 (®s->intr_ctrl,MCR50_RESET_ALL_INTR ); +ast2600_sdrammc_lock (priv); +return 0 ; +} + +static int ast2600_sdrammc_ofdata_to_platdata (struct udevice *dev) { +struct dram_info *priv =dev_get_priv (dev); + + priv->regs = (void *)(uintptr_t )devfdt_get_addr_index (dev,0 ); + priv->phy_setting = (void *)(uintptr_t )devfdt_get_addr_index (dev,1 ); + priv->phy_status = (void *)(uintptr_t )devfdt_get_addr_index (dev,2 ); + + priv->clock_rate =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), +"clock-frequency" ,0 ); +if (!priv->clock_rate) { +debug ("DDR Clock Rate not defined\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int ast2600_sdrammc_get_info (struct udevice *dev,struct +ram_info *info) { +struct dram_info *priv =dev_get_priv (dev); + + *info = priv->info; + +return 0 ; +} + +static struct ram_ops ast2600_sdrammc_ops = { + .get_info = ast2600_sdrammc_get_info, +}; + +static const struct udevice_id ast2600_sdrammc_ids[] = { + { .compatible ="aspeed,ast2600-sdrammc" }, + { } +}; + +U_BOOT_DRIVER (sdrammc_ast2600) = { + .name ="aspeed_ast2600_sdrammc" , + .id =UCLASS_RAM , + .of_match = ast2600_sdrammc_ids, + .ops = &ast2600_sdrammc_ops, + .ofdata_to_platdata = ast2600_sdrammc_ofdata_to_platdata, + .probe = ast2600_sdrammc_probe, + .priv_auto_alloc_size =sizeof (struct dram_info ), }; --2.17.1
Ryan Chen
maintainerPATCH 3/7 wdt: aspeed: Add AST2600 watchdog support
In reply to Chia-WeiQuoted 8 lines
-----Original Message-----
From: ChiaWei Wang <[email protected]>
Sent: Monday, December 14, 2020 1:54 PM
To: trini at konsulko.com; u-boot at lists.denx.de; Ryan Chen <[email protected]>
Cc: BMC-SW <[email protected]>
Subject: [PATCH 3/7] wdt: aspeed: Add AST2600 watchdog support
Quoted 7 lines
AST2600 has 8 watchdog timers including 8 sets of 32-bit decrement counters, based on 1MHz clock.
A 64-bit reset mask is also supported to specify which controllers should be reset by the WDT reset.
Signed-off-by Chia-Wei, Wang <[email protected]>
Quoted 307 lines
--- .../arm/include/asm/arch-aspeed/wdt_ast2600.h | 129 ++++++++++++++++++ drivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/ast2600_wdt.c | 110 +++++++++++++++ 4 files changed, 249 insertions(+) create mode 100644 arch/arm/include/asm/arch-aspeed/wdt_ast2600.h create mode 100644 drivers/watchdog/ast2600_wdt.carch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +89
-0@@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) 2020 Aspeed Technology Inc. +*/ + +#ifndef _ASM_ARCH_WDT_AST2600_H +#define _ASM_ARCH_WDT_AST2600_H + +#define WDT_BASE 0x1e785000 + +/* +* Special value that needs to be written to counter_restart register +to +* (re)start the timer +*/ +#define WDT_COUNTER_RESTART_VAL 0x4755 + +/* reset mode */ +#define WDT_RESET_MODE_SOC 0 +#define WDT_RESET_MODE_CHIP 1 +#define WDT_RESET_MODE_CPU 2 + +/* bit-fields of WDT control register */ +#define WDT_CTRL_2ND_BOOT BIT(7) +#define WDT_CTRL_RESET_MODE_MASK GENMASK(6, 5) +#define WDT_CTRL_RESET_MODE_SHIFT 5 +#define WDT_CTRL_CLK1MHZ BIT(4) +#define WDT_CTRL_RESET BIT(1) +#define WDT_CTRL_EN BIT(0) + +/* bit-fields of WDT reset mask1 register */ +#define WDT_RESET_MASK1_RVAS BIT(25) +#define WDT_RESET_MASK1_GPIO1 BIT(24) +#define WDT_RESET_MASK1_XDMA2 BIT(23) +#define WDT_RESET_MASK1_XDMA1 BIT(22) +#define WDT_RESET_MASK1_MCTP2 BIT(21) +#define WDT_RESET_MASK1_MCTP1 BIT(20) +#define WDT_RESET_MASK1_JTAG1 BIT(19) +#define WDT_RESET_MASK1_SD_SDIO1 BIT(18) +#define WDT_RESET_MASK1_MAC2 BIT(17) +#define WDT_RESET_MASK1_MAC1 BIT(16) +#define WDT_RESET_MASK1_GPMCU BIT(15) +#define WDT_RESET_MASK1_DPMCU BIT(14) +#define WDT_RESET_MASK1_DP BIT(13) +#define WDT_RESET_MASK1_HAC BIT(12) +#define WDT_RESET_MASK1_VIDEO BIT(11) +#define WDT_RESET_MASK1_CRT BIT(10) +#define WDT_RESET_MASK1_GCRT BIT(9) +#define WDT_RESET_MASK1_USB11_UHCI BIT(8) +#define WDT_RESET_MASK1_USB_PORTA BIT(7) +#define WDT_RESET_MASK1_USB_PORTB BIT(6) +#define WDT_RESET_MASK1_COPROC BIT(5) +#define WDT_RESET_MASK1_SOC BIT(4) +#define WDT_RESET_MASK1_SLI BIT(3) +#define WDT_RESET_MASK1_AHB BIT(2) +#define WDT_RESET_MASK1_SDRAM BIT(1) +#define WDT_RESET_MASK1_ARM BIT(0) + +/* bit-fields of WDT reset mask2 register */ +#define WDT_RESET_MASK2_ESPI BIT(26) +#define WDT_RESET_MASK2_I3C_BUS8 BIT(25) +#define WDT_RESET_MASK2_I3C_BUS7 BIT(24) +#define WDT_RESET_MASK2_I3C_BUS6 BIT(23) +#define WDT_RESET_MASK2_I3C_BUS5 BIT(22) +#define WDT_RESET_MASK2_I3C_BUS4 BIT(21) +#define WDT_RESET_MASK2_I3C_BUS3 BIT(20) +#define WDT_RESET_MASK2_I3C_BUS2 BIT(19) +#define WDT_RESET_MASK2_I3C_BUS1 BIT(18) +#define WDT_RESET_MASK2_I3C_GLOBAL BIT(17) +#define WDT_RESET_MASK2_I2C BIT(16) +#define WDT_RESET_MASK2_FSI BIT(15) +#define WDT_RESET_MASK2_ADC BIT(14) +#define WDT_RESET_MASK2_PWM BIT(13) +#define WDT_RESET_MASK2_PECI BIT(12) +#define WDT_RESET_MASK2_LPC BIT(11) +#define WDT_RESET_MASK2_MDC_MDIO BIT(10) +#define WDT_RESET_MASK2_GPIO2 BIT(9) +#define WDT_RESET_MASK2_JTAG2 BIT(8) +#define WDT_RESET_MASK2_SD_SDIO2 BIT(7) +#define WDT_RESET_MASK2_MAC4 BIT(6) +#define WDT_RESET_MASK2_MAC3 BIT(5) +#define WDT_RESET_MASK2_SOC BIT(4) +#define WDT_RESET_MASK2_SLI2 BIT(3) +#define WDT_RESET_MASK2_AHB2 BIT(2) +#define WDT_RESET_MASK2_SPI1_SPI2 BIT(1) +#define WDT_RESET_MASK2_ARM BIT(0) + +#define WDT_RESET_MASK1_DEFAULT \ + (WDT_RESET_MASK1_RVAS | WDT_RESET_MASK1_GPIO1 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK1_JTAG1 | WDT_RESET_MASK1_SD_SDIO1 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK1_MAC2 | WDT_RESET_MASK1_MAC1 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK1_HAC | WDT_RESET_MASK1_VIDEO |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +2
-0+WDT_RESET_MASK1_CRT |WDT_RESET_MASK1_GCRT | \ +WDT_RESET_MASK1_USB11_UHCI |WDT_RESET_MASK1_USB_PORTA | \arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK1_USB_PORTB | WDT_RESET_MASK1_COPROC |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +4
-0+ WDT_RESET_MASK1_SOC | WDT_RESET_MASK1_ARM) + +#define WDT_RESET_MASK2_DEFAULT \ + (WDT_RESET_MASK2_I3C_BUS8 | WDT_RESET_MASK2_I3C_BUS7 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK2_I3C_BUS6 | WDT_RESET_MASK2_I3C_BUS5 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK2_I3C_BUS4 | WDT_RESET_MASK2_I3C_BUS3 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK2_I3C_BUS2 | WDT_RESET_MASK2_I3C_BUS1 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK2_I3C_GLOBAL | WDT_RESET_MASK2_I2C |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +2
-0+WDT_RESET_MASK2_FSI |WDT_RESET_MASK2_ADC | \ + WDT_RESET_MASK2_PWM | WDT_RESET_MASK2_PECI |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK2_LPC | WDT_RESET_MASK2_MDC_MDIO |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +2
-0+WDT_RESET_MASK2_GPIO2 |WDT_RESET_MASK2_JTAG2 | \ + WDT_RESET_MASK2_SD_SDIO2 | WDT_RESET_MASK2_MAC4 |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +1
-0+ WDT_RESET_MASK2_MAC3 | WDT_RESET_MASK2_SOC |\arch/arm/include/asm/arch-aspeed/wdt_ast2600.h new file +21
-0+ WDT_RESET_MASK2_ARM) + +#ifndef __ASSEMBLY__ +struct ast2600_wdt { +u32 counter_status; +u32 counter_reload_val; +u32 counter_restart; +u32 ctrl; +u32 timeout_status; +u32 clr_timeout_status; +u32 reset_width; +u32 reset_mask1; +u32 reset_mask2; +u32 sw_reset_ctrl; +u32 sw_reset_mask1; +u32 sw_reset_mask2; +u32 sw_reset_disable; +}; +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_ARCH_WDT_AST2600_H */ drivers/watchdog/Kconfig index renamed from drivers/watchdog/Kconfig +0
-0
4532a40e45..d5edabf3ef100644drivers/watchdog/Kconfig +6
-0@@ -86,6 +86,15 @@ config WDT_ASPEED It currently does not support Boot Flash Addressing Mode Detection or Second Boot. +config WDT_AST2600 + bool "Aspeed AST2600 watchdog timer support" + depends on WDT + default y if ASPEED_AST2600 + help + Select this to enable watchdog timer for Aspeed ast2500/ast2400devices.
drivers/watchdog/Kconfig +1
-0+ The watchdog timer is stopped when initialized. It performs reset,either
drivers/watchdog/Kconfig +2
-0+ full SoC reset or CPU or just some peripherals, based on the flags. + config WDT_AT91 bool "AT91 watchdog timer support" depends on WDTdrivers/watchdog/Makefile index renamed from drivers/watchdog/Makefile +0
-0
01b8231f2b..cbb6d8407c100644drivers/watchdog/Makefile +1
-0@@ -19,6 +19,7 @@ obj-$(CONFIG_$(SPL_TPL_)WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o obj-$(CONFIG_WDT_ARMADA_37XX) += armada-37xx-wdt.o obj-$(CONFIG_WDT_ASPEED) += ast_wdt.o +obj-$(CONFIG_WDT_AST2600) += ast2600_wdt.o obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o obj-$(CONFIG_WDT_CORTINA) += cortina_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o(quoted diff) +0
-0
b/drivers/watchdog/ast2600_wdt.cnew file mode 100644 index 0000000000..6f1eb828f1drivers/watchdog/ast2600_wdt.c new file +104
-1@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) 2020 Aspeed Technology, Inc */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <log.h> +#include <wdt.h> +#include <asm/io.h> +#include <asm/arch/wdt_ast2600.h> +#include <linux/err.h> + +struct ast2600_wdt_priv { +struct ast2600_wdt *regs; +}; + +static int ast2600_wdt_start (struct udevice *dev,u64 timeout_ms,ulong +flags) { +struct ast2600_wdt_priv *priv =dev_get_priv (dev); +struct ast2600_wdt *wdt = priv->regs; + +/* WDT counts in the 1MHz frequency, namely 1us */ +writel ((u32)(timeout_ms *1000 ), &wdt->counter_reload_val); +writel (WDT_COUNTER_RESTART_VAL , &wdt->counter_restart); +writel (WDT_CTRL_EN |WDT_CTRL_RESET , &wdt->ctrl); + +return 0 ; +} + +static int ast2600_wdt_stop (struct udevice *dev) { +struct ast2600_wdt_priv *priv =dev_get_priv (dev); +struct ast2600_wdt *wdt = priv->regs; + +clrbits_le32 (&wdt->ctrl,WDT_CTRL_EN ); + +writel (WDT_RESET_MASK1_DEFAULT , &wdt->reset_mask1); +writel (WDT_RESET_MASK2_DEFAULT , &wdt->reset_mask2); + +return 0 ; +} + +static int ast2600_wdt_reset (struct udevice *dev) { +struct ast2600_wdt_priv *priv =dev_get_priv (dev); +struct ast2600_wdt *wdt = priv->regs; + +writel (WDT_COUNTER_RESTART_VAL , &wdt->counter_restart); + +return 0 ; +} + +static int ast2600_wdt_expire_now (struct udevice *dev,ulong flags) { +int ret; +struct ast2600_wdt_priv *priv =dev_get_priv (dev); +struct ast2600_wdt *wdt = priv->regs; + + ret =ast2600_wdt_start (dev,1 , flags); +if (ret) +return ret; + +while (readl (&wdt->ctrl) &WDT_CTRL_EN ) + ; + +return ast2600_wdt_stop (dev); +} + +static int ast2600_wdt_ofdata_to_platdata (struct udevice *dev) { +struct ast2600_wdt_priv *priv =dev_get_priv (dev); + + priv->regs =dev_read_addr_ptr (dev); +if (!priv->regs) +return -EINVAL ; + +return 0 ; +} + +static const struct wdt_ops ast2600_wdt_ops = { + .start = ast2600_wdt_start, + .reset = ast2600_wdt_reset, + .stop = ast2600_wdt_stop, + .expire_now = ast2600_wdt_expire_now, +}; + +static const struct udevice_id ast2600_wdt_ids[] = { + { .compatible ="aspeed,ast2600-wdt" }, + { } +}; + +static int ast2600_wdt_probe (struct udevice *dev) { +debug ("%s() wdt%u\n" , __func__, dev->seq); +ast2600_wdt_stop (dev); + +return 0 ; +} + +U_BOOT_DRIVER (ast2600_wdt) = { + .name ="ast2600_wdt" , + .id =UCLASS_WDT , + .of_match = ast2600_wdt_ids, + .probe = ast2600_wdt_probe, + .priv_auto_alloc_size =sizeof (struct ast2600_wdt_priv ), + .ofdata_to_platdata = ast2600_wdt_ofdata_to_platdata, + .ops = &ast2600_wdt_ops, +}; --2.17.1
Ryan Chen
maintainerPATCH 4/7 reset: aspeed: Add AST2600 reset support
In reply to Chia-WeiQuoted 8 lines
-----Original Message-----
From: ChiaWei Wang <[email protected]>
Sent: Monday, December 14, 2020 1:54 PM
To: trini at konsulko.com; u-boot at lists.denx.de; Ryan Chen <[email protected]>
Cc: BMC-SW <[email protected]>
Subject: [PATCH 4/7] reset: aspeed: Add AST2600 reset support
Quoted 4 lines
Add controller reset support through the System Control Unit (SCU) of AST2600 SoC.
Signed-off-by Chia-Wei, Wang <[email protected]>
Quoted 227 lines
--- drivers/reset/Kconfig | 9 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-ast2600.c | 108 ++++++++++++++++++++++ include/dt-bindings/reset/ast2600-reset.h | 70 ++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 drivers/reset/reset-ast2600.c create mode 100644
include/dt-bindings/reset/ast2600-reset.hdrivers/reset/Kconfig index renamed from drivers/reset/Kconfig +0
-0
33c2736554..f5b3f8826f100644drivers/reset/Kconfig +9
-0@@ -81,6 +81,15 @@ config RESET_AST2500 Say Y if you want to control reset signals of different peripherals through System Control Unit (SCU). +config RESET_AST2600 + bool "Reset controller driver for AST2600 SoCs" + depends on DM_RESET + default y if ASPEED_AST2600 + help + Support for reset controller on AST2600 SoC. + Say Y if you want to control reset signals of different peripherals + through System Control Unit (SCU). + config RESET_ROCKCHIP bool "Reset controller driver for Rockchip SoCs" depends on DM_RESET && ARCH_ROCKCHIP && CLK diff --gita/drivers/reset/Makefile b/drivers/reset/Makefile index
fa52aa3329..8a0f528076100644drivers/reset/Makefile +1
-0@@ -15,6 +15,7 @@ obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o obj-$(CONFIG_RESET_BCM6345) += reset-bcm6345.o obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o obj-$(CONFIG_RESET_AST2500) += reset-ast2500.o +obj-$(CONFIG_RESET_AST2600) += reset-ast2600.o obj-$(CONFIG_RESET_ROCKCHIP) += reset-rockchip.o obj-$(CONFIG_RESET_MESON) += reset-meson.o obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o diff --git
a/drivers/reset/reset-ast2600.cb/drivers/reset/reset-ast2600.cnew file mode 100644 index 0000000000..c402968fa8drivers/reset/reset-ast2600.c new file +101
-0@@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright 2020 ASPEED Technology Inc. +*/ + +#include <common.h> +#include <dm.h> +#include <log.h> +#include <misc.h> +#include <reset.h> +#include <reset-uclass.h> +#include <linux/err.h> +#include <asm/io.h> +#include <asm/arch/scu_ast2600.h> + +struct ast2600_reset_priv { +struct ast2600_scu *scu; +}; + +static int ast2600_reset_request (struct reset_ctl *reset_ctl) { +debug ("%s(reset_ctl=%p) (dev=%p, id=%lu)\n" , __func__, reset_ctl, + reset_ctl->dev, reset_ctl->id); + +return 0 ; +} + +static int ast2600_reset_free (struct reset_ctl *reset_ctl) { +debug ("%s(reset_ctl=%p) (dev=%p, id=%lu)\n" , __func__, reset_ctl, + reset_ctl->dev, reset_ctl->id); + +return 0 ; +} + +static int ast2600_reset_assert (struct reset_ctl *reset_ctl) { +struct ast2600_reset_priv *priv =dev_get_priv (reset_ctl->dev); +struct ast2600_scu *scu = priv->scu; + +debug ("%s: reset_ctl->id: %lu\n" , __func__, reset_ctl->id); + +if (reset_ctl->id <32 ) +writel (BIT (reset_ctl->id), scu->modrst_ctrl1); +else +writel (BIT (reset_ctl->id -32 ), scu->modrst_ctrl2); + +return 0 ; +} + +static int ast2600_reset_deassert (struct reset_ctl *reset_ctl) { +struct ast2600_reset_priv *priv =dev_get_priv (reset_ctl->dev); +struct ast2600_scu *scu = priv->scu; + +debug ("%s: reset_ctl->id: %lu\n" , __func__, reset_ctl->id); + +if (reset_ctl->id <32 ) +writel (BIT (reset_ctl->id), scu->modrst_clr1); +else +writel (BIT (reset_ctl->id -32 ), scu->modrst_clr2); + +return 0 ; +} + +static int ast2600_reset_probe (struct udevice *dev) { +int rc; +struct ast2600_reset_priv *priv =dev_get_priv (dev); +struct udevice *scu_dev; + +/* get SCU base from clock device */ + rc =uclass_get_device_by_driver (UCLASS_CLK , +DM_GET_DRIVER (aspeed_ast2600_scu), &scu_dev); +if (rc) { +debug ("%s: clock device not found, rc=%d\n" , __func__, rc); +return rc; + } + + priv->scu =devfdt_get_addr_ptr (scu_dev); +if (IS_ERR_OR_NULL (priv->scu)) { +debug ("%s: invalid SCU base pointer\n" , __func__); +return PTR_ERR (priv->scu); + } + +return 0 ; +} + +static const struct udevice_id ast2600_reset_ids[] = { + { .compatible ="aspeed,ast2600-reset" }, + { } +}; + +struct reset_ops ast2600_reset_ops = { + .request = ast2600_reset_request, + .rfree = ast2600_reset_free, + .rst_assert = ast2600_reset_assert, + .rst_deassert = ast2600_reset_deassert, }; + +U_BOOT_DRIVER (ast2600_reset) = { + .name ="ast2600_reset" , + .id =UCLASS_RESET , + .of_match = ast2600_reset_ids, + .probe = ast2600_reset_probe, + .ops = &ast2600_reset_ops, + .priv_auto_alloc_size =sizeof (struct ast2600_reset_priv ), };include/dt-bindings/reset/ast2600-reset.h new file +70
-1@@ -0,0 +1,70 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) ASPEED Technology Inc. +*/ + +#ifndef _ABI_MACH_ASPEED_AST2600_RESET_H_#define +_ABI_MACH_ASPEED_AST2600_RESET_H_ + +#define ASPEED_RESET_FSI (59) +#define ASPEED_RESET_RESERVED58 (58) +#define ASPEED_RESET_RESERVED57 (57) +#define ASPEED_RESET_SD (56) +#define ASPEED_RESET_ADC (55) +#define ASPEED_RESET_JTAG_MASTER2 (54) +#define ASPEED_RESET_MAC4 (53) +#define ASPEED_RESET_MAC3 (52) +#define ASPEED_RESET_RESERVE51 (51) +#define ASPEED_RESET_RESERVE50 (50) +#define ASPEED_RESET_RESERVE49 (49) +#define ASPEED_RESET_RESERVE48 (48) +#define ASPEED_RESET_RESERVE47 (47) +#define ASPEED_RESET_RESERVE46 (46) +#define ASPEED_RESET_I3C5 (45) +#define ASPEED_RESET_I3C4 (44) +#define ASPEED_RESET_I3C3 (43) +#define ASPEED_RESET_I3C2 (42) +#define ASPEED_RESET_I3C1 (41) +#define ASPEED_RESET_I3C0 (40) +#define ASPEED_RESET_I3C_DMA (39) +#define ASPEED_RESET_RESERVED38 (38) +#define ASPEED_RESET_PWM (37) +#define ASPEED_RESET_PECI (36) +#define ASPEED_RESET_MII (35) +#define ASPEED_RESET_I2C (34) +#define ASPEED_RESET_RESERVED33 (33) +#define ASPEED_RESET_LPC_ESPI (32) +#define ASPEED_RESET_H2X (31) +#define ASPEED_RESET_GP_MCU (30) +#define ASPEED_RESET_DP_MCU (29) +#define ASPEED_RESET_DP (28) +#define ASPEED_RESET_RC_XDMA (27) +#define ASPEED_RESET_GRAPHICS (26) +#define ASPEED_RESET_DEV_XDMA (25) +#define ASPEED_RESET_DEV_MCTP (24) +#define ASPEED_RESET_RC_MCTP (23) +#define ASPEED_RESET_JTAG_MASTER (22) +#define ASPEED_RESET_PCIE_DEV_OE (21) +#define ASPEED_RESET_PCIE_DEV_O (20) +#define ASPEED_RESET_PCIE_RC_OE (19) +#define ASPEED_RESET_PCIE_RC_O (18) +#define ASPEED_RESET_RESERVED17 (17) +#define ASPEED_RESET_EMMC (16) +#define ASPEED_RESET_UHCI (15) +#define ASPEED_RESET_EHCI_P1 (14) +#define ASPEED_RESET_CRT (13) +#define ASPEED_RESET_MAC2 (12) +#define ASPEED_RESET_MAC1 (11) +#define ASPEED_RESET_RESERVED10 (10) +#define ASPEED_RESET_RVAS (9) +#define ASPEED_RESET_PCI_VGA (8) +#define ASPEED_RESET_2D (7) +#define ASPEED_RESET_VIDEO (6) +#define ASPEED_RESET_PCI_DP (5) +#define ASPEED_RESET_HACE (4) +#define ASPEED_RESET_EHCI_P2 (3) +#define ASPEED_RESET_RESERVED2 (2) +#define ASPEED_RESET_AHB (1) +#define ASPEED_RESET_SDRAM (0) + +#endif /* _ABI_MACH_ASPEED_AST2600_RESET_H_ */ --2.17.1
Ryan Chen
maintainerPATCH 5/7 ARM: dts: aspeed: Add AST2600 SoC support
In reply to Chia-WeiQuoted 11 lines
-----Original Message-----
From: ChiaWei Wang <[email protected]>
Sent: Monday, December 14, 2020 1:54 PM
To: trini at konsulko.com; u-boot at lists.denx.de; Ryan Chen <[email protected]>
Cc: BMC-SW <[email protected]>
Subject: [PATCH 5/7] ARM: dts: aspeed: Add AST2600 SoC supportAST2600 is the 7th generation of Aspeed SoC designated for Interated Remote Management Processor.
Quoted 6 lines
AST2600 has significant performance improvement by integrating 1.2GHz dual-core ARM Cortex A7 (r0p5) CPU with FPU. Most of the controllers are also improved with more features and better performance than preceding AST24xx/AST25xx.
Signed-off-by Chia-Wei, Wang <[email protected]>
Quoted 2,220 lines
--- arch/arm/dts/Makefile | 1 + arch/arm/dts/ast2600-evb.dts | 179 +++ arch/arm/dts/ast2600-u-boot.dtsi | 44 + arch/arm/dts/ast2600.dtsi | 1946 ++++++++++++++++++++++++++++++ 4 files changed, 2170 insertions(+) create mode 100644 arch/arm/dts/ast2600-evb.dts create mode 100644
arch/arm/dts/ast2600-u-boot.dtsicreate mode 100644arch/arm/dts/ast2600.dtsiarch/arm/dts/Makefile index renamed from arch/arm/dts/Makefile +0
-0
02d04f5a8c..3e501b0f35100644arch/arm/dts/Makefile +1
-0@@ -947,6 +947,7 @@ dtb-$(CONFIG_ARCH_BCM6858) += \ dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb dtb-$(CONFIG_ASPEED_AST2500) += ast2500-evb.dtb +dtb-$(CONFIG_ASPEED_AST2600) += ast2600-evb.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtbarch/arm/dts/ast2600-evb.dts new renamed from arch/arm/dts/ast2600-evb.dts +0
-0file mode 100644 index 0000000000..2abd31341c
arch/arm/dts/ast2600-evb.dts new file +179
-0@@ -0,0 +1,179 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +#include "ast2600-u-boot.dtsi" + +/ { + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; + + chosen { + stdout-path = &uart5; + }; + + aliases { + mmc0 = &emmc_slot0; + mmc1 = &sdhci_slot0; + mmc2 = &sdhci_slot1; + spi0 = &fmc; + spi1 = &spi1; + spi2 = &spi2; + ethernet0 = &mac0; + ethernet1 = &mac1; + ethernet2 = &mac2; + ethernet3 = &mac3; + }; + + cpus { + cpu at 0 { + clock-frequency = <800000000>; + }; + cpu at 1 { + clock-frequency = <800000000>; + }; + }; +}; + +&uart5 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&sdrammc { + clock-frequency = <400000000>; +}; + +&wdt1 { + status = "okay"; +}; + +&fmc { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fmcquad_default>; + + flash at 0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; + + flash at 1 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; + + flash at 2 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&spi1 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default &pinctrl_spi1abr_default + &pinctrl_spi1cs1_default &pinctrl_spi1wp_default + &pinctrl_spi1wp_default &pinctrl_spi1quad_default>; + + flash at 0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&spi2 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2_default &pinctrl_spi2cs1_default + &pinctrl_spi2cs2_default &pinctrl_spi2quad_default>; + + flash at 0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&emmc { + u-boot,dm-pre-reloc; + timing-phase = <0x700ff>; +}; + +&emmc_slot0 { + u-boot,dm-pre-reloc; + status = "okay"; + bus-width = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_emmc_default>; + sdhci-drive-type = <1>; +}; + +&i2c4 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c5_default>; +}; + +&i2c5 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c6_default>; +}; + +&i2c6 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c7_default>; +}; + +&i2c7 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c8_default>; +}; + +&i2c8 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c9_default>; +}; + +&scu { + mac0-clk-delay = <0x1d 0x1c + 0x10 0x17 + 0x10 0x17>; + mac1-clk-delay = <0x1d 0x10 + 0x10 0x10 + 0x10 0x10>; + mac2-clk-delay = <0x0a 0x04 + 0x08 0x04 + 0x08 0x04>; + mac3-clk-delay = <0x0a 0x04 + 0x08 0x04 + 0x08 0x04>; +};arch/arm/dts/ast2600-u-boot.dtsi new file +14
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include <dt-bindings/clock/ast2600-clock.h> +#include <dt-bindings/reset/ast2600-reset.h> + +#include "ast2600.dtsi" + +/ { + scu: clock-controller at 1e6e2000 { + compatible = "aspeed,ast2600-scu"; + reg = <0x1e6e2000 0x1000>; + u-boot,dm-pre-reloc; + #clock-cells = <1>; + #reset-cells = <1>; + uart-clk-source = <0x0>; /* uart clock source selection: 0: uxclk 1:huxclk*/
arch/arm/dts/ast2600-u-boot.dtsi new file +30
-0+ }; + + rst: reset-controller { + u-boot,dm-pre-reloc; + compatible = "aspeed,ast2600-reset"; + aspeed,wdt = <&wdt1>; + #reset-cells = <1>; + }; + + sdrammc: sdrammc at 1e6e0000 { + u-boot,dm-pre-reloc; + compatible = "aspeed,ast2600-sdrammc"; + reg = <0x1e6e0000 0x100 + 0x1e6e0100 0x300 + 0x1e6e0400 0x200 >; + #reset-cells = <1>; + clocks = <&scu ASPEED_CLK_MPLL>; + resets = <&rst ASPEED_RESET_SDRAM>; + }; + + ahb { + u-boot,dm-pre-reloc; + + apb { + u-boot,dm-pre-reloc; + }; + + }; +}; +arch/arm/dts/ast2600.dtsi new file renamed from arch/arm/dts/ast2600.dtsi +0
-0mode 100644 index 0000000000..ac0f08b7ea
arch/arm/dts/ast2600.dtsi new file +66
-0@@ -0,0 +1,1946 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include "skeleton.dtsi" + +/ { + model = "Aspeed BMC"; + compatible = "aspeed,ast2600"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&gic>; + + aliases { + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c4 = &i2c4; + i2c5 = &i2c5; + i2c6 = &i2c6; + i2c7 = &i2c7; + i2c8 = &i2c8; + i2c9 = &i2c9; + i2c10 = &i2c10; + i2c11 = &i2c11; + i2c12 = &i2c12; + i2c13 = &i2c13; + i2c14 = &i2c14; + i2c15 = &i2c15; + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; + serial5 = &uart6; + serial6 = &uart7; + serial7 = &uart8; + serial8 = &uart9; + serial9 = &uart10; + serial10 = &uart11; + serial11 = &uart12; + serial12 = &uart13; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "aspeed,ast2600-smp"; + + cpu at 0 { + compatible = "arm,cortex-a7"; + device_type = "cpu"; + reg = <0xf00>; + }; + + cpu at 1 { + compatible = "arm,cortex-a7"; + device_type = "cpu"; + reg = <0xf01>; + }; + + }; + + timer { + compatible = "arm,armv7-timer"; + interrupt-parent = <&gic>; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_LOW)>,arch/arm/dts/ast2600.dtsi new file +1
-0+ <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_LOW)>,arch/arm/dts/ast2600.dtsi new file +1
-0+ <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_LOW)>,arch/arm/dts/ast2600.dtsi new file +1
-0+ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_LOW)>;arch/arm/dts/ast2600.dtsi new file +32
-0+ }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gfx_memory: framebuffer { + size = <0x01000000>; + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + reusable; + }; + + video_memory: video { + size = <0x04000000>; + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + no-map; + }; + }; + + ahb { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + device_type = "soc"; + ranges; + + gic: interrupt-controller at 40461000 { + compatible = "arm,cortex-a7-gic"; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_HIGH)>;arch/arm/dts/ast2600.dtsi new file +222
-0+ #interrupt-cells = <3>; + interrupt-controller; + interrupt-parent = <&gic>; + reg = <0x40461000 0x1000>, + <0x40462000 0x1000>, + <0x40464000 0x2000>, + <0x40466000 0x2000>; + }; + + ahbc: ahbc at 1e600000 { + compatible = "aspeed,aspeed-ahbc"; + reg = < 0x1e600000 0x100>; + }; + + fmc: flash-controller at 1e620000 { + reg = < 0x1e620000 0xc4 + 0x20000000 0x10000000 >; + #address-cells = <1>; + #size-cells = <0>; + compatible = "aspeed,ast2600-fmc"; + status = "disabled"; + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_AHB>; + num-cs = <3>; + flash at 0 { + reg = < 0 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + flash at 1 { + reg = < 1 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + flash at 2 { + reg = < 2 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + }; + + spi1: flash-controller at 1e630000 { + reg = < 0x1e630000 0xc4 + 0x30000000 0x08000000 >; + #address-cells = <1>; + #size-cells = <0>; + compatible = "aspeed,ast2600-spi"; + clocks = <&scu ASPEED_CLK_AHB>; + num-cs = <2>; + status = "disabled"; + flash at 0 { + reg = < 0 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + flash at 1 { + reg = < 1 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + }; + + spi2: flash-controller at 1e631000 { + reg = < 0x1e631000 0xc4 + 0x50000000 0x08000000 >; + #address-cells = <1>; + #size-cells = <0>; + compatible = "aspeed,ast2600-spi"; + clocks = <&scu ASPEED_CLK_AHB>; + num-cs = <3>; + status = "disabled"; + flash at 0 { + reg = < 0 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + flash at 1 { + reg = < 1 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + flash at 2 { + reg = < 2 >; + compatible = "jedec,spi-nor"; + status = "disabled"; + }; + }; + + edac: sdram at 1e6e0000 { + compatible = "aspeed,ast2600-sdram-edac"; + reg = <0x1e6e0000 0x174>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + }; + + mdio: ethernet at 1e650000 { + compatible = "aspeed,aspeed-mdio"; + reg = <0x1e650000 0x40>; + resets = <&rst ASPEED_RESET_MII>; + status = "disabled"; + }; + + mac0: ftgmac at 1e660000 { + compatible = "aspeed,ast2600-mac", "faraday,ftgmac100"; + reg = <0x1e660000 0x180>, <0x1e650000 0x4>; + interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_MAC1CLK>; + status = "disabled"; + }; + + mac1: ftgmac at 1e680000 { + compatible = "aspeed,ast2600-mac", "faraday,ftgmac100"; + reg = <0x1e680000 0x180>, <0x1e650008 0x4>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_MAC2CLK>; + status = "disabled"; + }; + + mac2: ftgmac at 1e670000 { + compatible = "aspeed,ast2600-mac", "faraday,ftgmac100"; + reg = <0x1e670000 0x180>, <0x1e650010 0x4>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_MAC3CLK>; + status = "disabled"; + }; + + mac3: ftgmac at 1e690000 { + compatible = "aspeed,ast2600-mac", "faraday,ftgmac100"; + reg = <0x1e690000 0x180>, <0x1e650018 0x4>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_MAC4CLK>; + status = "disabled"; + }; + + ehci0: usb at 1e6a1000 { + compatible = "aspeed,aspeed-ehci", "usb-ehci"; + reg = <0x1e6a1000 0x100>; + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_USBPORT1CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2ah_default>; + status = "disabled"; + }; + + ehci1: usb at 1e6a3000 { + compatible = "aspeed,aspeed-ehci", "usb-ehci"; + reg = <0x1e6a3000 0x100>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_USBPORT2CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2bh_default>; + status = "disabled"; + }; + + apb { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + syscon: syscon at 1e6e2000 { + compatible = "aspeed,g6-scu", "syscon", "simple-mfd"; + reg = <0x1e6e2000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + #clock-cells = <1>; + #reset-cells = <1>; + ranges = <0 0x1e6e2000 0x1000>; + + pinctrl: pinctrl { + compatible = "aspeed,g6-pinctrl"; + aspeed,external-nodes = <&gfx &lhc>; + + }; + + vga_scratch: scratch { + compatible = "aspeed,bmc-misc"; + }; + + scu_ic0: interrupt-controller at 0 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic"; + reg = <0x560 0x10>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; + + scu_ic1: interrupt-controller at 1 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic"; + reg = <0x570 0x10>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; + + }; + + smp-memram at 0 { + compatible = "aspeed,ast2600-smpmem", "syscon"; + reg = <0x1e6e2180 0x40>; + }; + + gfx: display at 1e6e6000 { + compatible = "aspeed,ast2500-gfx", "syscon"; + reg = <0x1e6e6000 0x1000>; + reg-io-width = <4>; + }; + + pcie_bridge0: pcie at 1e6ed000 { + compatible = "aspeed,ast2600-pcie"; + #address-cells = <3>; + #size-cells = <2>; + reg = <0x1e6ed000 0x100>; + ranges = <0x81000000 0x0 0x0 0x0 0x0 0x10000>, + <0x82000000 0x0 0x60000000 0x60000000 0x0
0x10000000>;arch/arm/dts/ast2600.dtsi new file +17
-0+ device_type = "pci"; + bus-range = <0x00 0xff>; + resets = <&rst ASPEED_RESET_PCIE_DEV_O>; + cfg-handle = <&pcie_cfg0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie0rc_default>; + + status = "disabled"; + }; + + pcie_bridge1: pcie at 1e6ed200 { + compatible = "aspeed,ast2600-pcie"; + #address-cells = <3>; + #size-cells = <2>; + reg = <0x1e6ed200 0x100>; + ranges = <0x81000000 0x0 0x0 0x10000 0x00 0x10000>, + <0x82000000 0x0 0x70000000 0x70000000 0x0
0x10000000>;arch/arm/dts/ast2600.dtsi new file +394
-0+ device_type = "pci"; + bus-range = <0x00 0xff>; + resets = <&rst ASPEED_RESET_PCIE_RC_O>; + cfg-handle = <&pcie_cfg1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie1rc_default>; + + status = "disabled"; + }; + + sdhci: sdhci at 1e740000 { + #interrupt-cells = <1>; + compatible = "aspeed,aspeed-sdhci-irq", "simple-mfd"; + reg = <0x1e740000 0x1000>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + clocks = <&scu ASPEED_CLK_GATE_SDCLK>, + <&scu ASPEED_CLK_GATE_SDEXTCLK>; + clock-names = "ctrlclk", "extclk"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x1e740000 0x1000>; + + sdhci_slot0: sdhci_slot0 at 100 { + compatible = "aspeed,sdhci-ast2600"; + reg = <0x100 0x100>; + interrupts = <0>; + interrupt-parent = <&sdhci>; + sdhci,auto-cmd12; + clocks = <&scu ASPEED_CLK_SDIO>; + status = "disabled"; + }; + + sdhci_slot1: sdhci_slot1 at 200 { + compatible = "aspeed,sdhci-ast2600"; + reg = <0x200 0x100>; + interrupts = <1>; + interrupt-parent = <&sdhci>; + sdhci,auto-cmd12; + clocks = <&scu ASPEED_CLK_SDIO>; + status = "disabled"; + }; + }; + + emmc: emmc at 1e750000 { + #interrupt-cells = <1>; + compatible = "aspeed,aspeed-emmc-irq", "simple-mfd"; + reg = <0x1e750000 0x1000>; + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + clocks = <&scu ASPEED_CLK_GATE_EMMCCLK>, + <&scu ASPEED_CLK_GATE_EMMCEXTCLK>; + clock-names = "ctrlclk", "extclk"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x1e750000 0x1000>; + + emmc_slot0: emmc_slot0 at 100 { + compatible = "aspeed,emmc-ast2600"; + reg = <0x100 0x100>; + interrupts = <0>; + interrupt-parent = <&emmc>; + clocks = <&scu ASPEED_CLK_EMMC>; + status = "disabled"; + }; + }; + + h2x: h2x at 1e770000 { + compatible = "aspeed,ast2600-h2x"; + reg = <0x1e770000 0x100>; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + resets = <&rst ASPEED_RESET_H2X>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x1e770000 0x100>; + + status = "disabled"; + + pcie_cfg0: cfg0 at 80 { + reg = <0x80 0x80>; + compatible = "aspeed,ast2600-pcie-cfg"; + }; + + pcie_cfg1: cfg1 at C0 { + compatible = "aspeed,ast2600-pcie-cfg"; + reg = <0xC0 0x80>; + }; + }; + + gpio0: gpio at 1e780000 { + compatible = "aspeed,ast2600-gpio"; + reg = <0x1e780000 0x1000>; + interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; + #gpio-cells = <2>; + gpio-controller; + interrupt-controller; + gpio-ranges = <&pinctrl 0 0 220>; + ngpios = <208>; + }; + + gpio1: gpio at 1e780800 { + compatible = "aspeed,ast2600-gpio"; + reg = <0x1e780800 0x800>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + #gpio-cells = <2>; + gpio-controller; + interrupt-controller; + gpio-ranges = <&pinctrl 0 0 208>; + ngpios = <36>; + }; + + uart1: serial at 1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART1CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart5: serial at 1e784000 { + compatible = "ns16550a"; + reg = <0x1e784000 0x1000>; + reg-shift = <2>; + interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART5CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + wdt1: watchdog at 1e785000 { + compatible = "aspeed,ast2600-wdt"; + reg = <0x1e785000 0x40>; + }; + + wdt2: watchdog at 1e785040 { + compatible = "aspeed,ast2600-wdt"; + reg = <0x1e785040 0x40>; + }; + + wdt3: watchdog at 1e785080 { + compatible = "aspeed,ast2600-wdt"; + reg = <0x1e785080 0x40>; + }; + + wdt4: watchdog at 1e7850C0 { + compatible = "aspeed,ast2600-wdt"; + reg = <0x1e7850C0 0x40>; + }; + + lpc: lpc at 1e789000 { + compatible = "aspeed,ast2600-lpc", "simple-mfd", "syscon"; + reg = <0x1e789000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x1e789000 0x1000>; + + kcs1: kcs1 at 0 { + compatible = "aspeed,ast2600-kcs-bmc"; + reg = <0x0 0x80>; + interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; + kcs_chan = <1>; + kcs_addr = <0xCA0>; + status = "disabled"; + }; + + kcs2: kcs2 at 0 { + compatible = "aspeed,ast2600-kcs-bmc"; + reg = <0x0 0x80>; + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; + kcs_chan = <2>; + kcs_addr = <0xCA8>; + status = "disabled"; + }; + + kcs3: kcs3 at 0 { + compatible = "aspeed,ast2600-kcs-bmc"; + reg = <0x0 0x80>; + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; + kcs_chan = <3>; + kcs_addr = <0xCA2>; + }; + + kcs4: kcs4 at 0 { + compatible = "aspeed,ast2600-kcs-bmc"; + reg = <0x0 0x120>; + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; + kcs_chan = <4>; + kcs_addr = <0xCA4>; + status = "disabled"; + }; + + lpc_ctrl: lpc-ctrl at 80 { + compatible = "aspeed,ast2600-lpc-ctrl"; + reg = <0x80 0x80>; + status = "disabled"; + }; + + lpc_snoop: lpc-snoop at 80 { + compatible = "aspeed,ast2600-lpc-snoop"; + reg = <0x80 0x80>; + interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + lhc: lhc at a0 { + compatible = "aspeed,ast2600-lhc"; + reg = <0xa0 0x24 0xc8 0x8>; + }; + + lpc_reset: reset-controller at 98 { + compatible = "aspeed,ast2600-lpc-reset"; + reg = <0x98 0x4>; + #reset-cells = <1>; + status = "disabled"; + }; + + ibt: ibt at 140 { + compatible = "aspeed,ast2600-ibt-bmc"; + reg = <0x140 0x18>; + interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + sio_regs: regs { + compatible = "aspeed,bmc-misc"; + }; + + mbox: mbox at 200 { + compatible = "aspeed,ast2600-mbox"; + reg = <0x200 0x5c>; + interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>; + #mbox-cells = <1>; + status = "disabled"; + }; + }; + + uart2: serial at 1e78d000 { + compatible = "ns16550a"; + reg = <0x1e78d000 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART2CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart3: serial at 1e78e000 { + compatible = "ns16550a"; + reg = <0x1e78e000 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART3CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart4: serial at 1e78f000 { + compatible = "ns16550a"; + reg = <0x1e78f000 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART4CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + i2c: bus at 1e78a000 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x1e78a000 0x1000>; + }; + + fsim0: fsi at 1e79b000 { + compatible = "aspeed,ast2600-fsi-master", "fsi-master"; + reg = <0x1e79b000 0x94>; + interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fsi1_default>; + clocks = <&scu ASPEED_CLK_GATE_FSICLK>; + status = "disabled"; + }; + + fsim1: fsi at 1e79b100 { + compatible = "aspeed,ast2600-fsi-master", "fsi-master"; + reg = <0x1e79b100 0x94>; + interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fsi2_default>; + clocks = <&scu ASPEED_CLK_GATE_FSICLK>; + status = "disabled"; + }; + + uart6: serial at 1e790000 { + compatible = "ns16550a"; + reg = <0x1e790000 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART6CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart7: serial at 1e790100 { + compatible = "ns16550a"; + reg = <0x1e790100 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART7CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart8: serial at 1e790200 { + compatible = "ns16550a"; + reg = <0x1e790200 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART8CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart9: serial at 1e790300 { + compatible = "ns16550a"; + reg = <0x1e790300 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART9CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart10: serial at 1e790400 { + compatible = "ns16550a"; + reg = <0x1e790400 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART10CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart11: serial at 1e790500 { + compatible = "ns16550a"; + reg = <0x1e790400 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART11CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart12: serial at 1e790600 { + compatible = "ns16550a"; + reg = <0x1e790600 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART12CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + uart13: serial at 1e790700 { + compatible = "ns16550a"; + reg = <0x1e790700 0x20>; + reg-shift = <2>; + interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_GATE_UART13CLK>; + clock-frequency = <1846154>; + no-loopback-test; + status = "disabled"; + }; + + display_port: dp at 1e6eb000 { + compatible = "aspeed,ast2600-displayport"; + reg = <0x1e6eb000 0x200>; + interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + resets = <&rst ASPEED_RESET_DP> ,<&rst
ASPEED_RESET_DP_MCU>;arch/arm/dts/ast2600.dtsi new file +1212
-1+ status = "disabled"; + }; + + }; + + }; + +}; + +&i2c { + i2cglobal: i2cg at 00 { + compatible = "aspeed,ast2600-i2c-global"; + reg = <0x0 0x40>; + resets = <&rst ASPEED_RESET_I2C>; +#if 0 + new-mode; +#endif + }; + + i2c0: i2c at 80 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x80 0x80 0xC00 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c1: i2c at 100 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x100 0x80 0xC20 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c2: i2c at 180 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x180 0x80 0xC40 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + }; + + i2c3: i2c at 200 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x200 0x40 0xC60 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + }; + + i2c4: i2c at 280 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x280 0x80 0xC80 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + }; + + i2c5: i2c at 300 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x300 0x40 0xCA0 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + }; + + i2c6: i2c at 380 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x380 0x80 0xCC0 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + }; + + i2c7: i2c at 400 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x400 0x80 0xCE0 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + }; + + i2c8: i2c at 480 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x480 0x80 0xD00 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + }; + + i2c9: i2c at 500 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x500 0x80 0xD20 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c10: i2c at 580 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x580 0x80 0xD40 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c11: i2c at 600 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x600 0x80 0xD60 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c12: i2c at 680 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x680 0x80 0xD80 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c13: i2c at 700 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x700 0x80 0xDA0 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c14: i2c at 780 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x780 0x80 0xDC0 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + + i2c15: i2c at 800 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + + reg = <0x800 0x80 0xDE0 0x20>; + compatible = "aspeed,ast2600-i2c-bus"; + bus-frequency = <100000>; + interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scu ASPEED_CLK_APB2>; + status = "disabled"; + }; + +}; + +&pinctrl { + pinctrl_fmcquad_default: fmcquad_default { + function = "FMCQUAD"; + groups = "FMCQUAD"; + }; + + pinctrl_spi1_default: spi1_default { + function = "SPI1"; + groups = "SPI1"; + }; + + pinctrl_spi1abr_default: spi1abr_default { + function = "SPI1ABR"; + groups = "SPI1ABR"; + }; + + pinctrl_spi1cs1_default: spi1cs1_default { + function = "SPI1CS1"; + groups = "SPI1CS1"; + }; + + pinctrl_spi1wp_default: spi1wp_default { + function = "SPI1WP"; + groups = "SPI1WP"; + }; + + pinctrl_spi1quad_default: spi1quad_default { + function = "SPI1QUAD"; + groups = "SPI1QUAD"; + }; + + pinctrl_spi2_default: spi2_default { + function = "SPI2"; + groups = "SPI2"; + }; + + pinctrl_spi2cs1_default: spi2cs1_default { + function = "SPI2CS1"; + groups = "SPI2CS1"; + }; + + pinctrl_spi2cs2_default: spi2cs2_default { + function = "SPI2CS2"; + groups = "SPI2CS2"; + }; + + pinctrl_spi2quad_default: spi2quad_default { + function = "SPI2QUAD"; + groups = "SPI2QUAD"; + }; + + pinctrl_acpi_default: acpi_default { + function = "ACPI"; + groups = "ACPI"; + }; + + pinctrl_adc0_default: adc0_default { + function = "ADC0"; + groups = "ADC0"; + }; + + pinctrl_adc1_default: adc1_default { + function = "ADC1"; + groups = "ADC1"; + }; + + pinctrl_adc10_default: adc10_default { + function = "ADC10"; + groups = "ADC10"; + }; + + pinctrl_adc11_default: adc11_default { + function = "ADC11"; + groups = "ADC11"; + }; + + pinctrl_adc12_default: adc12_default { + function = "ADC12"; + groups = "ADC12"; + }; + + pinctrl_adc13_default: adc13_default { + function = "ADC13"; + groups = "ADC13"; + }; + + pinctrl_adc14_default: adc14_default { + function = "ADC14"; + groups = "ADC14"; + }; + + pinctrl_adc15_default: adc15_default { + function = "ADC15"; + groups = "ADC15"; + }; + + pinctrl_adc2_default: adc2_default { + function = "ADC2"; + groups = "ADC2"; + }; + + pinctrl_adc3_default: adc3_default { + function = "ADC3"; + groups = "ADC3"; + }; + + pinctrl_adc4_default: adc4_default { + function = "ADC4"; + groups = "ADC4"; + }; + + pinctrl_adc5_default: adc5_default { + function = "ADC5"; + groups = "ADC5"; + }; + + pinctrl_adc6_default: adc6_default { + function = "ADC6"; + groups = "ADC6"; + }; + + pinctrl_adc7_default: adc7_default { + function = "ADC7"; + groups = "ADC7"; + }; + + pinctrl_adc8_default: adc8_default { + function = "ADC8"; + groups = "ADC8"; + }; + + pinctrl_adc9_default: adc9_default { + function = "ADC9"; + groups = "ADC9"; + }; + + pinctrl_bmcint_default: bmcint_default { + function = "BMCINT"; + groups = "BMCINT"; + }; + + pinctrl_ddcclk_default: ddcclk_default { + function = "DDCCLK"; + groups = "DDCCLK"; + }; + + pinctrl_ddcdat_default: ddcdat_default { + function = "DDCDAT"; + groups = "DDCDAT"; + }; + + pinctrl_espi_default: espi_default { + function = "ESPI"; + groups = "ESPI"; + }; + + pinctrl_fsi1_default: fsi1_default { + function = "FSI1"; + groups = "FSI1"; + }; + + pinctrl_fsi2_default: fsi2_default { + function = "FSI2"; + groups = "FSI2"; + }; + + pinctrl_fwspics1_default: fwspics1_default { + function = "FWSPICS1"; + groups = "FWSPICS1"; + }; + + pinctrl_fwspics2_default: fwspics2_default { + function = "FWSPICS2"; + groups = "FWSPICS2"; + }; + + pinctrl_gpid0_default: gpid0_default { + function = "GPID0"; + groups = "GPID0"; + }; + + pinctrl_gpid2_default: gpid2_default { + function = "GPID2"; + groups = "GPID2"; + }; + + pinctrl_gpid4_default: gpid4_default { + function = "GPID4"; + groups = "GPID4"; + }; + + pinctrl_gpid6_default: gpid6_default { + function = "GPID6"; + groups = "GPID6"; + }; + + pinctrl_gpie0_default: gpie0_default { + function = "GPIE0"; + groups = "GPIE0"; + }; + + pinctrl_gpie2_default: gpie2_default { + function = "GPIE2"; + groups = "GPIE2"; + }; + + pinctrl_gpie4_default: gpie4_default { + function = "GPIE4"; + groups = "GPIE4"; + }; + + pinctrl_gpie6_default: gpie6_default { + function = "GPIE6"; + groups = "GPIE6"; + }; + + pinctrl_i2c1_default: i2c1_default { + function = "I2C1"; + groups = "I2C1"; + }; + pinctrl_i2c2_default: i2c2_default { + function = "I2C2"; + groups = "I2C2"; + }; + + pinctrl_i2c3_default: i2c3_default { + function = "I2C3"; + groups = "I2C3"; + }; + + pinctrl_i2c4_default: i2c4_default { + function = "I2C4"; + groups = "I2C4"; + }; + + pinctrl_i2c5_default: i2c5_default { + function = "I2C5"; + groups = "I2C5"; + }; + + pinctrl_i2c6_default: i2c6_default { + function = "I2C6"; + groups = "I2C6"; + }; + + pinctrl_i2c7_default: i2c7_default { + function = "I2C7"; + groups = "I2C7"; + }; + + pinctrl_i2c8_default: i2c8_default { + function = "I2C8"; + groups = "I2C8"; + }; + + pinctrl_i2c9_default: i2c9_default { + function = "I2C9"; + groups = "I2C9"; + }; + + pinctrl_i2c10_default: i2c10_default { + function = "I2C10"; + groups = "I2C10"; + }; + + pinctrl_i2c11_default: i2c11_default { + function = "I2C11"; + groups = "I2C11"; + }; + + pinctrl_i2c12_default: i2c12_default { + function = "I2C12"; + groups = "I2C12"; + }; + + pinctrl_i2c13_default: i2c13_default { + function = "I2C13"; + groups = "I2C13"; + }; + + pinctrl_i2c14_default: i2c14_default { + function = "I2C14"; + groups = "I2C14"; + }; + + pinctrl_i2c15_default: i2c15_default { + function = "I2C15"; + groups = "I2C15"; + }; + + pinctrl_i2c16_default: i2c16_default { + function = "I2C16"; + groups = "I2C16"; + }; + + pinctrl_lad0_default: lad0_default { + function = "LAD0"; + groups = "LAD0"; + }; + + pinctrl_lad1_default: lad1_default { + function = "LAD1"; + groups = "LAD1"; + }; + + pinctrl_lad2_default: lad2_default { + function = "LAD2"; + groups = "LAD2"; + }; + + pinctrl_lad3_default: lad3_default { + function = "LAD3"; + groups = "LAD3"; + }; + + pinctrl_lclk_default: lclk_default { + function = "LCLK"; + groups = "LCLK"; + }; + + pinctrl_lframe_default: lframe_default { + function = "LFRAME"; + groups = "LFRAME"; + }; + + pinctrl_lpchc_default: lpchc_default { + function = "LPCHC"; + groups = "LPCHC"; + }; + + pinctrl_lpcpd_default: lpcpd_default { + function = "LPCPD"; + groups = "LPCPD"; + }; + + pinctrl_lpcplus_default: lpcplus_default { + function = "LPCPLUS"; + groups = "LPCPLUS"; + }; + + pinctrl_lpcpme_default: lpcpme_default { + function = "LPCPME"; + groups = "LPCPME"; + }; + + pinctrl_lpcrst_default: lpcrst_default { + function = "LPCRST"; + groups = "LPCRST"; + }; + + pinctrl_lpcsmi_default: lpcsmi_default { + function = "LPCSMI"; + groups = "LPCSMI"; + }; + + pinctrl_lsirq_default: lsirq_default { + function = "LSIRQ"; + groups = "LSIRQ"; + }; + + pinctrl_mac1link_default: mac1link_default { + function = "MAC1LINK"; + groups = "MAC1LINK"; + }; + + pinctrl_mac2link_default: mac2link_default { + function = "MAC2LINK"; + groups = "MAC2LINK"; + }; + + pinctrl_mac3link_default: mac3link_default { + function = "MAC3LINK"; + groups = "MAC3LINK"; + }; + + pinctrl_mac4link_default: mac4link_default { + function = "MAC4LINK"; + groups = "MAC4LINK"; + }; + + pinctrl_mdio1_default: mdio1_default { + function = "MDIO1"; + groups = "MDIO1"; + }; + + pinctrl_mdio2_default: mdio2_default { + function = "MDIO2"; + groups = "MDIO2"; + }; + + pinctrl_mdio3_default: mdio3_default { + function = "MDIO3"; + groups = "MDIO3"; + }; + + pinctrl_mdio4_default: mdio4_default { + function = "MDIO4"; + groups = "MDIO4"; + }; + + pinctrl_rmii1_default: rmii1_default { + function = "RMII1"; + groups = "RMII1"; + }; + + pinctrl_rmii2_default: rmii2_default { + function = "RMII2"; + groups = "RMII2"; + }; + + pinctrl_rmii3_default: rmii3_default { + function = "RMII3"; + groups = "RMII3"; + }; + + pinctrl_rmii4_default: rmii4_default { + function = "RMII4"; + groups = "RMII4"; + }; + + pinctrl_rmii1rclk_default: rmii1rclk_default { + function = "RMII1RCLK"; + groups = "RMII1RCLK"; + }; + + pinctrl_rmii2rclk_default: rmii2rclk_default { + function = "RMII2RCLK"; + groups = "RMII2RCLK"; + }; + + pinctrl_rmii3rclk_default: rmii3rclk_default { + function = "RMII3RCLK"; + groups = "RMII3RCLK"; + }; + + pinctrl_rmii4rclk_default: rmii4rclk_default { + function = "RMII4RCLK"; + groups = "RMII4RCLK"; + }; + + pinctrl_ncts1_default: ncts1_default { + function = "NCTS1"; + groups = "NCTS1"; + }; + + pinctrl_ncts2_default: ncts2_default { + function = "NCTS2"; + groups = "NCTS2"; + }; + + pinctrl_ncts3_default: ncts3_default { + function = "NCTS3"; + groups = "NCTS3"; + }; + + pinctrl_ncts4_default: ncts4_default { + function = "NCTS4"; + groups = "NCTS4"; + }; + + pinctrl_ndcd1_default: ndcd1_default { + function = "NDCD1"; + groups = "NDCD1"; + }; + + pinctrl_ndcd2_default: ndcd2_default { + function = "NDCD2"; + groups = "NDCD2"; + }; + + pinctrl_ndcd3_default: ndcd3_default { + function = "NDCD3"; + groups = "NDCD3"; + }; + + pinctrl_ndcd4_default: ndcd4_default { + function = "NDCD4"; + groups = "NDCD4"; + }; + + pinctrl_ndsr1_default: ndsr1_default { + function = "NDSR1"; + groups = "NDSR1"; + }; + + pinctrl_ndsr2_default: ndsr2_default { + function = "NDSR2"; + groups = "NDSR2"; + }; + + pinctrl_ndsr3_default: ndsr3_default { + function = "NDSR3"; + groups = "NDSR3"; + }; + + pinctrl_ndsr4_default: ndsr4_default { + function = "NDSR4"; + groups = "NDSR4"; + }; + + pinctrl_ndtr1_default: ndtr1_default { + function = "NDTR1"; + groups = "NDTR1"; + }; + + pinctrl_ndtr2_default: ndtr2_default { + function = "NDTR2"; + groups = "NDTR2"; + }; + + pinctrl_ndtr3_default: ndtr3_default { + function = "NDTR3"; + groups = "NDTR3"; + }; + + pinctrl_ndtr4_default: ndtr4_default { + function = "NDTR4"; + groups = "NDTR4"; + }; + + pinctrl_nri1_default: nri1_default { + function = "NRI1"; + groups = "NRI1"; + }; + + pinctrl_nri2_default: nri2_default { + function = "NRI2"; + groups = "NRI2"; + }; + + pinctrl_nri3_default: nri3_default { + function = "NRI3"; + groups = "NRI3"; + }; + + pinctrl_nri4_default: nri4_default { + function = "NRI4"; + groups = "NRI4"; + }; + + pinctrl_nrts1_default: nrts1_default { + function = "NRTS1"; + groups = "NRTS1"; + }; + + pinctrl_nrts2_default: nrts2_default { + function = "NRTS2"; + groups = "NRTS2"; + }; + + pinctrl_nrts3_default: nrts3_default { + function = "NRTS3"; + groups = "NRTS3"; + }; + + pinctrl_nrts4_default: nrts4_default { + function = "NRTS4"; + groups = "NRTS4"; + }; + + pinctrl_oscclk_default: oscclk_default { + function = "OSCCLK"; + groups = "OSCCLK"; + }; + + pinctrl_pewake_default: pewake_default { + function = "PEWAKE"; + groups = "PEWAKE"; + }; + + pinctrl_pnor_default: pnor_default { + function = "PNOR"; + groups = "PNOR"; + }; + + pinctrl_pwm0_default: pwm0_default { + function = "PWM0"; + groups = "PWM0"; + }; + + pinctrl_pwm1_default: pwm1_default { + function = "PWM1"; + groups = "PWM1"; + }; + + pinctrl_pwm2_default: pwm2_default { + function = "PWM2"; + groups = "PWM2"; + }; + + pinctrl_pwm3_default: pwm3_default { + function = "PWM3"; + groups = "PWM3"; + }; + + pinctrl_pwm4_default: pwm4_default { + function = "PWM4"; + groups = "PWM4"; + }; + + pinctrl_pwm5_default: pwm5_default { + function = "PWM5"; + groups = "PWM5"; + }; + + pinctrl_pwm6_default: pwm6_default { + function = "PWM6"; + groups = "PWM6"; + }; + + pinctrl_pwm7_default: pwm7_default { + function = "PWM7"; + groups = "PWM7"; + }; + + pinctrl_rgmii1_default: rgmii1_default { + function = "RGMII1"; + groups = "RGMII1"; + }; + + pinctrl_rgmii2_default: rgmii2_default { + function = "RGMII2"; + groups = "RGMII2"; + }; + + pinctrl_rgmii3_default: rgmii3_default { + function = "RGMII3"; + groups = "RGMII3"; + }; + + pinctrl_rgmii4_default: rgmii4_default { + function = "RGMII4"; + groups = "RGMII4"; + }; + + pinctrl_rmii1_default: rmii1_default { + function = "RMII1"; + groups = "RMII1"; + }; + + pinctrl_rmii2_default: rmii2_default { + function = "RMII2"; + groups = "RMII2"; + }; + + pinctrl_rxd1_default: rxd1_default { + function = "RXD1"; + groups = "RXD1"; + }; + + pinctrl_rxd2_default: rxd2_default { + function = "RXD2"; + groups = "RXD2"; + }; + + pinctrl_rxd3_default: rxd3_default { + function = "RXD3"; + groups = "RXD3"; + }; + + pinctrl_rxd4_default: rxd4_default { + function = "RXD4"; + groups = "RXD4"; + }; + + pinctrl_salt1_default: salt1_default { + function = "SALT1"; + groups = "SALT1"; + }; + + pinctrl_salt10_default: salt10_default { + function = "SALT10"; + groups = "SALT10"; + }; + + pinctrl_salt11_default: salt11_default { + function = "SALT11"; + groups = "SALT11"; + }; + + pinctrl_salt12_default: salt12_default { + function = "SALT12"; + groups = "SALT12"; + }; + + pinctrl_salt13_default: salt13_default { + function = "SALT13"; + groups = "SALT13"; + }; + + pinctrl_salt14_default: salt14_default { + function = "SALT14"; + groups = "SALT14"; + }; + + pinctrl_salt2_default: salt2_default { + function = "SALT2"; + groups = "SALT2"; + }; + + pinctrl_salt3_default: salt3_default { + function = "SALT3"; + groups = "SALT3"; + }; + + pinctrl_salt4_default: salt4_default { + function = "SALT4"; + groups = "SALT4"; + }; + + pinctrl_salt5_default: salt5_default { + function = "SALT5"; + groups = "SALT5"; + }; + + pinctrl_salt6_default: salt6_default { + function = "SALT6"; + groups = "SALT6"; + }; + + pinctrl_salt7_default: salt7_default { + function = "SALT7"; + groups = "SALT7"; + }; + + pinctrl_salt8_default: salt8_default { + function = "SALT8"; + groups = "SALT8"; + }; + + pinctrl_salt9_default: salt9_default { + function = "SALT9"; + groups = "SALT9"; + }; + + pinctrl_scl1_default: scl1_default { + function = "SCL1"; + groups = "SCL1"; + }; + + pinctrl_scl2_default: scl2_default { + function = "SCL2"; + groups = "SCL2"; + }; + + pinctrl_sd1_default: sd1_default { + function = "SD1"; + groups = "SD1"; + }; + + pinctrl_sd2_default: sd2_default { + function = "SD2"; + groups = "SD2"; + }; + + pinctrl_emmc_default: emmc_default { + function = "EMMC"; + groups = "EMMC"; + }; + + pinctrl_emmcg8_default: emmcg8_default { + function = "EMMCG8"; + groups = "EMMCG8"; + }; + + pinctrl_sda1_default: sda1_default { + function = "SDA1"; + groups = "SDA1"; + }; + + pinctrl_sda2_default: sda2_default { + function = "SDA2"; + groups = "SDA2"; + }; + + pinctrl_sgps1_default: sgps1_default { + function = "SGPS1"; + groups = "SGPS1"; + }; + + pinctrl_sgps2_default: sgps2_default { + function = "SGPS2"; + groups = "SGPS2"; + }; + + pinctrl_sioonctrl_default: sioonctrl_default { + function = "SIOONCTRL"; + groups = "SIOONCTRL"; + }; + + pinctrl_siopbi_default: siopbi_default { + function = "SIOPBI"; + groups = "SIOPBI"; + }; + + pinctrl_siopbo_default: siopbo_default { + function = "SIOPBO"; + groups = "SIOPBO"; + }; + + pinctrl_siopwreq_default: siopwreq_default { + function = "SIOPWREQ"; + groups = "SIOPWREQ"; + }; + + pinctrl_siopwrgd_default: siopwrgd_default { + function = "SIOPWRGD"; + groups = "SIOPWRGD"; + }; + + pinctrl_sios3_default: sios3_default { + function = "SIOS3"; + groups = "SIOS3"; + }; + + pinctrl_sios5_default: sios5_default { + function = "SIOS5"; + groups = "SIOS5"; + }; + + pinctrl_siosci_default: siosci_default { + function = "SIOSCI"; + groups = "SIOSCI"; + }; + + pinctrl_spi1_default: spi1_default { + function = "SPI1"; + groups = "SPI1"; + }; + + pinctrl_spi1cs1_default: spi1cs1_default { + function = "SPI1CS1"; + groups = "SPI1CS1"; + }; + + pinctrl_spi1debug_default: spi1debug_default { + function = "SPI1DEBUG"; + groups = "SPI1DEBUG"; + }; + + pinctrl_spi1passthru_default: spi1passthru_default { + function = "SPI1PASSTHRU"; + groups = "SPI1PASSTHRU"; + }; + + pinctrl_spi2ck_default: spi2ck_default { + function = "SPI2CK"; + groups = "SPI2CK"; + }; + + pinctrl_spi2cs0_default: spi2cs0_default { + function = "SPI2CS0"; + groups = "SPI2CS0"; + }; + + pinctrl_spi2cs1_default: spi2cs1_default { + function = "SPI2CS1"; + groups = "SPI2CS1"; + }; + + pinctrl_spi2miso_default: spi2miso_default { + function = "SPI2MISO"; + groups = "SPI2MISO"; + }; + + pinctrl_spi2mosi_default: spi2mosi_default { + function = "SPI2MOSI"; + groups = "SPI2MOSI"; + }; + + pinctrl_timer3_default: timer3_default { + function = "TIMER3"; + groups = "TIMER3"; + }; + + pinctrl_timer4_default: timer4_default { + function = "TIMER4"; + groups = "TIMER4"; + }; + + pinctrl_timer5_default: timer5_default { + function = "TIMER5"; + groups = "TIMER5"; + }; + + pinctrl_timer6_default: timer6_default { + function = "TIMER6"; + groups = "TIMER6"; + }; + + pinctrl_timer7_default: timer7_default { + function = "TIMER7"; + groups = "TIMER7"; + }; + + pinctrl_timer8_default: timer8_default { + function = "TIMER8"; + groups = "TIMER8"; + }; + + pinctrl_txd1_default: txd1_default { + function = "TXD1"; + groups = "TXD1"; + }; + + pinctrl_txd2_default: txd2_default { + function = "TXD2"; + groups = "TXD2"; + }; + + pinctrl_txd3_default: txd3_default { + function = "TXD3"; + groups = "TXD3"; + }; + + pinctrl_txd4_default: txd4_default { + function = "TXD4"; + groups = "TXD4"; + }; + + pinctrl_uart6_default: uart6_default { + function = "UART6"; + groups = "UART6"; + }; + + pinctrl_usbcki_default: usbcki_default { + function = "USBCKI"; + groups = "USBCKI"; + }; + + pinctrl_usb2ah_default: usb2ah_default { + function = "USB2AH"; + groups = "USB2AH"; + }; + + pinctrl_usb11bhid_default: usb11bhid_default { + function = "USB11BHID"; + groups = "USB11BHID"; + }; + + pinctrl_usb2bh_default: usb2bh_default { + function = "USB2BH"; + groups = "USB2BH"; + }; + + pinctrl_vgabiosrom_default: vgabiosrom_default { + function = "VGABIOSROM"; + groups = "VGABIOSROM"; + }; + + pinctrl_vgahs_default: vgahs_default { + function = "VGAHS"; + groups = "VGAHS"; + }; + + pinctrl_vgavs_default: vgavs_default { + function = "VGAVS"; + groups = "VGAVS"; + }; + + pinctrl_vpi24_default: vpi24_default { + function = "VPI24"; + groups = "VPI24"; + }; + + pinctrl_vpo_default: vpo_default { + function = "VPO"; + groups = "VPO"; + }; + + pinctrl_wdtrst1_default: wdtrst1_default { + function = "WDTRST1"; + groups = "WDTRST1"; + }; + + pinctrl_wdtrst2_default: wdtrst2_default { + function = "WDTRST2"; + groups = "WDTRST2"; + }; + + pinctrl_pcie0rc_default: pcie0rc_default { + function = "PCIE0RC"; + groups = "PCIE0RC"; + }; + + pinctrl_pcie1rc_default: pcie1rc_default { + function = "PCIE1RC"; + groups = "PCIE1RC"; + }; +}; --2.17.1
Ryan Chen
maintainerPATCH 6/7 aspeed: Add AST2600 platform support
In reply to Chia-WeiQuoted 8 lines
-----Original Message-----
From: ChiaWei Wang <[email protected]>
Sent: Monday, December 14, 2020 1:54 PM
To: trini at konsulko.com; u-boot at lists.denx.de; Ryan Chen <[email protected]>
Cc: BMC-SW <[email protected]>
Subject: [PATCH 6/7] aspeed: Add AST2600 platform support
Quoted 8 lines
Add low level platform initialization for the AST2600 SoC.
The 2-stage booting with U-Boot SPL are leveraged to support different booting mode.However, currently the patch supports only the booting from memory-mapped SPI flash.
Signed-off-by Chia-Wei, Wang <[email protected]>
Quoted 654 lines
--- arch/arm/include/asm/arch-aspeed/boot0.h | 23 ++ arch/arm/include/asm/arch-aspeed/platform.h | 5 + arch/arm/mach-aspeed/Kconfig | 20 ++ arch/arm/mach-aspeed/Makefile | 1 + arch/arm/mach-aspeed/ast2600/Kconfig | 17 ++ arch/arm/mach-aspeed/ast2600/Makefile | 2 + arch/arm/mach-aspeed/ast2600/board_common.c | 105 +++++++++ arch/arm/mach-aspeed/ast2600/lowlevel_init.S | 233 +++++++++++++++++++ arch/arm/mach-aspeed/ast2600/spl.c | 55 +++++ board/aspeed/evb_ast2600/Kconfig | 12 + board/aspeed/evb_ast2600/Makefile | 1 + board/aspeed/evb_ast2600/evb_ast2600.c | 5 + drivers/sysreset/sysreset_ast.c | 5 + include/configs/evb_ast2600.h | 16 ++ 14 files changed, 500 insertions(+) create mode 100644 arch/arm/include/asm/arch-aspeed/boot0.h create mode 100644 arch/arm/mach-aspeed/ast2600/Kconfig create mode 100644 arch/arm/mach-aspeed/ast2600/Makefile create mode 100644 arch/arm/mach-aspeed/ast2600/board_common.c create mode 100644 arch/arm/mach-aspeed/ast2600/lowlevel_init.S create mode 100644 arch/arm/mach-aspeed/ast2600/spl.c create mode 100644 board/aspeed/evb_ast2600/Kconfig create mode 100644 board/aspeed/evb_ast2600/Makefile create mode 100644 board/aspeed/evb_ast2600/evb_ast2600.c create mode 100644 include/configs/evb_ast2600.harch/arm/include/asm/arch-aspeed/boot0.h new file +23
-0@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) Aspeed Technology Inc. +*/ + +#ifndef _ASM_ARCH_BOOT0_H +#define _ASM_ARCH_BOOT0_H + +_start: +ARM_VECTORS + + .word 0x0 /* key location */ + .word 0x0 /* start address of image */ + .word 0xfc00 /* maximum image size: 63KB */ + .word 0x0 /* signature address */ + .word 0x0 /* header revision ID low */ + .word 0x0 /* header revision ID high */ + .word 0x0 /* reserved */ + .word 0x0 /* checksum */ + .word 0x0 /* BL2 secure header */ + .word 0x0 /* public key or digest offset for BL2 */ + +#endifarch/arm/include/asm/arch-aspeed/platform.h +5
-0@@ -13,6 +13,11 @@#define ASPEED_DRAM_BASE 0x80000000#define ASPEED_SRAM_BASE 0x1e720000#define ASPEED_SRAM_SIZE 0x9000 +#elif defined(CONFIG_ASPEED_AST2600 ) +#define ASPEED_MAC_COUNT 4 +#define ASPEED_DRAM_BASE 0x80000000 +#define ASPEED_SRAM_BASE 0x10000000 +#define ASPEED_SRAM_SIZE 0x10000#else #err "Unrecognized Aspeed platform."#endif arch/arm/mach-aspeed/Kconfig +20
-0@@ -9,6 +9,11 @@ config SYS_SOC config SYS_TEXT_BASE default 0x00000000 +choice + prompt "Aspeed SoC select" + depends on ARCH_ASPEED + default ASPEED_AST2500 + config ASPEED_AST2500 bool "Support Aspeed AST2500 SoC" depends on DM_RESET@@ -18,6 +23,21 @@ config ASPEED_AST2500 It is used as Board Management Controller on many server boards, which is enabled by support of LPC and eSPI peripherals. +config ASPEED_AST2600 + bool "Support Aspeed AST2600 SoC" + select CPU_V7A + select CPU_V7_HAS_NONSEC + select SYS_ARCH_TIMER + select SUPPORT_SPL + select ENABLE_ARM_SOC_BOOT0_HOOK + help + The Aspeed AST2600 is a ARM-based SoC with Cortex-A7 CPU. + It is used as Board Management Controller on many server boards, + which is enabled by support of LPC and eSPI peripherals. + +endchoice + source "arch/arm/mach-aspeed/ast2500/Kconfig" +source "arch/arm/mach-aspeed/ast2600/Kconfig" endif(quoted diff) +0
-0b/arch/arm/mach-aspeed/Makefile index
33f65b50b2..42599c125b100644arch/arm/mach-aspeed/Makefile +1
-0@@ -4,3 +4,4 @@ obj-$(CONFIG_ARCH_ASPEED) += ast_wdt.o obj-$(CONFIG_ASPEED_AST2500) += ast2500/ +obj-$(CONFIG_ASPEED_AST2600) += ast2600/arch/arm/mach-aspeed/ast2600/Kconfig new file +17
-0@@ -0,0 +1,17 @@ +if ASPEED_AST2600 + +config SYS_CPU + default "armv7" + +config TARGET_EVB_AST2600 + bool "EVB-AST2600" + depends on ASPEED_AST2600 + help + EVB-AST2600 is Aspeed evaluation board for AST2600A0 chip. + It has 512M of RAM, 32M of SPI flash, two Ethernet ports, + 4 Serial ports, 4 USB ports, VGA port, PCIe, SD card slot, + 20 pin JTAG, pinouts for 14 I2Cs, 3 SPIs and eSPI, 8 PWMs. + +source "board/aspeed/evb_ast2600/Kconfig" + +endifarch/arm/mach-aspeed/ast2600/Makefile new file +2
-0@@ -0,0 +1,2 @@ +obj-y += lowlevel_init.o board_common.o +obj-$(CONFIG_SPL_BUILD) += spl.oarch/arm/mach-aspeed/ast2600/board_common.c new file +90
-0@@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) Aspeed Technology Inc. +*/ +#include <common.h> +#include <dm.h> +#include <ram.h> +#include <timer.h> +#include <asm/io.h> +#include <asm/arch/timer.h> +#include <linux/bitops.h> +#include <linux/err.h> +#include <dm/uclass.h> +#include <asm/arch/scu_ast2600.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* Memory Control registers */ +#define MCR_BASE 0x1e6e0000 +#define MCR_CONF (MCR_BASE + 0x004) + +/* bit fields of MCR_CONF */ +#define MCR_CONF_ECC_EN BIT(7) +#define MCR_CONF_VGA_MEMSZ_MASK GENMASK(3, 2) +#define MCR_CONF_VGA_MEMSZ_SHIFT 2 +#define MCR_CONF_MEMSZ_MASK GENMASK(1, 0) +#define MCR_CONF_MEMSZ_SHIFT 0 + +int dram_init (void ) +{ +int ret; +struct udevice *dev; +struct ram_info ram; + + ret =uclass_get_device (UCLASS_RAM ,0 , &dev); +if (ret) { +debug ("cannot get DRAM driver\n" ); +return ret; + } + + ret =ram_get_info (dev, &ram); +if (ret) { +debug ("cannot get DRAM information\n" ); +return ret; + } + + gd->ram_size = ram.size; +return 0 ; +} + +int board_init (void ) +{ +int i =0 , rc; +struct udevice *dev; + + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ; + +while (1 ) { + rc =uclass_get_device (UCLASS_MISC , i++, &dev); +if (rc) +break ; + } + +return 0 ; +} + +void board_add_ram_info (int use_default) { +int rc; +uint32_t conf; +uint32_t ecc, act_size, vga_rsvd; +struct udevice *scu_dev; +struct ast2600_scu *scu; + + rc =uclass_get_device_by_driver (UCLASS_CLK , +DM_GET_DRIVER (aspeed_ast2600_scu), &scu_dev); +if (rc) { +debug ("%s: cannot find SCU device, rc=%d\n" , __func__, rc); +return ; + } + + scu =devfdt_get_addr_ptr (scu_dev); +if (IS_ERR_OR_NULL (scu)) { +debug ("%s: cannot get SCU address pointer\n" , __func__); +return ; + } + + conf =readl (MCR_CONF ); + + ecc = conf &MCR_CONF_ECC_EN ; + act_size = 0x100 << ((conf & MCR_CONF_MEMSZ_MASK) >>
MCR_CONF_MEMSZ_SHIFT);arch/arm/mach-aspeed/ast2600/board_common.c new file +14
-0+ vga_rsvd =0x8 << ((conf &MCR_CONF_VGA_MEMSZ_MASK ) >> +MCR_CONF_VGA_MEMSZ_SHIFT ); + +/* no VGA reservation if efuse VGA disable bit is set */ +if (readl (scu->efuse) &SCU_EFUSE_DIS_VGA ) + vga_rsvd =0 ; + +printf (" (capacity:%d MiB, VGA:%d MiB), ECC %s" , act_size, + vga_rsvd, (ecc) ?"on" :"off" ); } + +void enable_caches (void ) +{ +/* get rid of the warning message */ +}arch/arm/mach-aspeed/ast2600/lowlevel_init.S new file +232
-0@@ -0,0 +1,233 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) ASPEED Technology Inc. + */ +#include <config.h> +#include <asm/armv7.h> +#include <linux/linkage.h> +#include <asm/arch/scu_ast2600.h> + +/* SCU register offsets */ +#define SCU_BASE 0x1e6e2000 +#define SCU_PROT_KEY1 (SCU_BASE + 0x000) +#define SCU_PROT_KEY2 (SCU_BASE + 0x010) +#define SCU_SMP_BOOT (SCU_BASE + 0x180) +#define SCU_HWSTRAP1 (SCU_BASE + 0x510) +#define SCU_CA7_PARITY_CHK (SCU_BASE + 0x820) +#define SCU_CA7_PARITY_CLR (SCU_BASE + 0x824) +#define SCU_MMIO_DEC (SCU_BASE + 0xc24) + +/* FMC SPI register offsets */ +#define FMC_BASE 0x1e620000 +#define FMC_CE0_CTRL (FMC_BASE + 0x010) +#define FMC_SW_RST_CTRL (FMC_BASE + 0x050) +#define FMC_WDT1_CTRL_MODE (FMC_BASE + 0x060) +#define FMC_WDT2_CTRL_MODE (FMC_BASE + 0x064) + +/* + * The SMP mailbox provides a space with few instructions in it + * for secondary cores to execute on and wait for the signal of + * SMP core bring up. + * + * SMP mailbox + * +----------------------+ + * | | + * | mailbox insn. for | + * | cpuN polling SMP go | + * | | + * +----------------------+ 0xC + * | mailbox ready signal | + * +----------------------+ 0x8 + * | cpuN GO signal | + * +----------------------+ 0x4 + * | cpuN entrypoint | + * +----------------------+ SMP_MAILBOX_BASE */ +#define SMP_MBOX_BASE (SCU_SMP_BOOT) +#define SMP_MBOX_FIELD_ENTRY (SMP_MBOX_BASE + 0x0) +#define SMP_MBOX_FIELD_GOSIGN (SMP_MBOX_BASE + 0x4) +#define SMP_MBOX_FIELD_READY (SMP_MBOX_BASE + 0x8) +#define SMP_MBOX_FIELD_POLLINSN (SMP_MBOX_BASE + 0xc) + +.macro scu_unlock + movw r0, #(SCU_UNLOCK_KEY & 0xffff) + movt r0, #(SCU_UNLOCK_KEY >> 16) + + ldr r1, =SCU_PROT_KEY1 + str r0, [r1] + ldr r1, =SCU_PROT_KEY2 + str r0, [r1] +.endm + +.macro timer_init + ldr r1, =SCU_HWSTRAP1 + ldr r1, [r1] + and r1, #0x700 + lsr r1, #0x8 + + /* 1.2GHz */ + cmp r1, #0x0 + movweq r0, #0x8c00 + movteq r0, #0x4786 + + /* 1.6GHz */ + cmp r1, #0x1 + movweq r0, #0x1000 + movteq r0, #0x5f5e + + /* 1.2GHz */ + cmp r1, #0x2 + movweq r0, #0x8c00 + movteq r0, #0x4786 + + /* 1.6GHz */ + cmp r1, #0x3 + movweq r0, #0x1000 + movteq r0, #0x5f5e + + /* 800MHz */ + cmp r1, #0x4 + movwge r0, #0x0800 + movtge r0, #0x2faf + + mcr p15, 0, r0, c14, c0, 0 @; update CNTFRQ +.endm + + +.globl lowlevel_init + +lowlevel_init: +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) + mov pc, lr +#else + /* setup ARM arch timer frequency */ + timer_init + + /* reset SMP mailbox as early as possible */ + mov r0, #0x0 + ldr r1, =SMP_MBOX_FIELD_READY + str r0, [r1] + + /* set ACTLR.SMP to enable cache use */ + mrc p15, 0, r0, c1, c0, 1 + orr r0, #0x40 + mcr p15, 0, r0, c1, c0, 1 + + /* + * we treat cpu0 as the primary core and + * put secondary core (cpuN) to sleep + */ + mrc p15, 0, r0, c0, c0, 5 @; Read CPU ID register + ands r0, #0xff @; Mask off, leaving the CPU ID field + movw r2, #0xab00 + movt r2, #0xabba + orr r2, r0 + + beq do_primary_core_setup + + /* hold cpuN until mailbox is ready */ +poll_mailbox_ready: + wfe + ldr r0, =SMP_MBOX_FIELD_READY + ldr r0, [r0] + movw r1, #0xcafe + movt r1, #0xbabe + cmp r1, r0 + bne poll_mailbox_ready + + /* parameters for relocated SMP go polling insn. */ + ldr r0, =SMP_MBOX_FIELD_GOSIGN + ldr r1, =SMP_MBOX_FIELD_ENTRY + + /* no return */ + ldr pc, =SMP_MBOX_FIELD_POLLINSN + +do_primary_core_setup: + scu_unlock + + /* MMIO decode setting */ + ldr r0, =SCU_MMIO_DEC + mov r1, #0x2000 + str r1, [r0] + + /* enable CA7 cache parity check */ + mov r0, #0 + ldr r1, =SCU_CA7_PARITY_CLR + str r0, [r1] + + mov r0, #0x1 + ldr r1, =SCU_CA7_PARITY_CHK + str r0, [r1] + + /* do not fill FMC50[1] if boot from eMMC */ + ldr r0, =SCU_HWSTRAP1 + ldr r1, [r0] + ands r1, #0x04 + bne skip_fill_wip_bit + + /* fill FMC50[1] for waiting WIP idle */ + mov r0, #0x02 + ldr r1, =FMC_SW_RST_CTRL + str r0, [r1] + +skip_fill_wip_bit: + /* disable FMC WDT for SPI address mode detection */ + mov r0, #0 + ldr r1, =FMC_WDT1_CTRL_MODE + str r0, [r1] + + /* relocate mailbox insn. for cpuN polling SMP go signal */ + adrl r0, mailbox_insn + adrl r1, mailbox_insn_end + + ldr r2, =#SMP_MBOX_FIELD_POLLINSN + +relocate_mailbox_insn: + ldr r3, [r0], #0x4 + str r3, [r2], #0x4 + cmp r0, r1 + bne relocate_mailbox_insn + + /* reset SMP go sign */ + mov r0, #0 + ldr r1, =SMP_MBOX_FIELD_GOSIGN + str r0, [r1] + + /* notify cpuN mailbox is ready */ + movw r0, #0xCAFE + movt r0, #0xBABE + ldr r1, =SMP_MBOX_FIELD_READY + str r0, [r1] + sev + + /* back to arch calling code */ + mov pc, lr + +/* + * insn. inside mailbox to poll SMP go signal. + * + * Note that as this code will be relocated, any + * pc-relative assembly should NOT be used. + */ +mailbox_insn: + /* + * r0 ~ r3 are parameters: + * r0 = SMP_MBOX_FIELD_GOSIGN + * r1 = SMP_MBOX_FIELD_ENTRY + * r2 = per-cpu go sign value + * r3 = no used now + */ +poll_mailbox_smp_go: + wfe + ldr r4, [r0] + cmp r2, r4 + bne poll_mailbox_smp_go + + /* SMP GO signal confirmed, release cpuN */ + ldr pc, [r1] + +mailbox_insn_end: + /* should never reach */ + b . + +#endifarch/arm/mach-aspeed/ast2600/spl.c new file +52
-0@@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) Aspeed Technology Inc. +*/ +#include <common.h> +#include <debug_uart.h> +#include <dm.h> +#include <spl.h> +#include <init.h> +#include <asm/io.h> +#include <asm/arch/scu_ast2600.h> + +DECLARE_GLOBAL_DATA_PTR ; + +void board_init_f (ulong dummy) +{ +spl_early_init (); +preloader_console_init (); +timer_init (); +dram_init (); +} + +u32 spl_boot_device (void ) +{ +return BOOT_DEVICE_RAM ; +} + +struct image_header *spl_get_load_buffer (ssize_t offset,size_t size) { +/* +* When boot from SPI, AST2600 already remap 0x00000000 ~ 0x0fffffff +* to BMC SPI memory space 0x20000000 ~ 0x2fffffff. The next stage BL +* has been located in SPI for XIP. In this case, the load buffer for +* SPL image loading will be set to the remapped address of the next +* BL instead of the DRAM space CONFIG_SYS_LOAD_ADDR +*/ +return (struct image_header *)(CONFIG_SYS_TEXT_BASE ); } + +#ifdef CONFIG_SPL_OS_BOOT +int spl_start_uboot (void ) +{ +/* boot linux */ +return 0 ; +} +#endif + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match (const char *name) { +/* just empty function now - can't decide what to choose */ +debug ("%s: %s\n" , __func__, name); +return 0 ; +} +#endif board/aspeed/evb_ast2600/Kconfig new file +12
-0@@ -0,0 +1,12 @@ +if TARGET_EVB_AST2600 + +config SYS_BOARD + default "evb_ast2600" + +config SYS_VENDOR + default "aspeed" + +config SYS_CONFIG_NAME + default "evb_ast2600" + +endifboard/aspeed/evb_ast2600/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-y += evb_ast2600.oboard/aspeed/evb_ast2600/evb_ast2600.c new file +5
-0@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) Aspeed Technology Inc. +*/ +#include <common.h> drivers/sysreset/sysreset_ast.c +1
-0@@ -12,6 +12,7 @@#include <asm/io.h> #include <asm/arch/wdt.h> #include <linux/err.h> +#include <hang.h> static int ast_sysreset_request (struct udevice *dev,enum sysreset_t type) { @@ -33,11 +34,15 @@ static int ast_sysreset_request(struct udevice *dev,enum
sysreset_ttype)drivers/sysreset/sysreset_ast.c +4
-0return -EPROTONOSUPPORT ; } +#if !defined(CONFIG_SPL_BUILD ) ret =wdt_expire_now (wdt, reset_mode);if (ret) {debug ("Sysreset failed: %d" , ret);return ret; } +#else +hang (); +#endif return -EINPROGRESS ; }include/configs/evb_ast2600.h new file +16
-1@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) Aspeed Technology Inc. +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/aspeed-common.h> + +#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE + +/* Memory Info */ +#define CONFIG_SYS_LOAD_ADDR 0x83000000 + +#endif /* __CONFIG_H */ --2.17.1
Ryan Chen
maintainerPATCH 7/7 configs: aspeed: Add defconfig for AST2600 EVB
In reply to Chia-WeiQuoted 11 lines
-----Original Message-----
From: ChiaWei Wang <[email protected]>
Sent: Monday, December 14, 2020 1:54 PM
To: trini at konsulko.com; u-boot at lists.denx.de; Ryan Chen <[email protected]>
Cc: BMC-SW <[email protected]>
Subject: [PATCH 7/7] configs: aspeed: Add defconfig for AST2600 EVBAdd the default configuration for the AST2600 EVB.
Signed-off-by Chia-Wei, Wang <[email protected]>
Quoted 58 lines
--- configs/evb-ast2600_defconfig | 69 +++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 configs/evb-ast2600_defconfigconfigs/evb-ast2600_defconfig new file +27
-0@@ -0,0 +1,69 @@ +CONFIG_ARM=y +CONFIG_SYS_DCACHE_OFF=y +CONFIG_ARCH_ASPEED=y +CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_ASPEED_AST2600=y +CONFIG_TARGET_EVB_AST2600=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x800 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x10000 +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_SIZE_LIMIT=0x10000 +CONFIG_SPL=y +# CONFIG_ARMV7_NONSEC is not set +CONFIG_DEFAULT_DEVICE_TREE="ast2600-evb" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y # +CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="bootm 20100000" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y +CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_DM_RESET=y +CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y
CONFIG_HUSH_PARSER=y
+CONFIG_CMD_I2C=yCONFIG_CMD_MMC=yCONFIG_CMD_DHCP=yCONFIG_CMD_MII=y
+CONFIG_CMD_PING=yCONFIG_SPL_OF_CONTROL=yCONFIG_ENV_OVERWRITE=yconfigs/evb-ast2600_defconfig new file +3
-0+CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_REGMAP=y +CONFIG_SPL_OF_TRANSLATE=y CONFIG_CLK=y CONFIG_SPL_CLK=y
CONFIG_DM_I2C=y
+CONFIG_MISC=yCONFIG_SPL_MISC=yCONFIG_DM_MMC=yCONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ASPEED=yCONFIG_PHY_REALTEK=yCONFIG_DM_ETH=yconfigs/evb-ast2600_defconfig new file +5
-1+CONFIG_FTGMAC100=y CONFIG_PHY=y CONFIG_PINCTRL=y CONFIG_RAM=y +CONFIG_SPL_RAM=y CONFIG_DM_RESET=y CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y +CONFIG_WDT=y CONFIG_HEXDUMP=y # CONFIG_SPL_HEXDUMP is not set # +CONFIG_EFI_LOADER is not set --2.17.1
PATCH 1/7 clk: aspeed: Add AST2600 clock support
In reply to Chia-WeiQuoted 7 lines · Wang
From: Ryan Chen <[email protected]>
This patch adds the clock control driver
for the AST2600 SoC.Signed-off-by Ryan Chen <[email protected]>Signed-off-by Chia-Wei, Wang <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/40a02595/attachment.sig>
PATCH 2/7 ram: aspeed: Add AST2600 DRAM control support
In reply to Chia-WeiQuoted 9 lines · Wang
From: Dylan Hung <[email protected]>
AST2600 supports DDR4 SDRAM with maximum speed DDR4-1600. The DDR4 DRAM types including 128MbX16 (2Gb), 256MbX16 (4Gb), 512MbX16 (8Gb), 1GbX16 (16Gb), and 1GbX8 TwinDie (16Gb) are supported.
Signed-off-by Dylan Hung <[email protected]>Signed-off-by Chia-Wei, Wang <[email protected]>Reviewed-by Ryan Chen <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/e2664d7f/attachment.sig>
PATCH 3/7 wdt: aspeed: Add AST2600 watchdog support
In reply to Chia-WeiQuoted 8 lines · Wang
AST2600 has 8 watchdog timers including 8 sets of 32-bit decrement counters, based on 1MHz clock.
A 64-bit reset mask is also supported to specify which controllers should be reset by the WDT reset.
Signed-off-by Chia-Wei, Wang <[email protected]>Reviewed-by Ryan Chen <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/dd66330f/attachment.sig>
PATCH 4/7 reset: aspeed: Add AST2600 reset support
In reply to Chia-WeiQuoted 5 lines · Wang
Add controller reset support through the
System Control Unit (SCU) of AST2600 SoC.Signed-off-by Chia-Wei, Wang <[email protected]>Reviewed-by Ryan Chen <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/2c89488d/attachment.sig>
PATCH 5/7 ARM: dts: aspeed: Add AST2600 SoC support
In reply to Chia-WeiQuoted 10 lines · Wang
AST2600 is the 7th generation of Aspeed SoC designated for Interated Remote Management Processor.
AST2600 has significant performance improvement by integrating 1.2GHz dual-core ARM Cortex A7 (r0p5) CPU with FPU. Most of the controllers are also improved with more features and better performance than preceding AST24xx/AST25xx.
Signed-off-by Chia-Wei, Wang <[email protected]>Reviewed-by Ryan Chen <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/920ce5d7/attachment.sig>
PATCH 6/7 aspeed: Add AST2600 platform support
In reply to Chia-WeiQuoted 9 lines · Wang
Add low level platform initialization for the AST2600 SoC. The 2-stage booting with U-Boot SPL are leveraged to support different booting mode.
However, currently the patch supports only the booting from memory-mapped SPI flash.
Signed-off-by Chia-Wei, Wang <[email protected]>Reviewed-by Ryan Chen <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/2dec889b/attachment.sig>
PATCH 7/7 configs: aspeed: Add defconfig for AST2600 EVB
In reply to Chia-WeiQuoted 4 lines · Wang
Add the default configuration for the AST2600 EVB.
Signed-off-by Chia-Wei, Wang <[email protected]>Reviewed-by Ryan Chen <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/94a6c5cb/attachment.sig>