UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: pxa2xx: Remove cr0 variable from struct chip_data 

There hasn't been need to carry chip->cr0 after SPI core started to
validate speed_hz and bits_per_word transfer parameters. That effectively
caused that pump_transfers() always recalculated it and practically
chip->cr0 is used locally in setup() for debug prints only.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jarkko Nikula 2015-09-15 16:26:28 +03:00 committed by Mark Brown
parent 196b0e2cf2
commit b69d42b5c4
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/spi/spi-pxa2xx.c
View File

@ -1101,6 +1101,7 @@ static int setup(struct spi_device *spi)
struct driver_data *drv_data = spi_master_get_devdata(spi->master); struct driver_data *drv_data = spi_master_get_devdata(spi->master);
unsigned int clk_div; unsigned int clk_div;
uint tx_thres, tx_hi_thres, rx_thres; uint tx_thres, tx_hi_thres, rx_thres;
u32 cr0;
switch (drv_data->ssp_type) { switch (drv_data->ssp_type) {
case QUARK_X1000_SSP: case QUARK_X1000_SSP:
@ -1193,8 +1194,6 @@ static int setup(struct spi_device *spi)
clk_div = pxa2xx_ssp_get_clk_div(drv_data, chip, spi->max_speed_hz); clk_div = pxa2xx_ssp_get_clk_div(drv_data, chip, spi->max_speed_hz);
chip->cr0 = pxa2xx_configure_sscr0(drv_data, clk_div,
spi->bits_per_word);
switch (drv_data->ssp_type) { switch (drv_data->ssp_type) {
case QUARK_X1000_SSP: case QUARK_X1000_SSP:
chip->threshold = (QUARK_X1000_SSCR1_RxTresh(rx_thres) chip->threshold = (QUARK_X1000_SSCR1_RxTresh(rx_thres)
@ -1216,15 +1215,16 @@ static int setup(struct spi_device *spi)
chip->cr1 |= SSCR1_LBM; chip->cr1 |= SSCR1_LBM;
/* NOTE: PXA25x_SSP _could_ use external clocking ... */ /* NOTE: PXA25x_SSP _could_ use external clocking ... */
cr0 = pxa2xx_configure_sscr0(drv_data, clk_div, spi->bits_per_word);
if (!pxa25x_ssp_comp(drv_data)) if (!pxa25x_ssp_comp(drv_data))
dev_dbg(&spi->dev, "%ld Hz actual, %s\n", dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
drv_data->max_clk_rate drv_data->max_clk_rate
/ (1 + ((chip->cr0 & SSCR0_SCR(0xfff)) >> 8)), / (1 + ((cr0 & SSCR0_SCR(0xfff)) >> 8)),
chip->enable_dma ? "DMA" : "PIO"); chip->enable_dma ? "DMA" : "PIO");
else else
dev_dbg(&spi->dev, "%ld Hz actual, %s\n", dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
drv_data->max_clk_rate / 2 drv_data->max_clk_rate / 2
/ (1 + ((chip->cr0 & SSCR0_SCR(0x0ff)) >> 8)), / (1 + ((cr0 & SSCR0_SCR(0x0ff)) >> 8)),
chip->enable_dma ? "DMA" : "PIO"); chip->enable_dma ? "DMA" : "PIO");
if (spi->bits_per_word <= 8) { if (spi->bits_per_word <= 8) {
@ -1236,8 +1236,6 @@ static int setup(struct spi_device *spi)
chip->read = u16_reader; chip->read = u16_reader;
chip->write = u16_writer; chip->write = u16_writer;
} else if (spi->bits_per_word <= 32) { } else if (spi->bits_per_word <= 32) {
if (!is_quark_x1000_ssp(drv_data))
chip->cr0 |= SSCR0_EDSS;
chip->n_bytes = 4; chip->n_bytes = 4;
chip->read = u32_reader; chip->read = u32_reader;
chip->write = u32_writer; chip->write = u32_writer;

1
drivers/spi/spi-pxa2xx.h
View File

@ -86,7 +86,6 @@ struct driver_data {
}; };
struct chip_data { struct chip_data {
u32 cr0;
u32 cr1; u32 cr1;
u32 dds_rate; u32 dds_rate;
u32 psp; u32 psp;