diff options
| author | Linus Walleij <linus.walleij@stericsson.com> | 2011-10-17 12:46:06 +0200 |
|---|---|---|
| committer | Linus WALLEIJ <linus.walleij@stericsson.com> | 2011-10-17 15:16:33 +0200 |
| commit | 7643e6771af6dab78420727f56e3422c60e0aa91 (patch) | |
| tree | e701003eafce797cd11686a6ac7d37df7c14ccd1 /drivers | |
| parent | 0d4c156d97848539a991c78d6364f1c3f8c7a91e (diff) | |
Revert "amba-pl022: Initialize burstsize from FIFO trigger level"
This reverts commit 7e591da7370c8b843a60ad55a0db944abedb094a.
Change-Id: Icb189c8a4f5d3e45d78d0eef6e8f32a6d97a944f
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34205
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/amba-pl022.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index bb2cb43cbbf..d18ce9e946d 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/amba-pl022.c @@ -42,7 +42,6 @@ #include <linux/dmaengine.h> #include <linux/dma-mapping.h> #include <linux/scatterlist.h> -#include <linux/pm_runtime.h> /* * This macro is used to define some register default values. @@ -392,8 +391,6 @@ struct pl022 { struct sg_table sgt_tx; char *dummypage; #endif - enum ssp_rx_level_trig rx_lev_trig; - enum ssp_tx_level_trig tx_lev_trig; }; /** @@ -520,7 +517,6 @@ static void giveback(struct pl022 *pl022) clk_disable(pl022->clk); amba_pclk_disable(pl022->adev); amba_vcore_disable(pl022->adev); - pm_runtime_put(&pl022->adev->dev); } /** @@ -928,12 +924,6 @@ static int configure_dma(struct pl022 *pl022) struct dma_async_tx_descriptor *rxdesc; struct dma_async_tx_descriptor *txdesc; - /* DMA burstsize should be same as the FIFO trigger level */ - rx_conf.src_maxburst = pl022->rx_lev_trig ? 1 << - (pl022->rx_lev_trig + 1) : pl022->rx_lev_trig; - tx_conf.dst_maxburst = pl022->tx_lev_trig ? 1 << - (pl022->tx_lev_trig + 1) : pl022->tx_lev_trig; - /* Check that the channels are available */ if (!rxchan || !txchan) return -ENODEV; @@ -1508,7 +1498,6 @@ static void pump_messages(struct work_struct *work) */ amba_vcore_enable(pl022->adev); amba_pclk_enable(pl022->adev); - pm_runtime_get_sync(&pl022->adev->dev); clk_enable(pl022->clk); restore_state(pl022); flush(pl022); @@ -1885,9 +1874,6 @@ static int pl022_setup(struct spi_device *spi) goto err_config_params; } - pl022->rx_lev_trig = chip_info->rx_lev_trig; - pl022->tx_lev_trig = chip_info->tx_lev_trig; - /* Now set controller state based on controller data */ chip->xfer_type = chip_info->com_mode; if (!chip_info->cs_control) { @@ -2109,9 +2095,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", adev->res.start, pl022->virtbase); - pm_runtime_enable(dev); - pm_runtime_resume(dev); - pl022->clk = clk_get(&adev->dev, NULL); if (IS_ERR(pl022->clk)) { status = PTR_ERR(pl022->clk); @@ -2205,7 +2188,6 @@ pl022_remove(struct amba_device *adev) free_irq(adev->irq[0], pl022); clk_disable(pl022->clk); clk_put(pl022->clk); - pm_runtime_disable(&adev->dev); iounmap(pl022->virtbase); amba_release_regions(adev); tasklet_disable(&pl022->pump_transfers); @@ -2293,14 +2275,6 @@ static struct vendor_data vendor_db5500_pl023 = { .loopback = true, }; -static struct vendor_data vendor_db5500_pl023 = { - .fifodepth = 32, - .max_bpw = 32, - .unidir = false, - .extended_cr = true, - .pl023 = true, -}; - static struct amba_id pl022_ids[] = { { /* |