1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-17 19:59:25 +02:00

[lantiq] move voice packages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34695 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2012-12-15 02:00:45 +00:00
parent 568f5ffa42
commit 08abf72f92
11 changed files with 22 additions and 9 deletions

View File

@ -7,16 +7,16 @@ choice
config VOICE_CPE_VMMC_WITH_DEVICE_DANUBE config VOICE_CPE_VMMC_WITH_DEVICE_DANUBE
bool "Danube, Twinpass, Vinax" bool "Danube, Twinpass, Vinax"
depends on TARGET_lantiq_danube depends on TARGET_lantiq_xway
config VOICE_CPE_VMMC_WITH_DEVICE_AR9 # config VOICE_CPE_VMMC_WITH_DEVICE_AR9
bool "AR9 family" # bool "AR9 family"
depends on TARGET_lantiq_ar9 # 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 config VOICE_VMMC_WITH_DEVICE_FALCON
bool "FALC-ON" bool "FALC-ON"
depends on (TARGET_lantiq_falcon||TARGET_lantiq_falcon_stable) depends on (TARGET_lantiq_falcon||TARGET_lantiq_falcon_stable)

View File

@ -159,7 +159,7 @@
+static void inline bsp_mask_and_ack_irq(int x) +static void inline bsp_mask_and_ack_irq(int x)
+{ +{
+ struct irq_data d; + struct irq_data d;
+ d.irq = x; + d.hwirq = x;
+ ltq_mask_and_ack_irq(&d); + ltq_mask_and_ack_irq(&d);
+} +}
+#endif +#endif
@ -736,3 +736,16 @@
#include "drv_vmmc_api.h" #include "drv_vmmc_api.h"
#include "drv_vmmc_bbd.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