Skip to contentSkip to conversation

ep93xx: fix build of vision_ep93xx.c

PATCH New H Hartley Sweeten 2 participants 3 messages Jan 16, 2012 – Jan 18, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Cirrus logic EP93XX Arm architecture
lore
Share & tools
lore

H Hartley Sweeten

author
#0 lore raw

PATCH 1/1 ep93xx: fix build of vision_ep93xx.c

Fix build breakage due to the following commits:

Commit bd5f12a24766c1f299def0a78b008d4746f528f2
ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics

Commit 257af9f9725aa8a863b306659208a031135d59e7
ARM: 7041/1: gpio-ep93xx: hookup the to_irq callback in the driver

The vision_ep9307 machine uses the ep93xx build-in gpios and needs to include <mach/gpio-ep93xx.h> to pickup the defines.

The gpio_to_irq() call is now a callback to the gpio-ep93xx.c driver and cannot be used as a constant initializer for the .irq member of struct i2c_board_info.

Signed-off-by Hartley Sweeten <[email protected]>
Cc Ryan Mallon <[email protected]>

---

arch/arm/mach-ep93xx/vision_ep9307.c +3 -1
index 03dd401..d5fb44f 100644
@@ -32,6 +32,7 @@
 #include <mach/hardware.h>
 #include <mach/fb.h>
 #include <mach/ep93xx_spi.h>
+#include <mach/gpio-ep93xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>

@@ -153,7 +154,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = {
 	}, {
 		I2C_BOARD_INFO("pca9539", 0x74),
 		.platform_data	= &pca953x_74_gpio_data,
-		.irq		= gpio_to_irq(EP93XX_GPIO_LINE_F(7)),
 	}, {
 		I2C_BOARD_INFO("pca9539", 0x75),
 		.platform_data	= &pca953x_75_gpio_data,

@@ -348,6 +348,8 @@ static void __init vision_init_machine(void)
 				"pca9539:74"))
 		pr_warn("cannot request interrupt gpio for pca9539:74\n");
 
+	vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7));
+
 	ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info,
 				ARRAY_SIZE(vision_i2c_info));
 	ep93xx_register_spi(&vision_spi_master, vision_spi_board_info,
#1 lore raw

PATCH 1/1 ep93xx: fix build of vision_ep93xx.c

Quoted 11 lines · H Hartley Sweeten

Fix build breakage due to the following commits:

Commit bd5f12a24766c1f299def0a78b008d4746f528f2
ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics

Commit 257af9f9725aa8a863b306659208a031135d59e7
ARM: 7041/1: gpio-ep93xx: hookup the to_irq callback in the driver

The vision_ep9307 machine uses the ep93xx build-in gpios and needs to include <mach/gpio-ep93xx.h> to pickup the defines.

Quoted 6 lines

The gpio_to_irq() call is now a callback to the gpio-ep93xx.c driver and cannot be used as a constant initializer for the .irq member of struct i2c_board_info.

Signed-off-by Hartley Sweeten <[email protected]>
Cc Ryan Mallon <[email protected]>

Hi Hartley,

Sorry for the delay. This looks correct to me.

Acked-by Ryan Mallon <[email protected]>
Quoted 37 lines

---

arch/arm/mach-ep93xx/vision_ep9307.c +3 -1
index 03dd401..d5fb44f 100644
@@ -32,6 +32,7 @@
 #include <mach/hardware.h>
 #include <mach/fb.h>
 #include <mach/ep93xx_spi.h>
+#include <mach/gpio-ep93xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>

@@ -153,7 +154,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = {
 	}, {
 		I2C_BOARD_INFO("pca9539", 0x74),
 		.platform_data	= &pca953x_74_gpio_data,
-		.irq		= gpio_to_irq(EP93XX_GPIO_LINE_F(7)),
 	}, {
 		I2C_BOARD_INFO("pca9539", 0x75),
 		.platform_data	= &pca953x_75_gpio_data,

@@ -348,6 +348,8 @@ static void __init vision_init_machine(void)
 				"pca9539:74"))
 		pr_warn("cannot request interrupt gpio for pca9539:74\n");
 
+	vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7));
+
 	ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info,
 				ARRAY_SIZE(vision_i2c_info));
 	ep93xx_register_spi(&vision_spi_master, vision_spi_board_info,

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author
#2 lore raw

PATCH 1/1 ep93xx: fix build of vision_ep93xx.c

Quoted 20 lines · Ryan Mallon
Quoted 11 lines · H Hartley Sweeten

Fix build breakage due to the following commits:

Commit bd5f12a24766c1f299def0a78b008d4746f528f2
ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics

Commit 257af9f9725aa8a863b306659208a031135d59e7
ARM: 7041/1: gpio-ep93xx: hookup the to_irq callback in the driver

The vision_ep9307 machine uses the ep93xx build-in gpios and needs to include <mach/gpio-ep93xx.h> to pickup the defines.

Quoted 6 lines

The gpio_to_irq() call is now a callback to the gpio-ep93xx.c driver and cannot be used as a constant initializer for the .irq member of struct i2c_board_info.

Signed-off-by Hartley Sweeten <[email protected]>
Cc Ryan Mallon <[email protected]>
Quoted 5 lines

Hi Hartley,

Sorry for the delay. This looks correct to me.

Acked-by Ryan Mallon <[email protected]>

Thanks.

Should this go through Russell's patch system or the arm-soc tree? If it's the arm-soc tree do you know to get a patch to them?

Regards,
Hartley