diff options
| author | Tom Rini | 2020-10-16 09:56:15 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-10-16 09:56:15 -0400 |
| commit | dadc1e38306b1c3e7465bacefeb309ec1f9db6a0 (patch) | |
| tree | 52bbeabcfe9f215574949b1e600c896f52e22573 /drivers/spi | |
| parent | da09b99ea572cec9a114872e480b798db11f9c6e (diff) | |
| parent | b666714c30c6d6501fbb91d1774065a204a88b8e (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Fix Octeon SPI driver for Octeon TX2
- Fix and enhance Octeon watchdog driver
- Misc minor enhancements to Octeon TX/TX2
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/octeon_spi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c index 83fe6330a12..7e88e5580f7 100644 --- a/drivers/spi/octeon_spi.c +++ b/drivers/spi/octeon_spi.c @@ -519,7 +519,10 @@ static int octeon_spi_set_speed(struct udevice *bus, uint max_hz) if (max_hz > OCTEON_SPI_MAX_CLOCK_HZ) max_hz = OCTEON_SPI_MAX_CLOCK_HZ; - clk_rate = clk_get_rate(&priv->clk); + if (device_is_compatible(bus, "cavium,thunderx-spi")) + clk_rate = 100000000; + else + clk_rate = clk_get_rate(&priv->clk); if (IS_ERR_VALUE(clk_rate)) return -EINVAL; |