ar71xx: select m25p80 support instead of spi support where used by mach files (#17699)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42331 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
index 3669f26..cba18a8 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
@@ -156,7 +156,7 @@
 +      select SOC_AR71XX
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +
 +config ATH79_MACH_HORNET_UB
@@ -225,7 +225,7 @@
 +      select SOC_QCA955X
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +      help
@@ -238,7 +238,7 @@
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
 +      select ATH79_DEV_NFC
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +      help
@@ -350,7 +350,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +
@@ -700,7 +700,8 @@
        select ATH79_DEV_GPIO_BUTTONS
        select ATH79_DEV_LEDS_GPIO
 -      select ATH79_DEV_NFC
-       select ATH79_DEV_SPI
+-      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC
 -      help
@@ -904,7 +905,8 @@
        select ATH79_DEV_ETH
        select ATH79_DEV_GPIO_BUTTONS
        select ATH79_DEV_LEDS_GPIO
-       select ATH79_DEV_SPI
+-      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
        select ATH79_DEV_USB
 -      help
 -        Say 'Y' here if you want your kernel to support the

diff --git a/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch b/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch
index 5fb93f2..8e1a949 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch
+++ b/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch
@@ -27,7 +27,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_NFC
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC

diff --git a/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch b/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch
index 83ae616..e52a739 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch
+++ b/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch
@@ -10,7 +10,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +

diff --git a/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch b/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch
index a3c0f8f..cbb4472 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch
+++ b/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch
@@ -20,7 +20,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +

diff --git a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
index 3669f26..cba18a8 100644 (file)
--- a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
@@ -156,7 +156,7 @@
 +      select SOC_AR71XX
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +
 +config ATH79_MACH_HORNET_UB
@@ -225,7 +225,7 @@
 +      select SOC_QCA955X
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +      help
@@ -238,7 +238,7 @@
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
 +      select ATH79_DEV_NFC
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +      help
@@ -350,7 +350,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +
@@ -700,7 +700,8 @@
        select ATH79_DEV_GPIO_BUTTONS
        select ATH79_DEV_LEDS_GPIO
 -      select ATH79_DEV_NFC
-       select ATH79_DEV_SPI
+-      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC
 -      help
@@ -904,7 +905,8 @@
        select ATH79_DEV_ETH
        select ATH79_DEV_GPIO_BUTTONS
        select ATH79_DEV_LEDS_GPIO
-       select ATH79_DEV_SPI
+-      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
        select ATH79_DEV_USB
 -      help
 -        Say 'Y' here if you want your kernel to support the

diff --git a/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch b/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
index 5fb93f2..8e1a949 100644 (file)
--- a/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
+++ b/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
@@ -27,7 +27,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_NFC
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC

diff --git a/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch b/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
index 83ae616..e52a739 100644 (file)
--- a/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
+++ b/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
@@ -10,7 +10,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +

diff --git a/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch b/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
index a3c0f8f..cbb4472 100644 (file)
--- a/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
+++ b/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
@@ -20,7 +20,7 @@
 +      select ATH79_DEV_ETH
 +      select ATH79_DEV_GPIO_BUTTONS
 +      select ATH79_DEV_LEDS_GPIO
-+      select ATH79_DEV_SPI
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +