move voice packages

SVN-Revision: 34695

11 files changed, 23 insertions, 10 deletions

diff --git a/package/system/ltq-tapi/Config.in b/package/platform/lantiq/ltq-tapi/Config.in
index 84dbef2397..84dbef2397 100644
--- a/package/system/ltq-tapi/Config.in
+++ b/package/platform/lantiq/ltq-tapi/Config.in
diff --git a/package/system/ltq-tapi/Makefile b/package/platform/lantiq/ltq-tapi/Makefile
index 2582235dc9..2582235dc9 100644
--- a/package/system/ltq-tapi/Makefile
+++ b/package/platform/lantiq/ltq-tapi/Makefile
diff --git a/package/system/ltq-tapi/patches/000-portability.patch b/package/platform/lantiq/ltq-tapi/patches/000-portability.patch
index 78fcbad668..78fcbad668 100644
--- a/package/system/ltq-tapi/patches/000-portability.patch
+++ b/package/platform/lantiq/ltq-tapi/patches/000-portability.patch
diff --git a/package/system/ltq-tapi/patches/100-ifxmips.patch b/package/platform/lantiq/ltq-tapi/patches/100-ifxmips.patch
index a9c0d8116b..a9c0d8116b 100644
--- a/package/system/ltq-tapi/patches/100-ifxmips.patch
+++ b/package/platform/lantiq/ltq-tapi/patches/100-ifxmips.patch
diff --git a/package/system/ltq-tapi/patches/200-linux-37.patch b/package/platform/lantiq/ltq-tapi/patches/200-linux-37.patch
index 9d7428df03..9d7428df03 100644
--- a/package/system/ltq-tapi/patches/200-linux-37.patch
+++ b/package/platform/lantiq/ltq-tapi/patches/200-linux-37.patch
diff --git a/package/system/ltq-vmmc/Config.in b/package/platform/lantiq/ltq-vmmc/Config.in
index 3a5e0145cc..89e1bc5cba 100644
--- a/package/system/ltq-vmmc/Config.in
+++ b/package/platform/lantiq/ltq-vmmc/Config.in
@@ -7,16 +7,16 @@ choice
 
 	config VOICE_CPE_VMMC_WITH_DEVICE_DANUBE
 		bool "Danube, Twinpass, Vinax"
-		depends on TARGET_lantiq_danube
+		depends on TARGET_lantiq_xway
 
-	config VOICE_CPE_VMMC_WITH_DEVICE_AR9
-		bool "AR9 family"
-		depends on TARGET_lantiq_ar9
+#	config VOICE_CPE_VMMC_WITH_DEVICE_AR9
+#		bool "AR9 family"
+#		depends on TARGET_lantiq_ar9
 
-	config VOICE_CPE_VMMC_WITH_DEVICE_VR9
-		bool "VR9 family"
-		depends on TARGET_lantiq_vr9
-	
+#	config VOICE_CPE_VMMC_WITH_DEVICE_VR9
+#		bool "VR9 family"
+#		depends on TARGET_lantiq_vr9
+#	
 	config VOICE_VMMC_WITH_DEVICE_FALCON
 		bool "FALC-ON"
 		depends on (TARGET_lantiq_falcon||TARGET_lantiq_falcon_stable)
diff --git a/package/system/ltq-vmmc/Makefile b/package/platform/lantiq/ltq-vmmc/Makefile
index 98355b1ecd..98355b1ecd 100644
--- a/package/system/ltq-vmmc/Makefile
+++ b/package/platform/lantiq/ltq-vmmc/Makefile
diff --git a/package/system/ltq-vmmc/files/vmmc.init b/package/platform/lantiq/ltq-vmmc/files/vmmc.init
index 100a97dc45..100a97dc45 100644
--- a/package/system/ltq-vmmc/files/vmmc.init
+++ b/package/platform/lantiq/ltq-vmmc/files/vmmc.init
diff --git a/package/system/ltq-vmmc/patches/000-portability.patch b/package/platform/lantiq/ltq-vmmc/patches/000-portability.patch
index 48602476f4..48602476f4 100644
--- a/package/system/ltq-vmmc/patches/000-portability.patch
+++ b/package/platform/lantiq/ltq-vmmc/patches/000-portability.patch
diff --git a/package/system/ltq-vmmc/patches/100-target.patch b/package/platform/lantiq/ltq-vmmc/patches/100-target.patch
index eae621eafd..cabd2d199c 100644
--- a/package/system/ltq-vmmc/patches/100-target.patch
+++ b/package/platform/lantiq/ltq-vmmc/patches/100-target.patch
@@ -159,7 +159,7 @@
 +static void inline bsp_mask_and_ack_irq(int x)
 +{
 +	struct irq_data d;
-+	d.irq = x;
++	d.hwirq = x;
 +	ltq_mask_and_ack_irq(&d);
 +}
 +#endif
@@ -735,4 +735,17 @@
 +#include "drv_vmmc_init.h"
  #include "drv_vmmc_api.h"
  #include "drv_vmmc_bbd.h"
- 
+
+Index: drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_danube.c
+===================================================================
+--- drv_vmmc-1.9.0.orig/src/mps/drv_mps_vmmc_danube.c	2012-12-13 08:43:16.080109377 +0100
++++ drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_danube.c	2012-12-13 08:43:48.584110192 +0100
+@@ -44,7 +44,7 @@
+ #  include <linux/dma-mapping.h>
+ 
+ 
+-#define LQ_RCU_BASE_ADDR	(KSEG1 + LTQ_RCU_BASE_ADDR)
++#define LQ_RCU_BASE_ADDR	(KSEG1 + 0x1F203000)
+ # define LQ_RCU_RST		((u32 *)(LQ_RCU_BASE_ADDR + 0x0010))
+ #define IFX_RCU_RST_REQ_CPU1             (1 << 3)
+ #  define IFX_RCU_RST_REQ        LQ_RCU_RST
diff --git a/package/system/ltq-vmmc/patches/400-falcon.patch b/package/platform/lantiq/ltq-vmmc/patches/400-falcon.patch
index 490d6e5dc9..490d6e5dc9 100644
--- a/package/system/ltq-vmmc/patches/400-falcon.patch
+++ b/package/platform/lantiq/ltq-vmmc/patches/400-falcon.patch