117 lines
4.1 KiB
Diff
117 lines
4.1 KiB
Diff
|
--- a/arch/arm/plat-omap/omap_device.c
|
||
|
|
+++ b/arch/arm/plat-omap/omap_device.c
|
||
|
|
@@ -619,7 +619,7 @@ static void omap_device_delete(struct om
|
||
|
|
* information. Returns ERR_PTR(-EINVAL) if @oh is NULL; otherwise,
|
||
|
|
* passes along the return value of omap_device_build_ss().
|
||
|
|
*/
|
||
|
|
-struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
|
||
|
|
+struct platform_device *__init omap_device_build(const char *pdev_name, int pdev_id,
|
||
|
|
struct omap_hwmod *oh, void *pdata,
|
||
|
|
int pdata_len,
|
||
|
|
struct omap_device_pm_latency *pm_lats,
|
||
|
|
@@ -652,7 +652,7 @@ struct platform_device *omap_device_buil
|
||
|
|
* platform_device record. Returns an ERR_PTR() on error, or passes
|
||
|
|
* along the return value of omap_device_register().
|
||
|
|
*/
|
||
|
|
-struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
|
||
|
|
+struct platform_device *__init omap_device_build_ss(const char *pdev_name, int pdev_id,
|
||
|
|
struct omap_hwmod **ohs, int oh_cnt,
|
||
|
|
void *pdata, int pdata_len,
|
||
|
|
struct omap_device_pm_latency *pm_lats,
|
||
|
|
@@ -717,7 +717,7 @@ odbs_exit:
|
||
|
|
* platform_early_add_device() on the underlying platform_device.
|
||
|
|
* Returns 0 by default.
|
||
|
|
*/
|
||
|
|
-static int omap_early_device_register(struct platform_device *pdev)
|
||
|
|
+static int __init omap_early_device_register(struct platform_device *pdev)
|
||
|
|
{
|
||
|
|
struct platform_device *devices[1];
|
||
|
|
|
||
|
|
--- a/arch/arm/plat-omap/common.c
|
||
|
|
+++ b/arch/arm/plat-omap/common.c
|
||
|
|
@@ -29,7 +29,7 @@
|
||
|
|
|
||
|
|
#define NO_LENGTH_CHECK 0xffffffff
|
||
|
|
|
||
|
|
-struct omap_board_config_kernel *omap_board_config __initdata;
|
||
|
|
+struct omap_board_config_kernel *omap_board_config;
|
||
|
|
int omap_board_config_size;
|
||
|
|
|
||
|
|
unsigned char omap_bootloader_tag[1024];
|
||
|
|
@@ -58,7 +58,7 @@ __tagtable(ATAG_BOARD, parse_tag_omap);
|
||
|
|
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-static const void *__init get_config(u16 tag, size_t len,
|
||
|
|
+static const void *get_config(u16 tag, size_t len,
|
||
|
|
int skip, size_t *len_out)
|
||
|
|
{
|
||
|
|
struct omap_board_config_kernel *kinfo = NULL;
|
||
|
|
@@ -125,12 +125,12 @@ static const void *__init get_config(u16
|
||
|
|
return kinfo->data;
|
||
|
|
}
|
||
|
|
|
||
|
|
-const void *__init __omap_get_config(u16 tag, size_t len, int nr)
|
||
|
|
+const void *__omap_get_config(u16 tag, size_t len, int nr)
|
||
|
|
{
|
||
|
|
return get_config(tag, len, nr, NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
-const void *__init omap_get_var_config(u16 tag, size_t *len)
|
||
|
|
+const void *omap_get_var_config(u16 tag, size_t *len)
|
||
|
|
{
|
||
|
|
return get_config(tag, NO_LENGTH_CHECK, 0, len);
|
||
|
|
}
|
||
|
|
--- a/arch/arm/mach-omap2/devices.c
|
||
|
|
+++ b/arch/arm/mach-omap2/devices.c
|
||
|
|
@@ -380,7 +380,7 @@ static inline void omap_init_dmic(void)
|
||
|
|
|
||
|
|
#include <plat/mcspi.h>
|
||
|
|
|
||
|
|
-static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)
|
||
|
|
+static int __init omap_mcspi_init(struct omap_hwmod *oh, void *unused)
|
||
|
|
{
|
||
|
|
struct platform_device *pdev;
|
||
|
|
char *name = "omap2_mcspi";
|
||
|
|
--- a/arch/arm/mach-omap2/gpio.c
|
||
|
|
+++ b/arch/arm/mach-omap2/gpio.c
|
||
|
|
@@ -24,7 +24,7 @@
|
||
|
|
#include <plat/omap_hwmod.h>
|
||
|
|
#include <plat/omap_device.h>
|
||
|
|
|
||
|
|
-static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
|
||
|
|
+static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
|
||
|
|
{
|
||
|
|
struct platform_device *pdev;
|
||
|
|
struct omap_gpio_platform_data *pdata;
|
||
|
|
--- a/arch/arm/mach-omap2/mcbsp.c
|
||
|
|
+++ b/arch/arm/mach-omap2/mcbsp.c
|
||
|
|
@@ -122,7 +122,7 @@ static int omap3_enable_st_clock(unsigne
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
|
||
|
|
+static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
|
||
|
|
{
|
||
|
|
int id, count = 1;
|
||
|
|
char *name = "omap-mcbsp";
|
||
|
|
--- a/arch/arm/plat-omap/include/plat/board.h
|
||
|
|
+++ b/arch/arm/plat-omap/include/plat/board.h
|
||
|
|
@@ -159,14 +159,14 @@ struct omap_gpio_switch_config {
|
||
|
|
int key_code:24; /* Linux key code */
|
||
|
|
};
|
||
|
|
|
||
|
|
-extern const void *__init __omap_get_config(u16 tag, size_t len, int nr);
|
||
|
|
+extern const void * __omap_get_config(u16 tag, size_t len, int nr);
|
||
|
|
|
||
|
|
#define omap_get_config(tag, type) \
|
||
|
|
((const type *) __omap_get_config((tag), sizeof(type), 0))
|
||
|
|
#define omap_get_nr_config(tag, type, nr) \
|
||
|
|
((const type *) __omap_get_config((tag), sizeof(type), (nr)))
|
||
|
|
|
||
|
|
-extern const void *__init omap_get_var_config(u16 tag, size_t *len);
|
||
|
|
+extern const void * omap_get_var_config(u16 tag, size_t *len);
|
||
|
|
|
||
|
|
extern struct omap_board_config_kernel *omap_board_config;
|
||
|
|
extern int omap_board_config_size;
|