diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-23 17:24:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-23 17:24:31 -0500 |
| commit | aff66f22d6eeb27c6329c0a3c1ebc52914c8affa (patch) | |
| tree | 1c98306ac2c12c2654bf37e65f19de77faaab28f /arch/mips/mach-mscc/cpu.c | |
| parent | 7794fe2c8c1303d303dbc515955c6c5be706da88 (diff) | |
| parent | a834cb817fb1a11607ea8e6394235843be079fdd (diff) | |
Merge tag 'mips-pull-2019-01-23' of git://git.denx.de/u-boot-mips
- MIPS: mscc: ocelot: add ethernet switch and network support
- MIPS: mscc: add support for ServalT SoC family
- MIPS: mscc: add support for Serval SoC family
Diffstat (limited to 'arch/mips/mach-mscc/cpu.c')
| -rw-r--r-- | arch/mips/mach-mscc/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c index 4729b7aedeb..ac75d51da5f 100644 --- a/arch/mips/mach-mscc/cpu.c +++ b/arch/mips/mach-mscc/cpu.c @@ -87,11 +87,11 @@ int mach_cpu_init(void) ICPU_SPI_MST_CFG_CS_DESELECT_TIME(0x19) + ICPU_SPI_MST_CFG_CLK_DIV(9), BASE_CFG + ICPU_SPI_MST_CFG); #else -#ifdef CONFIG_SOC_OCELOT +#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_SERVAL) writel(ICPU_SPI_MST_CFG_CS_DESELECT_TIME(0x19) + ICPU_SPI_MST_CFG_CLK_DIV(9), BASE_CFG + ICPU_SPI_MST_CFG); #endif -#ifdef CONFIG_SOC_JR2 +#if defined(CONFIG_SOC_JR2) || defined(CONFIG_SOC_SERVALT) writel(ICPU_SPI_MST_CFG_FAST_READ_ENA + ICPU_SPI_MST_CFG_CS_DESELECT_TIME(0x19) + ICPU_SPI_MST_CFG_CLK_DIV(14), BASE_CFG + ICPU_SPI_MST_CFG); |