[amazon] Add ADM6996 switch driver

This fixes #5314
Thanks to Michael Richter


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16523 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 7 insertions, 13 deletions

diff --git a/target/linux/amazon/config-2.6.21 b/target/linux/amazon/config-2.6.21
index da338fda3e..c406070b15 100644
--- a/target/linux/amazon/config-2.6.21
+++ b/target/linux/amazon/config-2.6.21
@@ -1,6 +1,7 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
+CONFIG_ADM6996_SUPPORT=y
 CONFIG_AMAZON=y
 CONFIG_AMAZON_ASC_UART=y
 CONFIG_AMAZON_MTD=y
diff --git a/target/linux/amazon/files/arch/mips/amazon/Kconfig b/target/linux/amazon/files/arch/mips/amazon/Kconfig
index 179e35efd2..63055fc2aa 100644
--- a/target/linux/amazon/files/arch/mips/amazon/Kconfig
+++ b/target/linux/amazon/files/arch/mips/amazon/Kconfig
@@ -26,6 +26,10 @@ config AMAZON_MTD
 	bool "Amazon MTD map"
 	default y
 
+config ADM6996_SUPPORT
+	bool "Amazon ADM6996 Switch driver"
+	default y
+
 choice 
 	prompt "Flash Size"
 	depends on AMAZON_MTD
diff --git a/target/linux/amazon/files/drivers/char/admmod.c b/target/linux/amazon/files/drivers/net/admmod.c
index 0229f53f55..70ba1496a1 100644
--- a/target/linux/amazon/files/drivers/char/admmod.c
+++ b/target/linux/amazon/files/drivers/net/admmod.c
@@ -928,7 +928,6 @@ static int ifx_sw_init(void)
 
 int adm_open(struct inode *node, struct file *filp)
 {
-    MOD_INC_USE_COUNT;
     return 0;
 }
 
@@ -945,7 +944,6 @@ ssize_t adm_write(struct file *filep, const char *buf, size_t count, loff_t *ppo
 /* close */
 int adm_release(struct inode *inode, struct file *filp)
 {
-    MOD_DEC_USE_COUNT;
     return 0;
 }
 
diff --git a/target/linux/amazon/patches/110-char_drivers.patch b/target/linux/amazon/patches/110-char_drivers.patch
deleted file mode 100644
index f56f8969f5..0000000000
--- a/target/linux/amazon/patches/110-char_drivers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -104,6 +104,7 @@ obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
- 
- obj-$(CONFIG_HANGCHECK_TIMER)	+= hangcheck-timer.o
- obj-$(CONFIG_TCG_TPM)		+= tpm/
-+obj-$(CONFIG_AMAZONE_WDT) += amazone_wdt.o
- 
- # Files generated that shall be removed upon make clean
- clean-files := consolemap_deftbl.c defkeymap.c
diff --git a/target/linux/amazon/patches/140-net_drivers.patch b/target/linux/amazon/patches/140-net_drivers.patch
index 4732250e12..2b5c1b6324 100644
--- a/target/linux/amazon/patches/140-net_drivers.patch
+++ b/target/linux/amazon/patches/140-net_drivers.patch
@@ -1,8 +1,9 @@
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
-@@ -219,3 +219,5 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+@@ -219,3 +219,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
  obj-$(CONFIG_FS_ENET) += fs_enet/
  
  obj-$(CONFIG_NETXEN_NIC) += netxen/
 +
 +obj-$(CONFIG_AMAZON_NET_SW) += amazon_sw.o
++obj-$(CONFIG_ADM6996_SUPPORT) += admmod.o