[PATCH] sh: fix i2c init order on Migo-R

[PATCH] sh: fix i2c init order on Migo-R

[Magnus Damm]

From: Magnus Damm <damm@igel.co.jp>

Convert the Migo-R board code to register i2c devices from
arch_initcall() instead of __initcall(). This fix unbreaks
migor_ts touch screen driver support.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 Suitable for 2.6.31-rc.

 arch/sh/boards/mach-migor/setup.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- 0001/arch/sh/boards/mach-migor/setup.c
+++ work/arch/sh/boards/mach-migor/setup.c	2009-07-30 17:22:47.000000000 +0900
@@ -405,6 +405,15 @@ static struct i2c_board_info migor_i2c_d
 	},
 };
 
+static int __init migor_devices_i2c_setup(void)
+{
+	i2c_register_board_info(0, migor_i2c_devices,
+				ARRAY_SIZE(migor_i2c_devices));
+
+	return 0;
+}
+arch_initcall(migor_devices_i2c_setup);
+
 static struct i2c_board_info migor_i2c_camera[] = {
 	{
 		I2C_BOARD_INFO("ov772x", 0x21),
@@ -600,9 +609,6 @@ static int __init migor_devices_setup(vo
 
 	platform_resource_setup_memory(&migor_ceu_device, "ceu", 4 << 20);
 
-	i2c_register_board_info(0, migor_i2c_devices,
-				ARRAY_SIZE(migor_i2c_devices));
-
 	spi_register_board_info(migor_spi_devices,
 				ARRAY_SIZE(migor_spi_devices));
 

[PATCH] sh: fix i2c init order on Migo-R V2

[Magnus Damm]

From: Magnus Damm <damm@igel.co.jp>

Convert the Migo-R board code to register devices at
arch_initcall() time instead of __initcall(). This fix
unbreaks migor_ts touch screen driver support.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 Suitable for 2.6.31-rc.

 arch/sh/boards/mach-migor/setup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 0001/arch/sh/boards/mach-migor/setup.c
+++ work/arch/sh/boards/mach-migor/setup.c	2009-08-07 12:09:28.000000000 +0900
@@ -608,7 +608,7 @@ static int __init migor_devices_setup(vo
 
 	return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices));
 }
-__initcall(migor_devices_setup);
+arch_initcall(migor_devices_setup);
 
 /* Return the board specific boot mode pin configuration */
 static int migor_mode_pins(void)

Re: [PATCH] sh: fix i2c init order on Migo-R V2

[Paul Mundt]

On Fri, Aug 07, 2009 at 12:51:05PM +0900, Magnus Damm wrote:
> Convert the Migo-R board code to register devices at
> arch_initcall() time instead of __initcall(). This fix
> unbreaks migor_ts touch screen driver support.

On Fri, Aug 07, 2009 at 12:52:18PM +0900, Magnus Damm wrote:
> Convert the AP325RXA board code to register devices at
> arch_initcall() time instead of device_initcall(). This
> fix unbreaks pcf8563 RTC driver support.

Applied to 2.6.31 queue, thanks.