| From c4e197bbcecc7233aa9e553e7047fa50e4e1fe77 Mon Sep 17 00:00:00 2001 |
| From: John Crispin <john@phrozen.org> |
| Date: Mon, 25 Jun 2018 15:52:34 +0200 |
| Subject: [PATCH 33/33] spi: ath79: drop pdata support |
| |
| The target is being converted to pure OF. We can therefore drop all of the |
| platform data code from the driver. |
| |
| Cc: linux-spi@vger.kernel.org |
| Acked-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: John Crispin <john@phrozen.org> |
| --- |
| include/linux/platform_data/spi-ath79.h | 16 ------------------- |
| drivers/spi/spi-ath79.c | 8 -------- |
| 2 files changed, 27 deletions(-) |
| delete mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h |
| |
| --- a/include/linux/platform_data/spi-ath79.h |
| +++ /dev/null |
| @@ -1,16 +0,0 @@ |
| -/* SPDX-License-Identifier: GPL-2.0-only */ |
| -/* |
| - * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller |
| - * |
| - * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org> |
| - */ |
| - |
| -#ifndef _ATH79_SPI_PLATFORM_H |
| -#define _ATH79_SPI_PLATFORM_H |
| - |
| -struct ath79_spi_platform_data { |
| - unsigned bus_num; |
| - unsigned num_chipselect; |
| -}; |
| - |
| -#endif /* _ATH79_SPI_PLATFORM_H */ |
| --- a/drivers/spi/spi-ath79.c |
| +++ b/drivers/spi/spi-ath79.c |
| @@ -19,7 +19,6 @@ |
| #include <linux/bitops.h> |
| #include <linux/clk.h> |
| #include <linux/err.h> |
| -#include <linux/platform_data/spi-ath79.h> |
| |
| #define DRV_NAME "ath79-spi" |
| |
| @@ -138,7 +137,6 @@ static int ath79_spi_probe(struct platfo |
| { |
| struct spi_master *master; |
| struct ath79_spi *sp; |
| - struct ath79_spi_platform_data *pdata; |
| unsigned long rate; |
| int ret; |
| |
| @@ -152,15 +150,9 @@ static int ath79_spi_probe(struct platfo |
| master->dev.of_node = pdev->dev.of_node; |
| platform_set_drvdata(pdev, sp); |
| |
| - pdata = dev_get_platdata(&pdev->dev); |
| - |
| master->use_gpio_descriptors = true; |
| master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32); |
| master->flags = SPI_MASTER_GPIO_SS; |
| - if (pdata) { |
| - master->bus_num = pdata->bus_num; |
| - master->num_chipselect = pdata->num_chipselect; |
| - } |
| |
| sp->bitbang.master = master; |
| sp->bitbang.chipselect = ath79_spi_chipselect; |