add support for new ar7-atm version D7.05.00.00 (#6515)

SVN-Revision: 20039

package/ar7-atm/Config.in

@@ -6,6 +6,9 @@ choice
 		This option allows you to switch between firmware/driver versions which
 		might improve the DSL line speed.
 
+config AR7_ATM_FW_VERSION_705
+	bool "D7.05.01.00"
+
 config AR7_ATM_FW_VERSION_704
 	bool "D7.04.03.00"
 

package/ar7-atm/Makefile

@@ -10,16 +10,25 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=sangam_atm
 
+ifeq ($(CONFIG_AR7_ATM_FW_VERSION_705),y)
+PKG_VERSION:=D7.05.01.00
+PKG_MD5SUM:=42ee465be5cfbe9476fc25deb260d450
+PKG_RELEASE:=R1
+PATCH_DIR:=patches-$(PKG_VERSION)
+endif
+
 ifeq ($(CONFIG_AR7_ATM_FW_VERSION_704),y)
 PKG_VERSION:=D7.04.03.00
 PKG_MD5SUM:=3d76004e46f09e88931f91670cb420ad
 PKG_RELEASE:=R1
+PATCH_DIR:=patches-$(PKG_VERSION)
 endif
 
 ifeq ($(CONFIG_AR7_ATM_FW_VERSION_703),y)
 PKG_VERSION:=D7.03.01.00
 PKG_MD5SUM:=bc6e9c6adb1be25820c7ee661de8ca7d
 PKG_RELEASE:=R2
+PATCH_DIR:=patches-D7.04.03.00
 endif
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.bz2

package/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch

+Index: sangam_atm-D7.05.01.00/tn7atm.c
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/tn7atm.c	2010-03-07 18:09:13.000000000 +0100
++++ sangam_atm-D7.05.01.00/tn7atm.c	2010-03-07 18:09:21.000000000 +0100
+@@ -633,7 +633,7 @@
+  *  Description: tnetd73xx SAR interrupt.
+  *
+  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+-static void tn7atm_sar_irq (int irq, void *voiddev, struct pt_regs *regs)
++static irqreturn_t tn7atm_sar_irq (int irq, void *voiddev)
+ {
+   struct atm_dev *atmdev;
+   Tn7AtmPrivate *priv;
+@@ -660,6 +660,7 @@
+ #ifdef TIATM_INST_SUPP
+   psp_trace_par (ATM_DRV_SAR_ISR_EXIT, retval);
+ #endif
++  return IRQ_HANDLED;
+ }
+ 
+ /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+@@ -669,7 +670,7 @@
+  *  Description: tnetd73xx DSL interrupt.
+  *
+  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+-static void tn7atm_dsl_irq (int irq, void *voiddev, struct pt_regs *regs)
++static irqreturn_t tn7atm_dsl_irq (int irq, void *voiddev)
+ {
+   struct atm_dev *atmdev;
+   Tn7AtmPrivate *priv;
+@@ -691,6 +692,8 @@
+ #ifdef TIATM_INST_SUPP
+   psp_trace_par (ATM_DRV_DSL_ISR_EXIT, retval);
+ #endif
++
++  return IRQ_HANDLED;
+ }
+ 
+ /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

package/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch

+Index: sangam_atm-D7.05.01.00/tn7api.h
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/tn7api.h	2007-09-25 15:49:10.000000000 +0200
++++ sangam_atm-D7.05.01.00/tn7api.h	2010-03-07 18:09:52.000000000 +0100
+@@ -118,7 +118,7 @@
+ int tn7dsl_proc_dbgmsg_read(char* buf, char **start, off_t offset, int count,int *eof, void *data);
+ #endif
+ //UR8_MERGE_END CQ11813
+-inline int tn7dsl_handle_interrupt(void);
++int tn7dsl_handle_interrupt(void);
+ 
+ void tn7dsl_dslmod_sysctl_register(void);
+ void tn7dsl_dslmod_sysctl_unregister(void);

package/ar7-atm/patches-D7.05.01.00/130-powercutback.patch

+Index: sangam_atm-D7.05.01.00/dsl_hal_advcfg.c
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/dsl_hal_advcfg.c	2005-08-09 08:20:46.000000000 +0200
++++ sangam_atm-D7.05.01.00/dsl_hal_advcfg.c	2010-03-07 18:09:59.000000000 +0100
+@@ -36,9 +36,9 @@
+ *    05Jul05     0.00.09            CPH    CQ9775: Change dslhal_advcfg_configDsTones input parameters & support for ADSL2+
+ *    24Jul05     0.00.10            CPH    Fixed comments in dslhal_advcfg_configDsTones function header
+ *******************************************************************************/
+-#include <dev_host_interface.h>
+-#include <dsl_hal_register.h>
+-#include <dsl_hal_support.h>
++#include "dev_host_interface.h"
++#include "dsl_hal_register.h"
++#include "dsl_hal_support.h"
+ 
+ /*****************************************************************************/
+ /* ACT API functions -- To be moved into their own independent module --RamP */
+Index: sangam_atm-D7.05.01.00/Makefile
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/Makefile	2010-03-07 18:01:20.000000000 +0100
++++ sangam_atm-D7.05.01.00/Makefile	2010-03-07 18:09:59.000000000 +0100
+@@ -4,6 +4,7 @@
+ 
+ CONFIG_SANGAM_ATM=m
+ #EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT
+-EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL
++#EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL
++EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL
+ obj-$(CONFIG_SANGAM_ATM) := tiatm.o
+-tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o
++tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o
+Index: sangam_atm-D7.05.01.00/tn7dsl.c
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/tn7dsl.c	2010-03-07 18:07:28.000000000 +0100
++++ sangam_atm-D7.05.01.00/tn7dsl.c	2010-03-07 18:09:59.000000000 +0100
+@@ -3053,6 +3053,14 @@
+     dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr));
+   }
+ 
++  // set powercutback
++  ptr = NULL;
++  ptr = prom_getenv("powercutback");
++  if(ptr)
++  {
++    dslhal_advcfg_onOffPcb(pIhw, os_atoi(ptr));
++  }
++
+   // trellis
+   ptr = NULL;
+   ptr = prom_getenv("trellis");

