diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
| commit | 14e04d019b70cb8711b005bc316ac6a52d61db39 (patch) | |
| tree | 0ea694070006e8de3ab372a67cf7c51b6ce9b259 /drivers/mfd | |
| parent | 6a86c6d40468a04c94b859b8b497e6dcff6dcc83 (diff) | |
| parent | 74102fdf730b89cbc6dd0fe34c0d9b5f86ed7d8c (diff) | |
| download | barebox-14e04d019b70cb8711b005bc316ac6a52d61db39.tar.gz barebox-14e04d019b70cb8711b005bc316ac6a52d61db39.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/mc13xxx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c index 68d70c53d5..b2fcd95516 100644 --- a/drivers/mfd/mc13xxx.c +++ b/drivers/mfd/mc13xxx.c @@ -330,7 +330,8 @@ static int __init mc13xxx_probe(struct device_d *dev) mc_dev->spi = dev->type_data; mc_dev->spi->mode = SPI_MODE_0 | SPI_CS_HIGH; mc_dev->spi->bits_per_word = 32; - mc_dev->spi->max_speed_hz = 20000000; + mc_dev->spi->max_speed_hz = mc_dev->spi->max_speed_hz ? + mc_dev->spi->max_speed_hz : 20000000; mc_dev->map = regmap_init(dev, ®map_mc13xxx_spi_bus, mc_dev, &mc13xxx_regmap_spi_config); } |