diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-01-16 16:13:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-23 11:59:56 +0100 |
| commit | 51eea52d26d4939b788b7244c28cf47e902b4c4c (patch) | |
| tree | 9eda241338419c926a471db7acbadf6913049896 /arch/arm/mach-pxa/em-x270.c | |
| parent | spi: bcm2835aux: remove unneeded NULL check of devm_clk_get (diff) | |
| download | linux-51eea52d26d4939b788b7244c28cf47e902b4c4c.tar.xz linux-51eea52d26d4939b788b7244c28cf47e902b4c4c.zip | |
pxa2xx: replace spi_master with spi_controller
It's also a slave controller driver now, calling it "master" is slightly
misleading.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 32c1edeb3f14..5e372760f16e 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c @@ -689,7 +689,7 @@ static inline void em_x270_init_lcd(void) {} #endif #if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE) -static struct pxa2xx_spi_master em_x270_spi_info = { +static struct pxa2xx_spi_controller em_x270_spi_info = { .num_chipselect = 1, }; @@ -703,7 +703,7 @@ static struct tdo24m_platform_data em_x270_tdo24m_pdata = { .model = TDO35S, }; -static struct pxa2xx_spi_master em_x270_spi_2_info = { +static struct pxa2xx_spi_controller em_x270_spi_2_info = { .num_chipselect = 1, .enable_dma = 1, }; |