From 2b0cb17d4298c9dced24ca30c5b68ce10d64c366 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Tue, 17 Sep 2013 21:45:56 +0000
Subject: [PATCH] lantiq: update packages for v3.10

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 38028
---
 package/kernel/lantiq/ltq-atm/Makefile        |  4 +--
 package/kernel/lantiq/ltq-deu/Makefile        | 10 +++---
 package/kernel/lantiq/ltq-hcd/Makefile        |  6 ++--
 package/kernel/lantiq/ltq-ptm/Makefile        |  4 +--
 .../ltq-tapi/patches/300-linux-310.patch      | 13 ++++++++
 package/kernel/lantiq/ltq-vdsl-fw/Makefile    |  2 +-
 package/kernel/lantiq/ltq-vdsl-mei/Makefile   |  2 +-
 package/kernel/lantiq/ltq-vdsl/Makefile       |  2 +-
 package/kernel/lantiq/ltq-vmmc/Makefile       |  2 +-
 .../ltq-vmmc/patches/200-linux-310.patch      | 33 +++++++++++++++++++
 10 files changed, 62 insertions(+), 16 deletions(-)
 create mode 100644 package/kernel/lantiq/ltq-tapi/patches/300-linux-310.patch
 create mode 100644 package/kernel/lantiq/ltq-vmmc/patches/200-linux-310.patch

diff --git a/package/kernel/lantiq/ltq-atm/Makefile b/package/kernel/lantiq/ltq-atm/Makefile
index e6e005933c..c557ee5b25 100644
--- a/package/kernel/lantiq/ltq-atm/Makefile
+++ b/package/kernel/lantiq/ltq-atm/Makefile
@@ -23,13 +23,13 @@ define KernelPackage/ltq-atm-template
   VARIANT:=$(1)
   DEPENDS:=@TARGET_lantiq_$(2) +kmod-atm +br2684ctl
   FILES:=$(PKG_BUILD_DIR)/ltq_atm_$(1).ko
-  AUTOLOAD:=$(call AutoLoad,52,ltq_atm_$(1))
+  AUTOLOAD:=$(call AutoProbe,ltq_atm_$(1))
 endef
 
 KernelPackage/ltq-atm-danube=$(call KernelPackage/ltq-atm-template,danube,xway)
 KernelPackage/ltq-atm-ar9=$(call KernelPackage/ltq-atm-template,ar9,xway)
 KernelPackage/ltq-atm-ase=$(call KernelPackage/ltq-atm-template,ase,ase)
-KernelPackage/ltq-atm-vr9=$(call KernelPackage/ltq-atm-template,vr9,xway)
+KernelPackage/ltq-atm-vr9=$(call KernelPackage/ltq-atm-template,vr9,xrx200)
 
 define Build/Prepare
 	$(INSTALL_DIR) $(PKG_BUILD_DIR) 
diff --git a/package/kernel/lantiq/ltq-deu/Makefile b/package/kernel/lantiq/ltq-deu/Makefile
index 5e2683f772..53ad0fa6da 100644
--- a/package/kernel/lantiq/ltq-deu/Makefile
+++ b/package/kernel/lantiq/ltq-deu/Makefile
@@ -21,14 +21,14 @@ define KernelPackage/ltq-deu-template
   TITLE:=deu driver for $(1)
   URL:=http://www.lantiq.com/
   VARIANT:=$(1)
-  DEPENDS:=@TARGET_lantiq_xway +kmod-crypto-manager
+  DEPENDS:=@TARGET_lantiq_$(2) +kmod-crypto-manager
   FILES:=$(PKG_BUILD_DIR)/ltq_deu_$(1).ko $(PKG_BUILD_DIR)/ltq_deu_testmgr.ko
-  AUTOLOAD:=$(call AutoLoad,52,ltq_deu_$(1))
+  AUTOLOAD:=$(call AutoProbe,ltq_deu_$(1))
 endef
 
-KernelPackage/ltq-deu-danube=$(call KernelPackage/ltq-deu-template,danube)
-KernelPackage/ltq-deu-ar9=$(call KernelPackage/ltq-deu-template,ar9)
-KernelPackage/ltq-deu-vr9=$(call KernelPackage/ltq-deu-template,vr9)
+KernelPackage/ltq-deu-danube=$(call KernelPackage/ltq-deu-template,danube,xway)
+KernelPackage/ltq-deu-ar9=$(call KernelPackage/ltq-deu-template,ar9,xway)
+KernelPackage/ltq-deu-vr9=$(call KernelPackage/ltq-deu-template,vr9,xrx200)
 
 define Build/Prepare
 	$(INSTALL_DIR) $(PKG_BUILD_DIR)
