aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-4.14/0033-spi-ath79-drop-pdata-support.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2018-08-22 06:20:13 +0200
committerJohn Crispin <john@phrozen.org>2018-08-28 11:26:53 +0200
commit9300eda00fa91fda22cea56677db5dfa2371ddcb (patch)
tree79782cbbdbbe8ac1780d0766ba43425c5de2c1a3 /target/linux/ath79/patches-4.14/0033-spi-ath79-drop-pdata-support.patch
parentaf6e901ae8449bba62697ef676c651b2e0bfea01 (diff)
downloadupstream-9300eda00fa91fda22cea56677db5dfa2371ddcb.tar.gz
upstream-9300eda00fa91fda22cea56677db5dfa2371ddcb.tar.bz2
upstream-9300eda00fa91fda22cea56677db5dfa2371ddcb.zip
ath79: replace patches
replace our downstream version of the patches with the ones that were sent upstream. Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ath79/patches-4.14/0033-spi-ath79-drop-pdata-support.patch')
-rw-r--r--target/linux/ath79/patches-4.14/0033-spi-ath79-drop-pdata-support.patch73
1 files changed, 73 insertions, 0 deletions
diff --git a/target/linux/ath79/patches-4.14/0033-spi-ath79-drop-pdata-support.patch b/target/linux/ath79/patches-4.14/0033-spi-ath79-drop-pdata-support.patch
new file mode 100644
index 0000000000..aeb50c9b1c
--- /dev/null
+++ b/target/linux/ath79/patches-4.14/0033-spi-ath79-drop-pdata-support.patch
@@ -0,0 +1,73 @@
+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>
+---
+ arch/mips/include/asm/mach-ath79/ath79_spi_platform.h | 19 -------------------
+ 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/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/*
+- * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller
+- *
+- * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+- *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 as published
+- * by the Free Software Foundation.
+- */
+-
+-#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
+@@ -26,7 +26,6 @@
+ #include <linux/err.h>
+
+ #include <asm/mach-ath79/ar71xx_regs.h>
+-#include <asm/mach-ath79/ath79_spi_platform.h>
+
+ #define DRV_NAME "ath79-spi"
+
+@@ -208,7 +207,6 @@ static int ath79_spi_probe(struct platfo
+ {
+ struct spi_master *master;
+ struct ath79_spi *sp;
+- struct ath79_spi_platform_data *pdata;
+ struct resource *r;
+ unsigned long rate;
+ int ret;
+@@ -223,15 +221,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->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
+ master->setup = ath79_spi_setup;
+ master->cleanup = ath79_spi_cleanup;
+- if (pdata) {
+- master->bus_num = pdata->bus_num;
+- master->num_chipselect = pdata->num_chipselect;
+- }
+
+ sp->bitbang.master = master;
+ sp->bitbang.chipselect = ath79_spi_chipselect;