Skip to contentSkip to conversation

ZOOM2: Rename the zoom2 i2c struct.

PATCH Superseded Dominic Curran 2 participants 3 messages Jan 30, 2009

Subsystems (4)
Arm (32-bit) Media (V4L/DVB) Arm sub-architectures OMAP2+ support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Dominic Curran

author
#0 lore raw

PATCH 5/6 ZOOM2: Rename the zoom2 i2c struct.

From: Dominic Curran <[email protected]>
Subject: [OMAPZOOM][PATCH 5/6] ZOOM2: Rename the zoom2 i2c struct.

Rename i2c structures to something sensible. This patch is not specific for imx046 sensor.
Do this in preparation for i2c changes for imx046 sensor.

Signed-off-by Greg Hofer <[email protected]>
Signed-off-by Dominic Curran <[email protected]>
---
 arch/arm/mach-omap2/board-zoom2.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/board-zoom2.c +7 -7
Index: omapzoom04/arch/arm/mach-omap2/board-zoom2.c
===================================================================
@@ -472,7 +472,7 @@ static struct twl4030_platform_data ldp_
 	.keypad		= &ldp_kp_twl4030_data,
 };
 
-static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = {
+static struct i2c_board_info __initdata zoom2_i2c_bus1_info[] = {
 	{
 		I2C_BOARD_INFO("twl4030", 0x48),
 		.flags = I2C_CLIENT_WAKE,

@@ -507,7 +507,7 @@ static struct synaptics_i2c_rmi_platform
 	.power		= &synaptics_power,
 };
 
-static struct i2c_board_info __initdata ldp3430_i2c_board_info[] = {
+static struct i2c_board_info __initdata zoom2_i2c_bus2_info[] = {
 	{
 		I2C_BOARD_INFO(SYNAPTICS_I2C_RMI_NAME,  SYNAPTICS_I2C_ADDR),
 		.platform_data = &ldp3430_synaptics_platform_data,

@@ -518,12 +518,12 @@ static struct i2c_board_info __initdata 
 
 static int __init omap_i2c_init(void)
 {
-	omap_register_i2c_bus(1, 2600, ldp_i2c_boardinfo,
-			ARRAY_SIZE(ldp_i2c_boardinfo));
+	omap_register_i2c_bus(1, 2600, zoom2_i2c_bus1_info,
+			ARRAY_SIZE(zoom2_i2c_bus1_info));
 #ifdef CONFIG_TOUCHSCREEN_SYNAPTICS
-	ldp3430_i2c_board_info[0].irq = OMAP_GPIO_IRQ(OMAP_SYNAPTICS_GPIO);
-	omap_register_i2c_bus(2, 100, ldp3430_i2c_board_info,
-			ARRAY_SIZE(ldp3430_i2c_board_info));
+	zoom2_i2c_bus2_info[0].irq = OMAP_GPIO_IRQ(OMAP_SYNAPTICS_GPIO);
+	omap_register_i2c_bus(2, 100, zoom2_i2c_bus2_info,
+			ARRAY_SIZE(zoom2_i2c_bus2_info));
 #endif
 	omap_register_i2c_bus(3, 400, NULL, 0);
 	return 0;

--
video4linux-list mailing list
Unsubscribe mailto:[email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

#1 lore raw

Thanks,
Vaibhav Hiremath

Quoted 26 lines

-----Original Message-----
From: [email protected] [mailto:video4linux-list- [email protected]] On Behalf Of Curran, Dominic
Sent: Friday, January 30, 2009 6:24 AM
To: linux-omap; [email protected]
Cc: [email protected]
Subject: [OMAPZOOM][PATCH 5/6] ZOOM2: Rename the zoom2 i2c struct.

From: Dominic Curran <[email protected]>
Subject: [OMAPZOOM][PATCH 5/6] ZOOM2: Rename the zoom2 i2c struct.

Rename i2c structures to something sensible. This patch is not specific for imx046 sensor.
Do this in preparation for i2c changes for imx046 sensor.

Signed-off-by Greg Hofer <[email protected]>
Signed-off-by Dominic Curran <[email protected]>
---
 arch/arm/mach-omap2/board-zoom2.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: omapzoom04/arch/arm/mach-omap2/board-zoom2.c
===================================================================

arch/arm/mach-omap2/board-zoom2.c static struct twl4030_platform_data ldp_ · line 475

Quoted 5 lines
arch/arm/mach-omap2/board-zoom2.c +1 -1
@@ -472,7 +472,7 @@ static struct twl4030_platform_data ldp_
 	.keypad		= &ldp_kp_twl4030_data,
 };
 
-static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = {
+static struct i2c_board_info __initdata zoom2_i2c_bus1_info[] = {

[Hiremath, Vaibhav] I think zoom2_i2c1_info should be sufficient, since i2c1,2,3 itself indicates bus.

Quoted 40 lines
arch/arm/mach-omap2/board-zoom2.c +1 -1
 	{
 		I2C_BOARD_INFO("twl4030", 0x48),
 		.flags = I2C_CLIENT_WAKE,

@@ -507,7 +507,7 @@ static struct synaptics_i2c_rmi_platform
 	.power		= &synaptics_power,
 };
 
-static struct i2c_board_info __initdata ldp3430_i2c_board_info[] =
 {
+static struct i2c_board_info __initdata zoom2_i2c_bus2_info[] = {
 	{
 		I2C_BOARD_INFO(SYNAPTICS_I2C_RMI_NAME,

SYNAPTICS_I2C_ADDR),

arch/arm/mach-omap2/board-zoom2.c +5 -5
 		.platform_data = &ldp3430_synaptics_platform_data,

@@ -518,12 +518,12 @@ static struct i2c_board_info __initdata
 
 static int __init omap_i2c_init(void)
 {
-	omap_register_i2c_bus(1, 2600, ldp_i2c_boardinfo,
-			ARRAY_SIZE(ldp_i2c_boardinfo));
+	omap_register_i2c_bus(1, 2600, zoom2_i2c_bus1_info,
+			ARRAY_SIZE(zoom2_i2c_bus1_info));
 #ifdef CONFIG_TOUCHSCREEN_SYNAPTICS
-	ldp3430_i2c_board_info[0].irq =
 OMAP_GPIO_IRQ(OMAP_SYNAPTICS_GPIO);
-	omap_register_i2c_bus(2, 100, ldp3430_i2c_board_info,
-			ARRAY_SIZE(ldp3430_i2c_board_info));
+	zoom2_i2c_bus2_info[0].irq =
 OMAP_GPIO_IRQ(OMAP_SYNAPTICS_GPIO);
+	omap_register_i2c_bus(2, 100, zoom2_i2c_bus2_info,
+			ARRAY_SIZE(zoom2_i2c_bus2_info));
 #endif
arch/arm/mach-omap2/board-zoom2.c +0 -1
 	omap_register_i2c_bus(3, 400, NULL, 0);
 	return 0;
 
--

video4linux-list mailing list Unsubscribe mailto:video4linux-list- [email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

author
#2 lore raw
Quoted 43 lines

-----Original Message-----
From: Hiremath, Vaibhav
Sent: Thursday, January 29, 2009 9:52 PM
To: Curran, Dominic; linux-omap; [email protected]
Cc: [email protected]
Subject: RE: [OMAPZOOM][PATCH 5/6] ZOOM2: Rename the zoom2 i2c struct.

Thanks,
Vaibhav Hiremath

Quoted 29 lines

-----Original Message-----
From: [email protected] [mailto:video4linux-list- [email protected]] On Behalf Of Curran, Dominic
Sent: Friday, January 30, 2009 6:24 AM
To: linux-omap; [email protected]
Cc: [email protected]
Subject: [OMAPZOOM][PATCH 5/6] ZOOM2: Rename the zoom2 i2c struct.

From: Dominic Curran <[email protected]>
Subject: [OMAPZOOM][PATCH 5/6] ZOOM2: Rename the zoom2 i2c struct.

Rename i2c structures to something sensible. This patch is not specific for imx046 sensor.
Do this in preparation for i2c changes for imx046 sensor.

Signed-off-by Greg Hofer <[email protected]>
Signed-off-by Dominic Curran <[email protected]>
---
 arch/arm/mach-omap2/board-zoom2.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: omapzoom04/arch/arm/mach-omap2/board-zoom2.c
===================================================================

arch/arm/mach-omap2/board-zoom2.c +0 -0
@@ -472,7 +472,7 @@ static struct twl4030_platform_data ldp_
    .keypad         = &ldp_kp_twl4030_data,
 };
Quoted 4 lines

arch/arm/mach-omap2/board-zoom2.c static struct twl4030_platform_data ldp_ · line 475

Quoted 2 lines
arch/arm/mach-omap2/board-zoom2.c +1 -1
-static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = {
+static struct i2c_board_info __initdata zoom2_i2c_bus1_info[] = {

[Hiremath, Vaibhav] I think zoom2_i2c1_info should be sufficient, since i2c1,2,3 itself indicates bus.

I also didn't take this.
As a 'newbie' I was a little confused what this structure was about when I first came across it, and having the word 'bus' there would have helped me.

Again, I will reconsider if you feel it's a big issue.

Thanks
dom

Quoted 41 lines
Quoted 41 lines
arch/arm/mach-omap2/board-zoom2.c +1 -1
    {
            I2C_BOARD_INFO("twl4030", 0x48),
            .flags = I2C_CLIENT_WAKE,

@@ -507,7 +507,7 @@ static struct synaptics_i2c_rmi_platform
    .power          = &synaptics_power,
 };
 
-static struct i2c_board_info __initdata ldp3430_i2c_board_info[] =
 {
+static struct i2c_board_info __initdata zoom2_i2c_bus2_info[] = {
    {
            I2C_BOARD_INFO(SYNAPTICS_I2C_RMI_NAME,

SYNAPTICS_I2C_ADDR),
.platform_data = &ldp3430_synaptics_platform_data,

arch/arm/mach-omap2/board-zoom2.c +5 -5
@@ -518,12 +518,12 @@ static struct i2c_board_info __initdata
 
 static int __init omap_i2c_init(void)
 {
-   omap_register_i2c_bus(1, 2600, ldp_i2c_boardinfo,
-                   ARRAY_SIZE(ldp_i2c_boardinfo));
+   omap_register_i2c_bus(1, 2600, zoom2_i2c_bus1_info,
+                   ARRAY_SIZE(zoom2_i2c_bus1_info));
 #ifdef CONFIG_TOUCHSCREEN_SYNAPTICS
-   ldp3430_i2c_board_info[0].irq =
 OMAP_GPIO_IRQ(OMAP_SYNAPTICS_GPIO);
-   omap_register_i2c_bus(2, 100, ldp3430_i2c_board_info,
-                   ARRAY_SIZE(ldp3430_i2c_board_info));
+   zoom2_i2c_bus2_info[0].irq =
 OMAP_GPIO_IRQ(OMAP_SYNAPTICS_GPIO);
+   omap_register_i2c_bus(2, 100, zoom2_i2c_bus2_info,
+                   ARRAY_SIZE(zoom2_i2c_bus2_info));
 #endif

    omap_register_i2c_bus(3, 400, NULL, 0);
    return 0;

--
video4linux-list mailing list Unsubscribe mailto:video4linux-list- [email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list