ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-26 17:01:14 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
064d4a8083
openwrt/package/kernel/lantiq/ltq-adsl/patches/120-platform.patch

72 lines
1.8 KiB
Diff
Raw Normal View History

lantiq: ltq-adsl: Do not leak user space CFLAGS into kernel space Do not leak the user space CFLAGS into the kernel space any more, this allows us to activate the MIPS16 build. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2018-03-03 00:38:50 +00:00
--- a/src/common/drv_dsl_cpe_os_linux.c
+++ b/src/common/drv_dsl_cpe_os_linux.c
ltq-adsl: fix compilation with Linux 5.0+ Upstream commit e4b92b108c6cd6 ("timekeeping: remove obsolete time accessors") removed do_gettimeofday(). In Linux 4.19 this was only a wrapper around ktime_get_real_ts64(). Use ktime_get_real_ts64() now that the wrapper is gone to fix compilation against Linux 5.4. Move the ifxmips_mei_interface header to the include directory, it can't be found otherwise during compilation. The reason for the changed behaviour is not yet clear, however having header files in an include directory is more straight forward. To use the of_device_id struct, the mod_devicetable header need to be included. Instead of including this header, include the of_platform header, which includes the mod_devicetable on its own. Signed-off-by: Mathias Kresin <dev@kresin.me>
2020-03-03 23:39:59 +00:00
@@ -11,7 +11,7 @@
#ifdef __LINUX__
move ltq-adsl SVN-Revision: 34693
2012-12-15 02:00:33 +00:00
#define DSL_INTERN
ltq-adsl: fix compilation with Linux 5.0+ Upstream commit e4b92b108c6cd6 ("timekeeping: remove obsolete time accessors") removed do_gettimeofday(). In Linux 4.19 this was only a wrapper around ktime_get_real_ts64(). Use ktime_get_real_ts64() now that the wrapper is gone to fix compilation against Linux 5.4. Move the ifxmips_mei_interface header to the include directory, it can't be found otherwise during compilation. The reason for the changed behaviour is not yet clear, however having header files in an include directory is more straight forward. To use the of_device_id struct, the mod_devicetable header need to be included. Instead of including this header, include the of_platform header, which includes the mod_devicetable on its own. Signed-off-by: Mathias Kresin <dev@kresin.me>
2020-03-03 23:39:59 +00:00
-#include <linux/device.h>
+#include <linux/of_platform.h>
move ltq-adsl SVN-Revision: 34693
2012-12-15 02:00:33 +00:00
#include "drv_dsl_cpe_api.h"
#include "drv_dsl_cpe_api_ioctl.h"
ltq-adsl: fix compilation with Linux 5.0+ Upstream commit e4b92b108c6cd6 ("timekeeping: remove obsolete time accessors") removed do_gettimeofday(). In Linux 4.19 this was only a wrapper around ktime_get_real_ts64(). Use ktime_get_real_ts64() now that the wrapper is gone to fix compilation against Linux 5.4. Move the ifxmips_mei_interface header to the include directory, it can't be found otherwise during compilation. The reason for the changed behaviour is not yet clear, however having header files in an include directory is more straight forward. To use the of_device_id struct, the mod_devicetable header need to be included. Instead of including this header, include the of_platform header, which includes the mod_devicetable on its own. Signed-off-by: Mathias Kresin <dev@kresin.me>
2020-03-03 23:39:59 +00:00
@@ -1070,7 +1070,7 @@ static void DSL_DRV_DebugInit(void)
move ltq-adsl SVN-Revision: 34693
2012-12-15 02:00:33 +00:00
#endif
/* Entry point of driver */
-int __init DSL_ModuleInit(void)
+static int __devinit ltq_adsl_probe(struct platform_device *pdev)
{
struct class *dsl_class;
DSL_int_t i;
ltq-adsl: fix compilation with Linux 5.0+ Upstream commit e4b92b108c6cd6 ("timekeeping: remove obsolete time accessors") removed do_gettimeofday(). In Linux 4.19 this was only a wrapper around ktime_get_real_ts64(). Use ktime_get_real_ts64() now that the wrapper is gone to fix compilation against Linux 5.4. Move the ifxmips_mei_interface header to the include directory, it can't be found otherwise during compilation. The reason for the changed behaviour is not yet clear, however having header files in an include directory is more straight forward. To use the of_device_id struct, the mod_devicetable header need to be included. Instead of including this header, include the of_platform header, which includes the mod_devicetable on its own. Signed-off-by: Mathias Kresin <dev@kresin.me>
2020-03-03 23:39:59 +00:00
@@ -1124,7 +1124,7 @@ int __init DSL_ModuleInit(void)
move ltq-adsl SVN-Revision: 34693
2012-12-15 02:00:33 +00:00
return 0;
}
-void __exit DSL_ModuleCleanup(void)
+static int __devexit ltq_adsl_remove(struct platform_device *pdev)
{
printk("Module will be unloaded"DSL_DRV_CRLF);
ltq-adsl: fix compilation with Linux 5.0+ Upstream commit e4b92b108c6cd6 ("timekeeping: remove obsolete time accessors") removed do_gettimeofday(). In Linux 4.19 this was only a wrapper around ktime_get_real_ts64(). Use ktime_get_real_ts64() now that the wrapper is gone to fix compilation against Linux 5.4. Move the ifxmips_mei_interface header to the include directory, it can't be found otherwise during compilation. The reason for the changed behaviour is not yet clear, however having header files in an include directory is more straight forward. To use the of_device_id struct, the mod_devicetable header need to be included. Instead of including this header, include the of_platform header, which includes the mod_devicetable on its own. Signed-off-by: Mathias Kresin <dev@kresin.me>
2020-03-03 23:39:59 +00:00
@@ -1139,7 +1139,7 @@ void __exit DSL_ModuleCleanup(void)
move ltq-adsl SVN-Revision: 34693
2012-12-15 02:00:33 +00:00
(DSL_uint8_t**)&g_BndFpgaBase);
#endif /* defined(INCLUDE_DSL_CPE_API_VINAX) && defined(INCLUDE_DSL_BONDING)*/
- return;
+ return 0;
}
#ifndef _lint
ltq-adsl: fix compilation with Linux 5.0+ Upstream commit e4b92b108c6cd6 ("timekeeping: remove obsolete time accessors") removed do_gettimeofday(). In Linux 4.19 this was only a wrapper around ktime_get_real_ts64(). Use ktime_get_real_ts64() now that the wrapper is gone to fix compilation against Linux 5.4. Move the ifxmips_mei_interface header to the include directory, it can't be found otherwise during compilation. The reason for the changed behaviour is not yet clear, however having header files in an include directory is more straight forward. To use the of_device_id struct, the mod_devicetable header need to be included. Instead of including this header, include the of_platform header, which includes the mod_devicetable on its own. Signed-off-by: Mathias Kresin <dev@kresin.me>
2020-03-03 23:39:59 +00:00
@@ -1155,8 +1155,30 @@ module_param(debug_level, byte, 0);
move ltq-adsl SVN-Revision: 34693
2012-12-15 02:00:33 +00:00
MODULE_PARM_DESC(debug_level, "set to get more (1) or fewer (4) debug outputs");
#endif /* #ifndef DSL_DEBUG_DISABLE*/
-module_init(DSL_ModuleInit);
-module_exit(DSL_ModuleCleanup);
+static const struct of_device_id ltq_adsl_match[] = {
+#ifdef CONFIG_DANUBE
+ { .compatible = "lantiq,adsl-danube"},
+#elif defined CONFIG_AMAZON_SE
+ { .compatible = "lantiq,adsl-ase"},
+#elif defined CONFIG_AR9
+ { .compatible = "lantiq,adsl-arx100"},
+#endif
+ {},
+};
+MODULE_DEVICE_TABLE(of, ltq_adsl_match);
+
+static struct platform_driver ltq_adsl_driver = {
+ .probe = ltq_adsl_probe,
+ .remove = __devexit_p(ltq_adsl_remove),
+ .driver = {
+ .name = "adsl",
+ .owner = THIS_MODULE,
+ .of_match_table = ltq_adsl_match,
+ },
+};
+
+module_platform_driver(ltq_adsl_driver);
+
#endif /* #ifndef _lint*/
//EXPORT_SYMBOL(DSL_ModuleInit);
Reference in New Issue Copy Permalink