diff --git a/package/kernel/lantiq/ltq-hcd/Makefile b/package/kernel/lantiq/ltq-hcd/Makefile
index 6b00e6759f..89185689ac 100644
--- a/package/kernel/lantiq/ltq-hcd/Makefile
+++ b/package/kernel/lantiq/ltq-hcd/Makefile
@@ -23,14 +23,14 @@ define KernelPackage/ltq-hcd-template
   VARIANT:=$(1)
   DEPENDS:=@TARGET_lantiq_$(2) +kmod-usb-core
   FILES:=$(PKG_BUILD_DIR)/ltq_hcd_$(1).ko
-  AUTOLOAD:=$(call AutoLoad,50,ltq_hcd_$(1),1)
+  AUTOLOAD:=$(call AutoProbe,ltq_hcd_$(1),1)
 endef
 
 KernelPackage/ltq-hcd-ase=$(call KernelPackage/ltq-hcd-template,ase,ase)
 KernelPackage/ltq-hcd-danube=$(call KernelPackage/ltq-hcd-template,danube,xway)
 KernelPackage/ltq-hcd-ar9=$(call KernelPackage/ltq-hcd-template,ar9,xway)
-KernelPackage/ltq-hcd-vr9=$(call KernelPackage/ltq-hcd-template,vr9,xway)
-KernelPackage/ltq-hcd-ar10=$(call KernelPackage/ltq-hcd-template,ar10,xway)
+KernelPackage/ltq-hcd-vr9=$(call KernelPackage/ltq-hcd-template,vr9,xrx200)
+KernelPackage/ltq-hcd-ar10=$(call KernelPackage/ltq-hcd-template,ar10,xrx200)
 
 define Build/Prepare
 	$(INSTALL_DIR) $(PKG_BUILD_DIR)
diff --git a/package/kernel/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile
index f0fb25ac38..22f09cce67 100644
--- a/package/kernel/lantiq/ltq-ptm/Makefile
+++ b/package/kernel/lantiq/ltq-ptm/Makefile
@@ -24,13 +24,13 @@ define KernelPackage/ltq-ptm-template
   VARIANT:=$(1)
   DEPENDS:=@TARGET_lantiq_$(2)
   FILES:=$(PKG_BUILD_DIR)/ltq_ptm_$(1).ko 
-  AUTOLOAD:=$(call AutoLoad,52,ltq_ptm_$(1))
+  AUTOLOAD:=$(call AutoProbe,ltq_ptm_$(1))
 endef
 
 KernelPackage/ltq-ptm-danube=$(call KernelPackage/ltq-ptm-template,danube,xway)
 KernelPackage/ltq-ptm-ar9=$(call KernelPackage/ltq-ptm-template,ar9,xway)
 KernelPackage/ltq-ptm-ase=$(call KernelPackage/ltq-ptm-template,ase,ase)
-KernelPackage/ltq-ptm-vr9=$(call KernelPackage/ltq-ptm-template,vr9,xway)
+KernelPackage/ltq-ptm-vr9=$(call KernelPackage/ltq-ptm-template,vr9,xrx200)
 
 define Build/Prepare
 	$(INSTALL_DIR) $(PKG_BUILD_DIR)
diff --git a/package/kernel/lantiq/ltq-tapi/patches/300-linux-310.patch b/package/kernel/lantiq/ltq-tapi/patches/300-linux-310.patch
new file mode 100644
index 0000000000..ac72515eee
--- /dev/null
+++ b/package/kernel/lantiq/ltq-tapi/patches/300-linux-310.patch
@@ -0,0 +1,13 @@
+Index: drv_tapi-3.13.0/src/drv_tapi_linux.c
+===================================================================
+--- drv_tapi-3.13.0.orig/src/drv_tapi_linux.c	2013-09-05 22:28:16.868419283 +0200
++++ drv_tapi-3.13.0/src/drv_tapi_linux.c	2013-09-05 22:32:37.396425814 +0200
+@@ -93,6 +93,8 @@
+ #include "drv_tapi_announcements.h"
+ #endif /* TAPI_ANNOUNCEMENTS */
+ 
++#undef CONFIG_PROC_FS
++
+ #define TAPI_IOCTL_STACKSIZE                 4000 /* allow some overhead 4 k */
+ 
+ /* ================================== */
diff --git a/package/kernel/lantiq/ltq-vdsl-fw/Makefile b/package/kernel/lantiq/ltq-vdsl-fw/Makefile
index d4e0023bc1..6404067707 100644
--- a/package/kernel/lantiq/ltq-vdsl-fw/Makefile
+++ b/package/kernel/lantiq/ltq-vdsl-fw/Makefile
@@ -17,7 +17,7 @@ define Package/ltq-vdsl-vr9-fw-installer
   TITLE:=Firmware installer
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@TARGET_lantiq_xway +kmod-ltq-vdsl-vr9
+  DEPENDS:=@TARGET_lantiq_xrx200 +kmod-ltq-vdsl-vr9
 endef
 
 define Build/Prepare
