Commit 955c9863 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt

sh: convert processor device setup functions to arch_initcall()

Convert the processor platform device setup
functions from __initcall() and sometimes
device_initcall() to arch_initcall().

This makes sure that the platform devices are
registered a bit earlier so the devices are
available when drivers register using initcall
levels earlier than device_initcall().

A good example is platform devices needed by
i2c-sh_mobile.c which registers a bit earlier
using subsys_initcall().
Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c690be1c
...@@ -187,7 +187,7 @@ static int __init sh7619_devices_setup(void) ...@@ -187,7 +187,7 @@ static int __init sh7619_devices_setup(void)
return platform_add_devices(sh7619_devices, return platform_add_devices(sh7619_devices,
ARRAY_SIZE(sh7619_devices)); ARRAY_SIZE(sh7619_devices));
} }
__initcall(sh7619_devices_setup); arch_initcall(sh7619_devices_setup);
void __init plat_irq_setup(void) void __init plat_irq_setup(void)
{ {
......
...@@ -238,7 +238,7 @@ static int __init mxg_devices_setup(void) ...@@ -238,7 +238,7 @@ static int __init mxg_devices_setup(void)
return platform_add_devices(mxg_devices, return platform_add_devices(mxg_devices,
ARRAY_SIZE(mxg_devices)); ARRAY_SIZE(mxg_devices));
} }
__initcall(mxg_devices_setup); arch_initcall(mxg_devices_setup);
void __init plat_irq_setup(void) void __init plat_irq_setup(void)
{ {
......
...@@ -357,7 +357,7 @@ static int __init sh7201_devices_setup(void) ...@@ -357,7 +357,7 @@ static int __init sh7201_devices_setup(void)
return platform_add_devices(sh7201_devices, return platform_add_devices(sh7201_devices,
ARRAY_SIZE(sh7201_devices)); ARRAY_SIZE(sh7201_devices));
} }
__initcall(sh7201_devices_setup); arch_initcall(sh7201_devices_setup);
void __init plat_irq_setup(void) void __init plat_irq_setup(void)
{ {
......
...@@ -367,7 +367,7 @@ static int __init sh7203_devices_setup(void) ...@@ -367,7 +367,7 @@ static int __init sh7203_devices_setup(void)
return platform_add_devices(sh7203_devices, return platform_add_devices(sh7203_devices,
ARRAY_SIZE(sh7203_devices)); ARRAY_SIZE(sh7203_devices));
} }
__initcall(sh7203_devices_setup); arch_initcall(sh7203_devices_setup);
void __init plat_irq_setup(void) void __init plat_irq_setup(void)
{ {
......
...@@ -338,7 +338,7 @@ static int __init sh7206_devices_setup(void) ...@@ -338,7 +338,7 @@ static int __init sh7206_devices_setup(void)
return platform_add_devices(sh7206_devices, return platform_add_devices(sh7206_devices,
ARRAY_SIZE(sh7206_devices)); ARRAY_SIZE(sh7206_devices));
} }
__initcall(sh7206_devices_setup); arch_initcall(sh7206_devices_setup);
void __init plat_irq_setup(void) void __init plat_irq_setup(void)
{ {
......
...@@ -222,7 +222,7 @@ static int __init sh7705_devices_setup(void) ...@@ -222,7 +222,7 @@ static int __init sh7705_devices_setup(void)
return platform_add_devices(sh7705_devices, return platform_add_devices(sh7705_devices,
ARRAY_SIZE(sh7705_devices)); ARRAY_SIZE(sh7705_devices));
} }
__initcall(sh7705_devices_setup); arch_initcall(sh7705_devices_setup);
static struct platform_device *sh7705_early_devices[] __initdata = { static struct platform_device *sh7705_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -250,7 +250,7 @@ static int __init sh770x_devices_setup(void) ...@@ -250,7 +250,7 @@ static int __init sh770x_devices_setup(void)
return platform_add_devices(sh770x_devices, return platform_add_devices(sh770x_devices,
ARRAY_SIZE(sh770x_devices)); ARRAY_SIZE(sh770x_devices));
} }
__initcall(sh770x_devices_setup); arch_initcall(sh770x_devices_setup);
static struct platform_device *sh770x_early_devices[] __initdata = { static struct platform_device *sh770x_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -226,7 +226,7 @@ static int __init sh7710_devices_setup(void) ...@@ -226,7 +226,7 @@ static int __init sh7710_devices_setup(void)
return platform_add_devices(sh7710_devices, return platform_add_devices(sh7710_devices,
ARRAY_SIZE(sh7710_devices)); ARRAY_SIZE(sh7710_devices));
} }
__initcall(sh7710_devices_setup); arch_initcall(sh7710_devices_setup);
static struct platform_device *sh7710_early_devices[] __initdata = { static struct platform_device *sh7710_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -388,7 +388,7 @@ static int __init sh7720_devices_setup(void) ...@@ -388,7 +388,7 @@ static int __init sh7720_devices_setup(void)
return platform_add_devices(sh7720_devices, return platform_add_devices(sh7720_devices,
ARRAY_SIZE(sh7720_devices)); ARRAY_SIZE(sh7720_devices));
} }
__initcall(sh7720_devices_setup); arch_initcall(sh7720_devices_setup);
static struct platform_device *sh7720_early_devices[] __initdata = { static struct platform_device *sh7720_early_devices[] __initdata = {
&cmt0_device, &cmt0_device,
......
...@@ -138,7 +138,7 @@ static int __init sh4202_devices_setup(void) ...@@ -138,7 +138,7 @@ static int __init sh4202_devices_setup(void)
return platform_add_devices(sh4202_devices, return platform_add_devices(sh4202_devices,
ARRAY_SIZE(sh4202_devices)); ARRAY_SIZE(sh4202_devices));
} }
__initcall(sh4202_devices_setup); arch_initcall(sh4202_devices_setup);
static struct platform_device *sh4202_early_devices[] __initdata = { static struct platform_device *sh4202_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -239,7 +239,7 @@ static int __init sh7750_devices_setup(void) ...@@ -239,7 +239,7 @@ static int __init sh7750_devices_setup(void)
return platform_add_devices(sh7750_devices, return platform_add_devices(sh7750_devices,
ARRAY_SIZE(sh7750_devices)); ARRAY_SIZE(sh7750_devices));
} }
__initcall(sh7750_devices_setup); arch_initcall(sh7750_devices_setup);
static struct platform_device *sh7750_early_devices[] __initdata = { static struct platform_device *sh7750_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -265,7 +265,7 @@ static int __init sh7760_devices_setup(void) ...@@ -265,7 +265,7 @@ static int __init sh7760_devices_setup(void)
return platform_add_devices(sh7760_devices, return platform_add_devices(sh7760_devices,
ARRAY_SIZE(sh7760_devices)); ARRAY_SIZE(sh7760_devices));
} }
__initcall(sh7760_devices_setup); arch_initcall(sh7760_devices_setup);
static struct platform_device *sh7760_early_devices[] __initdata = { static struct platform_device *sh7760_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -325,7 +325,7 @@ static int __init sh7343_devices_setup(void) ...@@ -325,7 +325,7 @@ static int __init sh7343_devices_setup(void)
return platform_add_devices(sh7343_devices, return platform_add_devices(sh7343_devices,
ARRAY_SIZE(sh7343_devices)); ARRAY_SIZE(sh7343_devices));
} }
__initcall(sh7343_devices_setup); arch_initcall(sh7343_devices_setup);
static struct platform_device *sh7343_early_devices[] __initdata = { static struct platform_device *sh7343_early_devices[] __initdata = {
&cmt_device, &cmt_device,
......
...@@ -318,7 +318,7 @@ static int __init sh7366_devices_setup(void) ...@@ -318,7 +318,7 @@ static int __init sh7366_devices_setup(void)
return platform_add_devices(sh7366_devices, return platform_add_devices(sh7366_devices,
ARRAY_SIZE(sh7366_devices)); ARRAY_SIZE(sh7366_devices));
} }
__initcall(sh7366_devices_setup); arch_initcall(sh7366_devices_setup);
static struct platform_device *sh7366_early_devices[] __initdata = { static struct platform_device *sh7366_early_devices[] __initdata = {
&cmt_device, &cmt_device,
......
...@@ -365,7 +365,7 @@ static int __init sh7722_devices_setup(void) ...@@ -365,7 +365,7 @@ static int __init sh7722_devices_setup(void)
return platform_add_devices(sh7722_devices, return platform_add_devices(sh7722_devices,
ARRAY_SIZE(sh7722_devices)); ARRAY_SIZE(sh7722_devices));
} }
__initcall(sh7722_devices_setup); arch_initcall(sh7722_devices_setup);
static struct platform_device *sh7722_early_devices[] __initdata = { static struct platform_device *sh7722_early_devices[] __initdata = {
&cmt_device, &cmt_device,
......
...@@ -473,7 +473,7 @@ static int __init sh7723_devices_setup(void) ...@@ -473,7 +473,7 @@ static int __init sh7723_devices_setup(void)
return platform_add_devices(sh7723_devices, return platform_add_devices(sh7723_devices,
ARRAY_SIZE(sh7723_devices)); ARRAY_SIZE(sh7723_devices));
} }
__initcall(sh7723_devices_setup); arch_initcall(sh7723_devices_setup);
static struct platform_device *sh7723_early_devices[] __initdata = { static struct platform_device *sh7723_early_devices[] __initdata = {
&cmt_device, &cmt_device,
......
...@@ -508,7 +508,7 @@ static int __init sh7724_devices_setup(void) ...@@ -508,7 +508,7 @@ static int __init sh7724_devices_setup(void)
return platform_add_devices(sh7724_devices, return platform_add_devices(sh7724_devices,
ARRAY_SIZE(sh7724_devices)); ARRAY_SIZE(sh7724_devices));
} }
device_initcall(sh7724_devices_setup); arch_initcall(sh7724_devices_setup);
static struct platform_device *sh7724_early_devices[] __initdata = { static struct platform_device *sh7724_early_devices[] __initdata = {
&cmt_device, &cmt_device,
......
...@@ -314,7 +314,7 @@ static int __init sh7763_devices_setup(void) ...@@ -314,7 +314,7 @@ static int __init sh7763_devices_setup(void)
return platform_add_devices(sh7763_devices, return platform_add_devices(sh7763_devices,
ARRAY_SIZE(sh7763_devices)); ARRAY_SIZE(sh7763_devices));
} }
__initcall(sh7763_devices_setup); arch_initcall(sh7763_devices_setup);
static struct platform_device *sh7763_early_devices[] __initdata = { static struct platform_device *sh7763_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -368,7 +368,7 @@ static int __init sh7770_devices_setup(void) ...@@ -368,7 +368,7 @@ static int __init sh7770_devices_setup(void)
return platform_add_devices(sh7770_devices, return platform_add_devices(sh7770_devices,
ARRAY_SIZE(sh7770_devices)); ARRAY_SIZE(sh7770_devices));
} }
__initcall(sh7770_devices_setup); arch_initcall(sh7770_devices_setup);
static struct platform_device *sh7770_early_devices[] __initdata = { static struct platform_device *sh7770_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -256,7 +256,7 @@ static int __init sh7780_devices_setup(void) ...@@ -256,7 +256,7 @@ static int __init sh7780_devices_setup(void)
return platform_add_devices(sh7780_devices, return platform_add_devices(sh7780_devices,
ARRAY_SIZE(sh7780_devices)); ARRAY_SIZE(sh7780_devices));
} }
__initcall(sh7780_devices_setup); arch_initcall(sh7780_devices_setup);
static struct platform_device *sh7780_early_devices[] __initdata = { static struct platform_device *sh7780_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -263,7 +263,7 @@ static int __init sh7785_devices_setup(void) ...@@ -263,7 +263,7 @@ static int __init sh7785_devices_setup(void)
return platform_add_devices(sh7785_devices, return platform_add_devices(sh7785_devices,
ARRAY_SIZE(sh7785_devices)); ARRAY_SIZE(sh7785_devices));
} }
__initcall(sh7785_devices_setup); arch_initcall(sh7785_devices_setup);
static struct platform_device *sh7785_early_devices[] __initdata = { static struct platform_device *sh7785_early_devices[] __initdata = {
&tmu0_device, &tmu0_device,
......
...@@ -547,7 +547,7 @@ static int __init sh7786_devices_setup(void) ...@@ -547,7 +547,7 @@ static int __init sh7786_devices_setup(void)
return platform_add_devices(sh7786_devices, return platform_add_devices(sh7786_devices,
ARRAY_SIZE(sh7786_devices)); ARRAY_SIZE(sh7786_devices));
} }
device_initcall(sh7786_devices_setup); arch_initcall(sh7786_devices_setup);
void __init plat_early_device_setup(void) void __init plat_early_device_setup(void)
{ {
......
...@@ -256,7 +256,7 @@ static int __init shx3_devices_setup(void) ...@@ -256,7 +256,7 @@ static int __init shx3_devices_setup(void)
return platform_add_devices(shx3_devices, return platform_add_devices(shx3_devices,
ARRAY_SIZE(shx3_devices)); ARRAY_SIZE(shx3_devices));
} }
__initcall(shx3_devices_setup); arch_initcall(shx3_devices_setup);
void __init plat_early_device_setup(void) void __init plat_early_device_setup(void)
{ {
......
...@@ -186,7 +186,7 @@ static int __init sh5_devices_setup(void) ...@@ -186,7 +186,7 @@ static int __init sh5_devices_setup(void)
return platform_add_devices(sh5_devices, return platform_add_devices(sh5_devices,
ARRAY_SIZE(sh5_devices)); ARRAY_SIZE(sh5_devices));
} }
__initcall(sh5_devices_setup); arch_initcall(sh5_devices_setup);
void __init plat_early_device_setup(void) void __init plat_early_device_setup(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment