summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/magician.c
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-01-16 16:13:31 +0100
committerMark Brown <broonie@kernel.org>2019-01-23 11:59:56 +0100
commit51eea52d26d4939b788b7244c28cf47e902b4c4c (patch)
tree9eda241338419c926a471db7acbadf6913049896 /arch/arm/mach-pxa/magician.c
parentspi: bcm2835aux: remove unneeded NULL check of devm_clk_get (diff)
downloadlinux-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/magician.c')
-rw-r--r--arch/arm/mach-pxa/magician.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 08b079653c3f..618bcff4cdc9 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -932,7 +932,7 @@ struct pxa2xx_spi_chip tsc2046_chip_info = {
.gpio_cs = GPIO14_MAGICIAN_TSC2046_CS,
};
-static struct pxa2xx_spi_master magician_spi_info = {
+static struct pxa2xx_spi_controller magician_spi_info = {
.num_chipselect = 1,
.enable_dma = 1,
};