From: John Crispin <john@openwrt.org>
Date: Tue, 24 Nov 2015 20:40:49 +0000 (+0000)
Subject: lantiq: ltq-vdsl-mei: register char device automatically
X-Git-Tag: reboot~1423
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ca541cffd09340d5f2ee2d95efce079b3a581b29;p=openwrt%2Fopenwrt.git

lantiq: ltq-vdsl-mei: register char device automatically

Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>

SVN-Revision: 47633
---

diff --git a/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch
index c0e69a9f35..0657f66078 100644
--- a/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch
+++ b/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch
@@ -34,7 +34,16 @@
  /* ===================================
     extern function declarations
     =================================== */
-@@ -1783,7 +1785,9 @@ static int __init MEI_module_init (void)
+@@ -196,6 +198,8 @@ static void MEI_MemVAllocTest();
+ /* Local variables (LINUX)             */
+ /* =================================== */
+ static IFX_uint8_t major_number = 0;
++static struct class *mei_class;
++static dev_t mei_devt;
+ #ifdef MODULE
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+ MODULE_PARM(major_number, "b");
+@@ -1783,7 +1787,9 @@ static int __init MEI_module_init (void)
        return (result);
     }
  
@@ -44,7 +53,18 @@
  
     return 0;
  }
-@@ -1963,7 +1967,9 @@ static void MEI_module_exit (void)
+@@ -1907,6 +1913,10 @@ static void MEI_module_exit (void)
+ 
+ #else
+    unregister_chrdev ( major_number , DRV_MEI_NAME );
++   device_destroy(mei_class, mei_devt);
++   mei_devt = 0;
++   class_destroy(mei_class);
++   mei_class = NULL;
+ #endif
+ 
+ #if CONFIG_PROC_FS
+@@ -1963,7 +1973,9 @@ static void MEI_module_exit (void)
              ("MEI_DRV: Chipset Basic Exit failed" MEI_DRV_CRLF));
     }
  
@@ -54,7 +74,18 @@
  
     /* touch one time this variable to avoid that the linker will remove it */
     debug_level = MEI_DRV_PRN_LEVEL_OFF;
-@@ -2120,21 +2126,32 @@ static int MEI_InitModuleBasics(void)
+@@ -2080,6 +2092,10 @@ static int MEI_InitModuleRegCharDev(cons
+             ("Using major number %d" MEI_DRV_CRLF, major_number));
+    }
+ 
++   mei_class = class_create(THIS_MODULE, devName);
++   mei_devt = MKDEV(major_number, 0);
++   device_create(mei_class, NULL, mei_devt, NULL, "%s/%i", devName, 0);
++
+    return 0;
+ #endif      /* CONFIG_DEVFS_FS */
+ }
+@@ -2120,21 +2136,32 @@ static int MEI_InitModuleBasics(void)
  }
  
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0))
@@ -87,7 +118,7 @@
  
     return 0;
  }
-@@ -2454,11 +2471,15 @@ IFX_int32_t MEI_IoctlInitDevice(
+@@ -2454,11 +2481,15 @@ IFX_int32_t MEI_IoctlInitDevice(
              pMeiDev->eModePoll = e_MEI_DEV_ACCESS_MODE_IRQ;
              pMeiDev->intMask   = ME_ARC2ME_INTERRUPT_UNMASK_ALL;
  
diff --git a/package/kernel/lantiq/ltq-vdsl-mei/patches/101_no-date-time.patch b/package/kernel/lantiq/ltq-vdsl-mei/patches/101_no-date-time.patch
index 219243ff77..88e39ab5e5 100644
--- a/package/kernel/lantiq/ltq-vdsl-mei/patches/101_no-date-time.patch
+++ b/package/kernel/lantiq/ltq-vdsl-mei/patches/101_no-date-time.patch
@@ -1,6 +1,6 @@
 --- a/src/drv_mei_cpe_linux.c
 +++ b/src/drv_mei_cpe_linux.c
-@@ -1400,8 +1400,8 @@ struct proc_entry {
+@@ -1402,8 +1402,8 @@ struct proc_entry {
  static void MEI_GetVersionProc(struct seq_file *s)
  {
     seq_printf(s, "%s" MEI_DRV_CRLF, &MEI_WHATVERSION[4]);