vpu_service: change compile mode to module

diff --git a/arch/arm/mach-rk29/clock.c b/arch/arm/mach-rk29/clock.c
index f9fdc9985bd285ccd26fa2e59d8567e364b3aeee..c28a83bfb10bc10c0c464ea25d50c0a540e2472d 100755 (executable)
--- a/arch/arm/mach-rk29/clock.c
+++ b/arch/arm/mach-rk29/clock.c
@@ -292,6 +292,7 @@ void cru_set_soft_reset(enum cru_soft_reset idx, bool on)
 
        local_irq_restore(flags);
 }
+EXPORT_SYMBOL(cru_set_soft_reset);
 
 static struct clk xin24m = {
        .name           = "xin24m",

diff --git a/arch/arm/mach-rk29/vpu_mem.c b/arch/arm/mach-rk29/vpu_mem.c
index 898dee3d6fbb960d112ed48142e7f6d0455554f4..1cf2436f10268ded9b9a02e19e6197dff69a21bd 100644 (file)
--- a/arch/arm/mach-rk29/vpu_mem.c
+++ b/arch/arm/mach-rk29/vpu_mem.c
@@ -1394,9 +1394,10 @@ static struct platform_driver vpu_mem_driver = {
        .driver = { .name = "vpu_mem" }\r
 };\r
 \r
-\r
+static int __init vpu_mem_proc_init(void);\r
 static int __init vpu_mem_init(void)\r
 {\r
+       vpu_mem_proc_init();\r
        return platform_driver_register(&vpu_mem_driver);\r
 }\r
 \r
@@ -1516,6 +1517,5 @@ static int __init vpu_mem_proc_init(void)
        return 0;\r
 \r
 }\r
-late_initcall(vpu_mem_proc_init);\r
 #endif /* CONFIG_PROC_FS */\r
 \r

diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig
index caa635d836fa80ac10c5475689b278b2e1d034a7..9b19e420f8324d36c5c10413ab64c727fb23d91e 100644 (file)
--- a/arch/arm/plat-rk/Kconfig
+++ b/arch/arm/plat-rk/Kconfig
@@ -106,9 +106,9 @@ config WIFI_CONTROL_FUNC
           Enables Power/Reset/Carddetect function abstraction
 
 config RK29_VPU
-       bool "VPU (Video Processing Unit) service driver in kernel"
+       tristate "VPU (Video Processing Unit) service driver in kernel"
        depends on ARCH_RK29 || ARCH_RK30
-       default y
+       default m
 
 config RK29_LAST_LOG
        bool "Save the last kernel log on /proc/last_log"

diff --git a/arch/arm/plat-rk/vpu_service.c b/arch/arm/plat-rk/vpu_service.c
index 4b0c85ad47206cfe77dafbadb6e3ad1c5d4b8710..fd30e17c58e02267e689f090a29f003b4b7e2aad 100644 (file)
--- a/arch/arm/plat-rk/vpu_service.c
+++ b/arch/arm/plat-rk/vpu_service.c
@@ -1126,6 +1126,7 @@ static irqreturn_t vepu_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
+static int __init vpu_service_proc_init(void);
 static int __init vpu_service_init(void)
 {
        int ret;
@@ -1183,6 +1184,7 @@ static int __init vpu_service_init(void)
        vpu_service_power_off();
        pr_info("init success\n");
 
+       vpu_service_proc_init();
        return 0;
 
 err_register:
@@ -1214,7 +1216,6 @@ static void __exit vpu_service_exit(void)
 
 module_init(vpu_service_init);
 module_exit(vpu_service_exit);
-MODULE_LICENSE("GPL");
 
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
@@ -1277,6 +1278,5 @@ static int __init vpu_service_proc_init(void)
        return 0;
 
 }
-late_initcall(vpu_service_proc_init);
 #endif /* CONFIG_PROC_FS */