public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spi: clps711x: Convert to use master->max_speed_hz

Browse source 
Set highest transfer speed to master->max_speed_hz and then we can remove
hw->max_speed.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Axel Lin 2014-03-26 23:44:18 +08:00 • committed by Mark Brown
parent 5634dd8bf4
commit 6f50c6bc61
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/spi/spi-clps711x.c
View file

@ -33,7 +33,6 @@ struct spi_clps711x_data {
struct regmap *syscon; struct regmap *syscon;
struct regmap *syscon1; struct regmap *syscon1;
struct clk *spi_clk; struct clk *spi_clk;
u32 max_speed_hz;
u8 *tx_buf; u8 *tx_buf;
u8 *rx_buf; u8 *rx_buf;
@ -52,16 +51,17 @@ static int spi_clps711x_setup(struct spi_device *spi)
static void spi_clps711x_setup_xfer(struct spi_device *spi, static void spi_clps711x_setup_xfer(struct spi_device *spi,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct spi_clps711x_data *hw = spi_master_get_devdata(spi->master); struct spi_master *master = spi->master;
struct spi_clps711x_data *hw = spi_master_get_devdata(master);
/* Setup SPI frequency divider */ /* Setup SPI frequency divider */
if (!xfer->speed_hz || (xfer->speed_hz >= hw->max_speed_hz)) if (xfer->speed_hz >= master->max_speed_hz)
regmap_update_bits(hw->syscon1, SYSCON_OFFSET, regmap_update_bits(hw->syscon1, SYSCON_OFFSET,
SYSCON1_ADCKSEL_MASK, SYSCON1_ADCKSEL(3)); SYSCON1_ADCKSEL_MASK, SYSCON1_ADCKSEL(3));
else if (xfer->speed_hz >= (hw->max_speed_hz / 2)) else if (xfer->speed_hz >= (master->max_speed_hz / 2))
regmap_update_bits(hw->syscon1, SYSCON_OFFSET, regmap_update_bits(hw->syscon1, SYSCON_OFFSET,
SYSCON1_ADCKSEL_MASK, SYSCON1_ADCKSEL(2)); SYSCON1_ADCKSEL_MASK, SYSCON1_ADCKSEL(2));
else if (xfer->speed_hz >= (hw->max_speed_hz / 8)) else if (xfer->speed_hz >= (master->max_speed_hz / 8))
regmap_update_bits(hw->syscon1, SYSCON_OFFSET, regmap_update_bits(hw->syscon1, SYSCON_OFFSET,
SYSCON1_ADCKSEL_MASK, SYSCON1_ADCKSEL(1)); SYSCON1_ADCKSEL_MASK, SYSCON1_ADCKSEL(1));
else else
@ -183,7 +183,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
ret = PTR_ERR(hw->spi_clk); ret = PTR_ERR(hw->spi_clk);
goto err_out; goto err_out;
} }
hw->max_speed_hz = clk_get_rate(hw->spi_clk); master->max_speed_hz = clk_get_rate(hw->spi_clk);
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, master);
@ -221,7 +221,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
if (!ret) { if (!ret) {
dev_info(&pdev->dev, dev_info(&pdev->dev,
"SPI bus driver initialized. Master clock %u Hz\n", "SPI bus driver initialized. Master clock %u Hz\n",
hw->max_speed_hz); master->max_speed_hz);
return 0; return 0;
} }