diff --git a/package/kernel/lantiq/ltq-vdsl-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-mei/Makefile
index 8561573f7d..608b320238 100644
--- a/package/kernel/lantiq/ltq-vdsl-mei/Makefile
+++ b/package/kernel/lantiq/ltq-vdsl-mei/Makefile
@@ -23,7 +23,7 @@ define KernelPackage/ltq-vdsl-vr9-mei
   TITLE:=mei driver for vdsl
   SECTION:=sys
   SUBMENU:=Network Devices
-  DEPENDS:=@TARGET_lantiq_xway +kmod-ltq-ifxos
+  DEPENDS:=@TARGET_lantiq_xrx200 +kmod-ltq-ifxos
   FILES:=$(PKG_BUILD_DIR)/src/drv_mei_cpe.ko
   AUTOLOAD:=$(call AutoLoad,50,drv_mei_cpe)
 endef
diff --git a/package/kernel/lantiq/ltq-vdsl/Makefile b/package/kernel/lantiq/ltq-vdsl/Makefile
index 9f1e268037..e94692771b 100644
--- a/package/kernel/lantiq/ltq-vdsl/Makefile
+++ b/package/kernel/lantiq/ltq-vdsl/Makefile
@@ -24,7 +24,7 @@ define KernelPackage/ltq-vdsl-vr9
   TITLE:=vdsl driver
   SECTION:=sys
   SUBMENU:=Network Devices
-  DEPENDS:=@TARGET_lantiq_xway +kmod-ltq-vdsl-vr9-mei
+  DEPENDS:=@TARGET_lantiq_xrx200 +kmod-ltq-vdsl-vr9-mei
   FILES:=$(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.ko
   AUTOLOAD:=$(call AutoLoad,51,drv_dsl_cpe_api)
 endef
diff --git a/package/kernel/lantiq/ltq-vmmc/Makefile b/package/kernel/lantiq/ltq-vmmc/Makefile
index 98355b1ecd..1708652d64 100644
--- a/package/kernel/lantiq/ltq-vmmc/Makefile
+++ b/package/kernel/lantiq/ltq-vmmc/Makefile
@@ -26,7 +26,7 @@ define KernelPackage/ltq-vmmc
   URL:=http://www.lantiq.com/
   DEPENDS:=$(LTQ_TAPI_TARGET) +kmod-ltq-tapi
   FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.ko
-  AUTOLOAD:=$(call AutoLoad,25,drv_vmmc)
+  AUTOLOAD:=$(call AutoProbe,drv_vmmc)
 endef
 
 define KernelPackage/ltq-vmmc/description
diff --git a/package/kernel/lantiq/ltq-vmmc/patches/200-linux-310.patch b/package/kernel/lantiq/ltq-vmmc/patches/200-linux-310.patch
new file mode 100644
index 0000000000..70f88299f9
--- /dev/null
+++ b/package/kernel/lantiq/ltq-vmmc/patches/200-linux-310.patch
@@ -0,0 +1,33 @@
+Index: drv_vmmc-1.9.0/src/drv_vmmc_linux.c
+===================================================================
+--- drv_vmmc-1.9.0.orig/src/drv_vmmc_linux.c	2013-09-05 22:34:31.920428685 +0200
++++ drv_vmmc-1.9.0/src/drv_vmmc_linux.c	2013-09-05 22:35:54.940430772 +0200
+@@ -54,6 +54,8 @@
+ #include "drv_vmmc_res.h"
+ #endif /* (VMMC_CFG_FEATURES & VMMC_FEAT_HDLC) */
+ 
++#undef VMMC_USE_PROC
++
+ /* ============================= */
+ /* Local Macros & Definitions    */
+ /* ============================= */
+Index: drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_linux.c
+===================================================================
+--- drv_vmmc-1.9.0.orig/src/mps/drv_mps_vmmc_linux.c	2013-09-05 22:34:31.988428687 +0200
++++ drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_linux.c	2013-09-05 22:54:01.544458009 +0200
+@@ -80,11 +80,15 @@
+ /* ============================= */
+ #define IFX_MPS_DEV_NAME       "ifx_mps"
+ 
++#undef CONFIG_MPS_HISTORY_SIZE
++#define CONFIG_MPS_HISTORY_SIZE 0
+ #ifndef CONFIG_MPS_HISTORY_SIZE
+ #define CONFIG_MPS_HISTORY_SIZE 128
+ #warning CONFIG_MPS_HISTORY_SIZE should have been set via cofigure - setting to default 128
+ #endif
+ 
++#undef CONFIG_PROC_FS
++
+ /* ============================= */
+ /* Global variable definition    */
+ /* ============================= */
-- 
2.30.2