package/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch

+Index: sangam_atm-D7.05.01.00/tn7sar.c
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/tn7sar.c	2010-03-07 18:01:20.000000000 +0100
++++ sangam_atm-D7.05.01.00/tn7sar.c	2010-03-07 18:10:03.000000000 +0100
+@@ -125,10 +125,10 @@
+ //09/05/07: cph, move to tn7atm.h
+ // #define RESERVED_OAM_CHANNEL              15
+ 
+-#define AAL5_PARM "id=aal5, base = 0x03000000, offset = 0, int_line=15, ch0=[RxBufSize=1522; RxNumBuffers = 32; RxServiceMax = 50; TxServiceMax=50; TxNumBuffers=32; CpcsUU=0x5aa5; TxVc_CellRate=0x3000; TxVc_AtmHeader=0x00000640]"
+-#define SAR_PARM "id=sar,base = 0x03000000, reset_bit = 9, offset = 0; UniNni = 0, PdspEnable = 1"
++#define CH0_PARM "RxBufSize=1522, RxNumBuffers=32, RxServiceMax=50, TxServiceMax=50, TxNumBuffers=32, CpcsUU=0x5aa5, TxVc_CellRate=0x3000, TxVc_AtmHeader=0x00000640"
++#define AAL5_PARM "id=aal5, base=0x03000000, offset=0, int_line=15, ch0=[" CH0_PARM "]"
++#define SAR_PARM "id=sar, base=0x03000000, reset_bit=9, offset=0; UniNni=0, PdspEnable=1, Debug=0xFFFFFFFF"
+ #define RESET_PARM "id=ResetControl, base=0xA8611600"
+-#define CH0_PARM "RxBufSize=1522, RxNumBuffers = 32, RxServiceMax = 50, TxServiceMax=50, TxNumBuffers=32, CpcsUU=0x5aa5, TxVc_CellRate=0x3000, TxVc_AtmHeader=0x00000640"
+ 
+ #define MAX_PVC_TABLE_ENTRY 16
+ 

package/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch

+Index: sangam_atm-D7.05.01.00/Makefile
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/Makefile	2010-03-07 18:09:59.000000000 +0100
++++ sangam_atm-D7.05.01.00/Makefile	2010-03-07 18:10:06.000000000 +0100
+@@ -5,6 +5,7 @@
+ CONFIG_SANGAM_ATM=m
+ #EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT
+ #EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL
+-EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL
++#EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL
++EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL -DCPATM_TASKLET_MODE
+ obj-$(CONFIG_SANGAM_ATM) := tiatm.o
+ tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o

package/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch

+Index: sangam_atm-D7.05.01.00/tn7dsl.c
+===================================================================
+--- sangam_atm-D7.05.01.00.orig/tn7dsl.c	2010-03-07 18:18:39.000000000 +0100
++++ sangam_atm-D7.05.01.00/tn7dsl.c	2010-03-07 18:19:04.000000000 +0100
+@@ -117,6 +117,7 @@
+ #include <linux/vmalloc.h>
+ #include <linux/file.h>
+ #include <linux/firmware.h>
++#include <linux/version.h>
+ 
+ #include <asm/io.h>
+ #include <asm/ar7/ar7.h>
+@@ -492,7 +493,9 @@
+ }
+ 
+ static struct device avsar = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ 	.bus_id    = "vlynq",
++#endif
+ 	.release   = avsar_release,
+ };
+ 
+@@ -501,6 +504,9 @@
+ 	const struct firmware *fw_entry;
+ 	size_t size;
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
++	dev_set_name(&avsar, "avsar");
++#endif
+ 	printk("requesting firmware image \"ar0700xx.bin\"\n");
+ 	if(device_register(&avsar) < 0) {
+ 		printk(KERN_ERR