diff options
| -rw-r--r-- | board/starfive/devkits/spl.c | 11 | ||||
| -rw-r--r-- | board/starfive/devkits/starfive_devkits.c | 16 | ||||
| -rw-r--r-- | configs/starfive_devkits_defconfig | 1 | ||||
| -rw-r--r-- | drivers/mtd/spi/spi-nor-ids.c | 1 |
4 files changed, 29 insertions, 0 deletions
diff --git a/board/starfive/devkits/spl.c b/board/starfive/devkits/spl.c index d20c74b3a5..0e31c14fd8 100644 --- a/board/starfive/devkits/spl.c +++ b/board/starfive/devkits/spl.c @@ -112,6 +112,17 @@ void board_init_f(ulong dummy) clrsetbits_le32(SYS_IOMUX_BASE + 0x274, 0x3, BIT(0) & 0x3); clrsetbits_le32(SYS_IOMUX_BASE + 0x278, 0x3, BIT(0) & 0x3); clrsetbits_le32(SYS_IOMUX_BASE + 0x27c, 0x3, BIT(0) & 0x3); + /*jtag*/ + SYS_IOMUX_DOEN(36, HIGH); + SYS_IOMUX_DIN(36, 4); + SYS_IOMUX_DOEN(61, HIGH); + SYS_IOMUX_DIN(61, 19); + SYS_IOMUX_DOEN(63, HIGH); + SYS_IOMUX_DIN(63, 20); + SYS_IOMUX_DOEN(60, HIGH); + SYS_IOMUX_DIN(60, 29); + SYS_IOMUX_DOEN(44, 8); + SYS_IOMUX_DOUT(44, 22); SYS_IOMUX_DOEN(62, LOW); SYS_IOMUX_DOUT(62, 19); diff --git a/board/starfive/devkits/starfive_devkits.c b/board/starfive/devkits/starfive_devkits.c index 1362f75d7d..58b5b227c7 100644 --- a/board/starfive/devkits/starfive_devkits.c +++ b/board/starfive/devkits/starfive_devkits.c @@ -91,6 +91,21 @@ static void jh7110_i2c_init (int id) } } +static void jh7110_jtag_init(void) +{ + /*jtag*/ + SYS_IOMUX_DOEN(36, HIGH); + SYS_IOMUX_DIN(36, 4); + SYS_IOMUX_DOEN(61, HIGH); + SYS_IOMUX_DIN(61, 19); + SYS_IOMUX_DOEN(63, HIGH); + SYS_IOMUX_DIN(63, 20); + SYS_IOMUX_DOEN(60, HIGH); + SYS_IOMUX_DIN(60, 29); + SYS_IOMUX_DOEN(44, 8); + SYS_IOMUX_DOUT(44, 22); +} + static void jh7110_gmac_sel_tx_to_rgmii(int id) { switch (id) { @@ -320,6 +335,7 @@ int board_init(void) { enable_caches(); + jh7110_jtag_init(); jh7110_timer_init(); jh7110_usb_init(true); jh7110_gmac_init(0); diff --git a/configs/starfive_devkits_defconfig b/configs/starfive_devkits_defconfig index 5105b62263..2ba91e4f75 100644 --- a/configs/starfive_devkits_defconfig +++ b/configs/starfive_devkits_defconfig @@ -103,6 +103,7 @@ CONFIG_SF_DEFAULT_SPEED=100000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_XMC=y CONFIG_PHY_MARVELL=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index 35fa347c44..87646ff925 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -366,6 +366,7 @@ const struct flash_info spi_nor_ids[] = { { INFO("XM25QH64A", 0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("XM25QH64C", 0x204017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("XM25QH128A", 0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("XM25QU128C", 0x204118, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, #endif #ifdef CONFIG_SPI_FLASH_XTX /* XTX Technology (Shenzhen) Limited */ |