summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-04-21 12:41:55 +0000
committerJohn Crispin <john@openwrt.org>2015-04-21 12:41:55 +0000
commit1200296d38ac828c0d4c04928e85b24542c2307d (patch)
tree284cc2dbbbf028fa8ab02138ef42ea1afeec8ffc /target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
parentfe14e2a674e1bec18316d76551cae9e57fc8d815 (diff)
downloadmaster-31e0f0ae-1200296d38ac828c0d4c04928e85b24542c2307d.tar.gz
master-31e0f0ae-1200296d38ac828c0d4c04928e85b24542c2307d.tar.bz2
master-31e0f0ae-1200296d38ac828c0d4c04928e85b24542c2307d.zip
ar71xx: merge ap81 patches into one
Signed-off-by: Roman Yeryomin <roman@advem.lv> SVN-Revision: 45551
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch')
-rw-r--r--target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch b/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
index 1d38986b63..1cf4c2398b 100644
--- a/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
+++ b/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
@@ -57,27 +57,6 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
}
};
---- a/arch/mips/ath79/mach-ap81.c
-+++ b/arch/mips/ath79/mach-ap81.c
-@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio
- }
- };
-
-+static struct ath79_spi_controller_data ap81_spi0_data = {
-+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
-+ .cs_line = 0,
-+};
-+
- static struct spi_board_info ap81_spi_info[] = {
- {
- .bus_num = 0,
- .chip_select = 0,
- .max_speed_hz = 25000000,
- .modalias = "m25p64",
-+ .controller_data = &ap81_spi0_data,
- }
- };
-
--- a/arch/mips/ath79/mach-db120.c
+++ b/arch/mips/ath79/mach-db120.c
@@ -76,12 +76,18 @@ static struct gpio_keys_button db120_gpi