From 39bdbbc7fc7b4b88089c737a026b628d0a7616e6 Mon Sep 17 00:00:00 2001 From: juhosg Date: Thu, 13 Sep 2012 07:26:25 +0000 Subject: ar71xx: add device registration code for the AR934x NAND flash controller git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33387 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.3/602-MIPS-ath79-add-openwrt-stuff.patch | 16 ++++++++++++++-- .../patches-3.3/610-MIPS-ath79-openwrt-machines.patch | 4 ++-- .../linux/ar71xx/patches-3.3/611-TEW-712BR-support.patch | 2 +- .../linux/ar71xx/patches-3.3/612-ALL0315N-support.patch | 2 +- target/linux/ar71xx/patches-3.3/613-RB2011-support.patch | 2 +- 5 files changed, 19 insertions(+), 7 deletions(-) (limited to 'target/linux/ar71xx/patches-3.3') diff --git a/target/linux/ar71xx/patches-3.3/602-MIPS-ath79-add-openwrt-stuff.patch b/target/linux/ar71xx/patches-3.3/602-MIPS-ath79-add-openwrt-stuff.patch index 3c96819df..e61496fcd 100644 --- a/target/linux/ar71xx/patches-3.3/602-MIPS-ath79-add-openwrt-stuff.patch +++ b/target/linux/ar71xx/patches-3.3/602-MIPS-ath79-add-openwrt-stuff.patch @@ -21,7 +21,18 @@ config PCI_AR724X def_bool n -@@ -125,4 +139,13 @@ config ATH79_DEV_WMAC +@@ -115,6 +129,10 @@ config ATH79_DEV_GPIO_BUTTONS + config ATH79_DEV_LEDS_GPIO + def_bool n + ++config ATH79_DEV_NFC ++ depends on (SOC_AR934X) ++ def_bool n ++ + config ATH79_DEV_SPI + def_bool n + +@@ -125,4 +143,13 @@ config ATH79_DEV_WMAC depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA955X) def_bool n @@ -37,7 +48,7 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -17,13 +17,24 @@ obj-$(CONFIG_PCI) += pci.o +@@ -17,13 +17,25 @@ obj-$(CONFIG_PCI) += pci.o # Devices # obj-y += dev-common.o @@ -47,6 +58,7 @@ obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o +obj-$(CONFIG_ATH79_DEV_M25P80) += dev-m25p80.o ++obj-$(CONFIG_ATH79_DEV_NFC) += dev-nfc.o obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o obj-$(CONFIG_ATH79_DEV_WMAC) += dev-wmac.o diff --git a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch index 59eeee069..a5fed12f3 100644 --- a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch @@ -671,7 +671,7 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -156,4 +671,7 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -160,4 +675,7 @@ config ATH79_PCI_ATH9K_FIXUP config ATH79_ROUTERBOOT def_bool n @@ -681,7 +681,7 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -37,9 +37,62 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route +@@ -38,9 +38,62 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route # # Machines # diff --git a/target/linux/ar71xx/patches-3.3/611-TEW-712BR-support.patch b/target/linux/ar71xx/patches-3.3/611-TEW-712BR-support.patch index 319f1f5ce..cd39f5296 100644 --- a/target/linux/ar71xx/patches-3.3/611-TEW-712BR-support.patch +++ b/target/linux/ar71xx/patches-3.3/611-TEW-712BR-support.patch @@ -19,7 +19,7 @@ select SOC_AR71XX --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -68,6 +68,7 @@ obj-$(CONFIG_ATH79_MACH_RB750) += mach- +@@ -69,6 +69,7 @@ obj-$(CONFIG_ATH79_MACH_RB750) += mach- obj-$(CONFIG_ATH79_MACH_RW2458N) += mach-rw2458n.o obj-$(CONFIG_ATH79_MACH_TEW_632BRP) += mach-tew-632brp.o obj-$(CONFIG_ATH79_MACH_TEW_673GRU) += mach-tew-673gru.o diff --git a/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch b/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch index fafb11240..7dedc0410 100644 --- a/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch +++ b/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch @@ -18,7 +18,7 @@ select SOC_AR724X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -40,6 +40,7 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route +@@ -41,6 +41,7 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += mach-alfa-ap96.o obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o obj-$(CONFIG_ATH79_MACH_ALL0258N) += mach-all0258n.o diff --git a/target/linux/ar71xx/patches-3.3/613-RB2011-support.patch b/target/linux/ar71xx/patches-3.3/613-RB2011-support.patch index be2b144c7..656d5f8b5 100644 --- a/target/linux/ar71xx/patches-3.3/613-RB2011-support.patch +++ b/target/linux/ar71xx/patches-3.3/613-RB2011-support.patch @@ -24,7 +24,7 @@ ATH79_MACH_TEW_673GRU, /* TRENDnet TEW-673GRU */ --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -66,6 +66,7 @@ obj-$(CONFIG_ATH79_MACH_PB44) += mach-p +@@ -67,6 +67,7 @@ obj-$(CONFIG_ATH79_MACH_PB44) += mach-p obj-$(CONFIG_ATH79_MACH_PB92) += mach-pb92.o obj-$(CONFIG_ATH79_MACH_RB4XX) += mach-rb4xx.o obj-$(CONFIG_ATH79_MACH_RB750) += mach-rb750.o -- cgit v1.2.3