* [PATCH 1/1] Allow I2C_OMAP to compile as a module.
@ 2009-02-12 14:10 Atal Shargorodsky
2009-02-13 6:58 ` Jarkko Nikula
0 siblings, 1 reply; 21+ messages in thread
From: Atal Shargorodsky @ 2009-02-12 14:10 UTC (permalink / raw)
To: linux-omap; +Cc: Atal Shargorodsky
This patch allows I2C_OMAP to be compiled as a module.
Only drivers/i2c/busses/i2c-omap.c can be compiled as a module,
but not arch/arm/plat-omap/i2c.c , so let the contents of i2c.c
to compile into the kernel if either I2C_OMAP was selected to compile in
or as a module.
Signed-off-by: Atal Shargorodsky <ext-atal.shargorodsky@nokia.com>
---
arch/arm/plat-omap/Makefile | 3 +--
arch/arm/plat-omap/i2c.c | 4 ++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index b3f0e6b..3617bfe 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -4,7 +4,7 @@
# Common support
obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \
- usb.o fb.o io.o
+ usb.o fb.o io.o i2c.o
obj-m :=
obj-n :=
obj- :=
@@ -21,7 +21,6 @@ obj-$(CONFIG_OMAP_COMPONENT_VERSION) += component-version.o
obj-$(CONFIG_OMAP_GPIO_SWITCH) += gpio-switch.o
obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
-obj-$(CONFIG_I2C_OMAP) += i2c.o
# OMAP mailbox framework
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index 467531e..a98a07f 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -35,6 +35,8 @@
#define OMAP2_I2C_BASE2 0x48072000
#define OMAP2_I2C_BASE3 0x48060000
+#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
+
static const char name[] = "i2c_omap";
#define I2C_RESOURCE_BUILDER(base, irq) \
@@ -163,3 +165,5 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate,
omap_i2c_mux_pins(bus_id - 1);
return platform_device_register(pdev);
}
+
+#endif
--
1.5.4.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-12 14:10 [PATCH 1/1] Allow I2C_OMAP to compile as a module Atal Shargorodsky
@ 2009-02-13 6:58 ` Jarkko Nikula
2009-02-13 22:21 ` Tony Lindgren
0 siblings, 1 reply; 21+ messages in thread
From: Jarkko Nikula @ 2009-02-13 6:58 UTC (permalink / raw)
To: Shargorodsky Atal (EXT-Teleca/Helsinki); +Cc: linux-omap@vger.kernel.org, tony
On Thu, 12 Feb 2009 15:10:29 +0100
"Shargorodsky Atal (EXT-Teleca/Helsinki)"
<ext-atal.shargorodsky@nokia.com> wrote:
> This patch allows I2C_OMAP to be compiled as a module.
> Only drivers/i2c/busses/i2c-omap.c can be compiled as a module,
> but not arch/arm/plat-omap/i2c.c , so let the contents of i2c.c
> to compile into the kernel if either I2C_OMAP was selected to compile
> in or as a module.
>
> Signed-off-by: Atal Shargorodsky <ext-atal.shargorodsky@nokia.com>
> ---
> arch/arm/plat-omap/Makefile | 3 +--
> arch/arm/plat-omap/i2c.c | 4 ++++
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
Tony,
You can add this to your 2.6.29-rc series since the same build error is
in mainline as well if CONFIG_I2C_OMAP=m.
Building modules, stage 2.
GZIP arch/arm/boot/compressed/piggy.gz
MODPOST 6 modules
ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
make: *** Waiting for unfinished jobs....
Subject needs a "ARM: OMAP: " prefix, otherwise ok from me.
Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-13 6:58 ` Jarkko Nikula
@ 2009-02-13 22:21 ` Tony Lindgren
2009-02-15 19:35 ` Jarkko Nikula
0 siblings, 1 reply; 21+ messages in thread
From: Tony Lindgren @ 2009-02-13 22:21 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]
* Jarkko Nikula <jarkko.nikula@nokia.com> [090212 22:58]:
> On Thu, 12 Feb 2009 15:10:29 +0100
> "Shargorodsky Atal (EXT-Teleca/Helsinki)"
> <ext-atal.shargorodsky@nokia.com> wrote:
>
> > This patch allows I2C_OMAP to be compiled as a module.
> > Only drivers/i2c/busses/i2c-omap.c can be compiled as a module,
> > but not arch/arm/plat-omap/i2c.c , so let the contents of i2c.c
> > to compile into the kernel if either I2C_OMAP was selected to compile
> > in or as a module.
> >
> > Signed-off-by: Atal Shargorodsky <ext-atal.shargorodsky@nokia.com>
> > ---
> > arch/arm/plat-omap/Makefile | 3 +--
> > arch/arm/plat-omap/i2c.c | 4 ++++
> > 2 files changed, 5 insertions(+), 2 deletions(-)
> >
> Tony,
>
> You can add this to your 2.6.29-rc series since the same build error is
> in mainline as well if CONFIG_I2C_OMAP=m.
>
> Building modules, stage 2.
> GZIP arch/arm/boot/compressed/piggy.gz
> MODPOST 6 modules
> ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] undefined!
> make[1]: *** [__modpost] Error 1
> make: *** [modules] Error 2
> make: *** Waiting for unfinished jobs....
>
> Subject needs a "ARM: OMAP: " prefix, otherwise ok from me.
>
> Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Sounds like a fix, except I posted a shorter version of the patch that
should do the trick (untested). Attached here too for reference.
Tony
[-- Attachment #2: i2c-omap-module.patch --]
[-- Type: text/x-diff, Size: 472 bytes --]
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -21,7 +21,10 @@ obj-$(CONFIG_OMAP_COMPONENT_VERSION) += component-version.o
obj-$(CONFIG_OMAP_GPIO_SWITCH) += gpio-switch.o
obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
-obj-$(CONFIG_I2C_OMAP) += i2c.o
+
+ifneq ($(CONFIG_I2C_OMAP),)
+ obj-$(CONFIG_I2C_OMAP) += i2c.o
+endif
# OMAP mailbox framework
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-13 22:21 ` Tony Lindgren
@ 2009-02-15 19:35 ` Jarkko Nikula
2009-02-15 19:45 ` Jarkko Nikula
2009-02-15 20:47 ` Felipe Balbi
0 siblings, 2 replies; 21+ messages in thread
From: Jarkko Nikula @ 2009-02-15 19:35 UTC (permalink / raw)
To: Tony Lindgren
Cc: Jarkko Nikula, Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
On Fri, 13 Feb 2009 14:21:00 -0800
Tony Lindgren <tony@atomide.com> wrote:
> > Subject needs a "ARM: OMAP: " prefix, otherwise ok from me.
> >
> > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
>
> Sounds like a fix, except I posted a shorter version of the patch that
> should do the trick (untested). Attached here too for reference.
>
Tony's version does not fix the issue since obj-$(CONFIG_I2C_OMAP) below
still tries to compile arch/arm/plat-omap/i2c.c as a module.
-obj-$(CONFIG_I2C_OMAP) += i2c.o
+
+ifneq ($(CONFIG_I2C_OMAP),)
+ obj-$(CONFIG_I2C_OMAP) += i2c.o
+endif
Problem was that drivers/i2c/busses/i2c-omap.c can be module but
arch/arm/plat-omap/i2c.c cannot since it is for early board
initialization code.
--
Jarkko
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-15 19:35 ` Jarkko Nikula
@ 2009-02-15 19:45 ` Jarkko Nikula
2009-02-16 16:40 ` Aaro Koskinen
2009-02-16 23:09 ` [PATCH 1/1] Allow I2C_OMAP to compile " Tony Lindgren
2009-02-15 20:47 ` Felipe Balbi
1 sibling, 2 replies; 21+ messages in thread
From: Jarkko Nikula @ 2009-02-15 19:45 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Tony Lindgren, Jarkko Nikula,
Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
On Sun, 15 Feb 2009 21:35:59 +0200
Jarkko Nikula <jhnikula@gmail.com> wrote:
> Tony's version does not fix the issue since obj-$(CONFIG_I2C_OMAP)
> below still tries to compile arch/arm/plat-omap/i2c.c as a module.
>
> -obj-$(CONFIG_I2C_OMAP) += i2c.o
> +
> +ifneq ($(CONFIG_I2C_OMAP),)
> + obj-$(CONFIG_I2C_OMAP) += i2c.o
> +endif
>
And build works if obj-y rule is used instead
-obj-$(CONFIG_I2C_OMAP) += i2c.o
+
+ifneq ($(CONFIG_I2C_OMAP),)
+ obj-y += i2c.o
+endif
Good. Patch can be made to touch only single file and add only three new
lines.
--
Jarkko
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-15 19:45 ` Jarkko Nikula
@ 2009-02-16 16:40 ` Aaro Koskinen
2009-02-16 23:09 ` Tony Lindgren
2009-02-17 9:25 ` Jarkko Nikula
2009-02-16 23:09 ` [PATCH 1/1] Allow I2C_OMAP to compile " Tony Lindgren
1 sibling, 2 replies; 21+ messages in thread
From: Aaro Koskinen @ 2009-02-16 16:40 UTC (permalink / raw)
To: ext Jarkko Nikula
Cc: Tony Lindgren, Nikula Jarkko (Nokia-D/Helsinki),
Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
Hello,
ext Jarkko Nikula wrote:
> Jarkko Nikula <jhnikula@gmail.com> wrote:
>> Tony's version does not fix the issue since obj-$(CONFIG_I2C_OMAP)
>> below still tries to compile arch/arm/plat-omap/i2c.c as a module.
>>
>> -obj-$(CONFIG_I2C_OMAP) += i2c.o
>> +
>> +ifneq ($(CONFIG_I2C_OMAP),)
>> + obj-$(CONFIG_I2C_OMAP) += i2c.o
>> +endif
>>
> And build works if obj-y rule is used instead
>
> -obj-$(CONFIG_I2C_OMAP) += i2c.o
> +
> +ifneq ($(CONFIG_I2C_OMAP),)
> + obj-y += i2c.o
> +endif
>
> Good. Patch can be made to touch only single file and add only three new
> lines.
Taking example from fs/Makefile (nfsd):
-obj-$(CONFIG_I2C_OMAP) += i2c.o
+i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
+obj-y += $(i2c-omap-m) $(i2c-omap-y)
Also arch/arm/plat-omap/include/mach/common.h should be updated to check
for CONFIG_I2C_OMAP_MODULE.
A.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-16 16:40 ` Aaro Koskinen
@ 2009-02-16 23:09 ` Tony Lindgren
2009-02-17 9:25 ` Jarkko Nikula
1 sibling, 0 replies; 21+ messages in thread
From: Tony Lindgren @ 2009-02-16 23:09 UTC (permalink / raw)
To: Aaro Koskinen
Cc: ext Jarkko Nikula, Nikula Jarkko (Nokia-D/Helsinki),
Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
* Aaro Koskinen <aaro.koskinen@nokia.com> [090216 08:40]:
> Hello,
>
> ext Jarkko Nikula wrote:
>> Jarkko Nikula <jhnikula@gmail.com> wrote:
>>> Tony's version does not fix the issue since obj-$(CONFIG_I2C_OMAP)
>>> below still tries to compile arch/arm/plat-omap/i2c.c as a module.
>>>
>>> -obj-$(CONFIG_I2C_OMAP) += i2c.o
>>> +
>>> +ifneq ($(CONFIG_I2C_OMAP),)
>>> + obj-$(CONFIG_I2C_OMAP) += i2c.o
>>> +endif
>>>
>> And build works if obj-y rule is used instead
>>
>> -obj-$(CONFIG_I2C_OMAP) += i2c.o
>> +
>> +ifneq ($(CONFIG_I2C_OMAP),)
>> + obj-y += i2c.o
>> +endif
>>
>> Good. Patch can be made to touch only single file and add only three new
>> lines.
>
> Taking example from fs/Makefile (nfsd):
>
> -obj-$(CONFIG_I2C_OMAP) += i2c.o
> +i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
> +obj-y += $(i2c-omap-m) $(i2c-omap-y)
>
> Also arch/arm/plat-omap/include/mach/common.h should be updated to check
> for CONFIG_I2C_OMAP_MODULE.
That seems cleaner to me.
Tony
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-16 16:40 ` Aaro Koskinen
2009-02-16 23:09 ` Tony Lindgren
@ 2009-02-17 9:25 ` Jarkko Nikula
2009-02-17 23:50 ` Tony Lindgren
1 sibling, 1 reply; 21+ messages in thread
From: Jarkko Nikula @ 2009-02-17 9:25 UTC (permalink / raw)
To: Aaro Koskinen
Cc: Tony Lindgren, Nikula Jarkko (Nokia-D/Helsinki),
Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
On Mon, 16 Feb 2009 18:40:12 +0200
Aaro Koskinen <aaro.koskinen@nokia.com> wrote:
> Taking example from fs/Makefile (nfsd):
>
> -obj-$(CONFIG_I2C_OMAP) += i2c.o
> +i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
> +obj-y += $(i2c-omap-m) $(i2c-omap-y)
>
This is getting shorter and shorter :-)
> Also arch/arm/plat-omap/include/mach/common.h should be updated to
> check for CONFIG_I2C_OMAP_MODULE.
>
Good catch, that's true!
Jarkko
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-17 9:25 ` Jarkko Nikula
@ 2009-02-17 23:50 ` Tony Lindgren
2009-02-17 23:59 ` Otto Solares
2009-02-18 9:22 ` [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled " Aaro Koskinen
0 siblings, 2 replies; 21+ messages in thread
From: Tony Lindgren @ 2009-02-17 23:50 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Aaro Koskinen, Nikula Jarkko (Nokia-D/Helsinki),
Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
* Jarkko Nikula <jhnikula@gmail.com> [090217 01:22]:
> On Mon, 16 Feb 2009 18:40:12 +0200
> Aaro Koskinen <aaro.koskinen@nokia.com> wrote:
>
> > Taking example from fs/Makefile (nfsd):
> >
> > -obj-$(CONFIG_I2C_OMAP) += i2c.o
> > +i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
> > +obj-y += $(i2c-omap-m) $(i2c-omap-y)
> >
> This is getting shorter and shorter :-)
>
> > Also arch/arm/plat-omap/include/mach/common.h should be updated to
> > check for CONFIG_I2C_OMAP_MODULE.
> >
> Good catch, that's true!
Aaro, can you please send a proper patch with Signed-off-by and I'll
add it to omap-fixes?
Thanks
Tony
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-17 23:50 ` Tony Lindgren
@ 2009-02-17 23:59 ` Otto Solares
2009-02-18 0:07 ` Tony Lindgren
2009-02-18 9:22 ` [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled " Aaro Koskinen
1 sibling, 1 reply; 21+ messages in thread
From: Otto Solares @ 2009-02-17 23:59 UTC (permalink / raw)
To: linux-omap
On Tue, Feb 17, 2009 at 03:50:18PM -0800, Tony Lindgren wrote:
> Aaro, can you please send a proper patch with Signed-off-by and I'll
> add it to omap-fixes?
Tony: what's the purpose of omap-fixes and the difference between
master and omap-2.6.28? if I want a "stable" kernel which branch
should I use?
Thanks.
-otto
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-17 23:59 ` Otto Solares
@ 2009-02-18 0:07 ` Tony Lindgren
0 siblings, 0 replies; 21+ messages in thread
From: Tony Lindgren @ 2009-02-18 0:07 UTC (permalink / raw)
To: Otto Solares; +Cc: linux-omap
* Otto Solares <solca@guug.org> [090217 16:00]:
> On Tue, Feb 17, 2009 at 03:50:18PM -0800, Tony Lindgren wrote:
> > Aaro, can you please send a proper patch with Signed-off-by and I'll
> > add it to omap-fixes?
>
> Tony: what's the purpose of omap-fixes and the difference between
> master and omap-2.6.28? if I want a "stable" kernel which branch
> should I use?
Here's the quick rundown:
- master branch is current linux-omap against recent mainline kernel
- omap-fixes is the branch for fixes going to mainline during -rc cycle
- omap-upstream is a branch of generic omap patches going to mainline
during the next merge window
- omap1-upstream is a branch of omap1 patches going to mainline during
the next merge cycle
- omap2-upstream is a branch of omap2 patches going to mainline during
the next merge cycle
- omap3-upstream is a branch of omap3 patches going to mainline during
the next merge cycle
- omap-next branch is what gets pulled into linux-next and gets merged
to the mainline the next merge window
The omap-2.6.28 branch is there because there were few bugs and I
thought we might want to tag v2.6.28-omap2. Mostly getting the MMC
working for omap1 as far as I remember.
For "stable" you should use the whatever omap tag we have against the
recent mainline kernel, so yeah, it would be the omap-2.6.28 branch
right now.
Regards,
Tony
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled as a module
2009-02-17 23:50 ` Tony Lindgren
2009-02-17 23:59 ` Otto Solares
@ 2009-02-18 9:22 ` Aaro Koskinen
2009-02-18 9:45 ` Jarkko Nikula
1 sibling, 1 reply; 21+ messages in thread
From: Aaro Koskinen @ 2009-02-18 9:22 UTC (permalink / raw)
To: tony; +Cc: linux-omap, jarkko.nikula, ext-atal.shargorodsky
Fixes a linker error when OMAP I2C bus driver is compiled as a module:
ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] undefined!
The I2C utility functions used for board initialization should be always
built-in.
Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com>
---
arch/arm/plat-omap/Makefile | 3 ++-
arch/arm/plat-omap/include/mach/common.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index b3f0e6b..3ebc09e 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -21,7 +21,8 @@ obj-$(CONFIG_OMAP_COMPONENT_VERSION) += component-version.o
obj-$(CONFIG_OMAP_GPIO_SWITCH) += gpio-switch.o
obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
-obj-$(CONFIG_I2C_OMAP) += i2c.o
+i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
+obj-y += $(i2c-omap-m) $(i2c-omap-y)
# OMAP mailbox framework
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h
index af4105f..8c1b965 100644
--- a/arch/arm/plat-omap/include/mach/common.h
+++ b/arch/arm/plat-omap/include/mach/common.h
@@ -33,7 +33,7 @@ struct sys_timer;
extern void omap_map_common_io(void);
extern struct sys_timer omap_timer;
-#ifdef CONFIG_I2C_OMAP
+#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
extern int omap_register_i2c_bus(int bus_id, u32 clkrate,
struct i2c_board_info const *info,
unsigned len);
--
1.5.4.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled as a module
2009-02-18 9:22 ` [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled " Aaro Koskinen
@ 2009-02-18 9:45 ` Jarkko Nikula
2009-02-18 23:40 ` Tony Lindgren
0 siblings, 1 reply; 21+ messages in thread
From: Jarkko Nikula @ 2009-02-18 9:45 UTC (permalink / raw)
To: Aaro Koskinen; +Cc: tony, linux-omap, jarkko.nikula, ext-atal.shargorodsky
On Wed, 18 Feb 2009 11:22:18 +0200
Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote:
> Fixes a linker error when OMAP I2C bus driver is compiled as a module:
>
> ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko]
> undefined!
>
> The I2C utility functions used for board initialization should be
> always built-in.
>
> Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com>
> ---
> arch/arm/plat-omap/Makefile | 3 ++-
> arch/arm/plat-omap/include/mach/common.h | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled as a module
2009-02-18 9:45 ` Jarkko Nikula
@ 2009-02-18 23:40 ` Tony Lindgren
2009-02-18 23:43 ` Otto Solares
0 siblings, 1 reply; 21+ messages in thread
From: Tony Lindgren @ 2009-02-18 23:40 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Aaro Koskinen, linux-omap, jarkko.nikula, ext-atal.shargorodsky
* Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]:
> On Wed, 18 Feb 2009 11:22:18 +0200
> Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote:
>
> > Fixes a linker error when OMAP I2C bus driver is compiled as a module:
> >
> > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko]
> > undefined!
> >
> > The I2C utility functions used for board initialization should be
> > always built-in.
> >
> > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com>
> > ---
> > arch/arm/plat-omap/Makefile | 3 ++-
> > arch/arm/plat-omap/include/mach/common.h | 2 +-
> > 2 files changed, 3 insertions(+), 2 deletions(-)
> >
> Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Applying to linux-omap and omap-fixes.
Tony
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled as a module
2009-02-18 23:40 ` Tony Lindgren
@ 2009-02-18 23:43 ` Otto Solares
2009-02-18 23:59 ` Tony Lindgren
0 siblings, 1 reply; 21+ messages in thread
From: Otto Solares @ 2009-02-18 23:43 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap
On Wed, Feb 18, 2009 at 03:40:29PM -0800, Tony Lindgren wrote:
> * Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]:
> > On Wed, 18 Feb 2009 11:22:18 +0200
> > Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote:
> >
> > > Fixes a linker error when OMAP I2C bus driver is compiled as a module:
> > >
> > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko]
> > > undefined!
> > >
> > > The I2C utility functions used for board initialization should be
> > > always built-in.
> > >
> > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com>
> > > ---
> > > arch/arm/plat-omap/Makefile | 3 ++-
> > > arch/arm/plat-omap/include/mach/common.h | 2 +-
> > > 2 files changed, 3 insertions(+), 2 deletions(-)
> > >
> > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
>
> Applying to linux-omap and omap-fixes.
Just curious: what about omap-2.6.28?
-otto
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled as a module
2009-02-18 23:43 ` Otto Solares
@ 2009-02-18 23:59 ` Tony Lindgren
2009-02-19 0:15 ` Otto Solares
0 siblings, 1 reply; 21+ messages in thread
From: Tony Lindgren @ 2009-02-18 23:59 UTC (permalink / raw)
To: Otto Solares; +Cc: linux-omap
* Otto Solares <solca@guug.org> [090218 15:43]:
> On Wed, Feb 18, 2009 at 03:40:29PM -0800, Tony Lindgren wrote:
> > * Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]:
> > > On Wed, 18 Feb 2009 11:22:18 +0200
> > > Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote:
> > >
> > > > Fixes a linker error when OMAP I2C bus driver is compiled as a module:
> > > >
> > > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko]
> > > > undefined!
> > > >
> > > > The I2C utility functions used for board initialization should be
> > > > always built-in.
> > > >
> > > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com>
> > > > ---
> > > > arch/arm/plat-omap/Makefile | 3 ++-
> > > > arch/arm/plat-omap/include/mach/common.h | 2 +-
> > > > 2 files changed, 3 insertions(+), 2 deletions(-)
> > > >
> > > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> >
> > Applying to linux-omap and omap-fixes.
>
> Just curious: what about omap-2.6.28?
Heh, OK pushed there too :) I think we should close that branch soon
as 2.6.29 is fast approaching..
Tony
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled as a module
2009-02-18 23:59 ` Tony Lindgren
@ 2009-02-19 0:15 ` Otto Solares
0 siblings, 0 replies; 21+ messages in thread
From: Otto Solares @ 2009-02-19 0:15 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap
On Wed, Feb 18, 2009 at 03:59:56PM -0800, Tony Lindgren wrote:
> * Otto Solares <solca@guug.org> [090218 15:43]:
> > On Wed, Feb 18, 2009 at 03:40:29PM -0800, Tony Lindgren wrote:
> > > * Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]:
> > > > On Wed, 18 Feb 2009 11:22:18 +0200
> > > > Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote:
> > > >
> > > > > Fixes a linker error when OMAP I2C bus driver is compiled as a module:
> > > > >
> > > > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko]
> > > > > undefined!
> > > > >
> > > > > The I2C utility functions used for board initialization should be
> > > > > always built-in.
> > > > >
> > > > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com>
> > > > > ---
> > > > > arch/arm/plat-omap/Makefile | 3 ++-
> > > > > arch/arm/plat-omap/include/mach/common.h | 2 +-
> > > > > 2 files changed, 3 insertions(+), 2 deletions(-)
> > > > >
> > > > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> > >
> > > Applying to linux-omap and omap-fixes.
> >
> > Just curious: what about omap-2.6.28?
>
> Heh, OK pushed there too :) I think we should close that branch soon
> as 2.6.29 is fast approaching..
It would be nice to have some bugfixing branch for stable kernels IMO
;)
-otto
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-15 19:45 ` Jarkko Nikula
2009-02-16 16:40 ` Aaro Koskinen
@ 2009-02-16 23:09 ` Tony Lindgren
1 sibling, 0 replies; 21+ messages in thread
From: Tony Lindgren @ 2009-02-16 23:09 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Jarkko Nikula, Shargorodsky Atal (EXT-Teleca/Helsinki),
linux-omap@vger.kernel.org
* Jarkko Nikula <jhnikula@gmail.com> [090215 11:44]:
> On Sun, 15 Feb 2009 21:35:59 +0200
> Jarkko Nikula <jhnikula@gmail.com> wrote:
>
> > Tony's version does not fix the issue since obj-$(CONFIG_I2C_OMAP)
> > below still tries to compile arch/arm/plat-omap/i2c.c as a module.
> >
> > -obj-$(CONFIG_I2C_OMAP) += i2c.o
> > +
> > +ifneq ($(CONFIG_I2C_OMAP),)
> > + obj-$(CONFIG_I2C_OMAP) += i2c.o
> > +endif
> >
> And build works if obj-y rule is used instead
>
> -obj-$(CONFIG_I2C_OMAP) += i2c.o
> +
> +ifneq ($(CONFIG_I2C_OMAP),)
> + obj-y += i2c.o
> +endif
>
> Good. Patch can be made to touch only single file and add only three new
> lines.
Ah sorry for the typo :)
Tony
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-15 19:35 ` Jarkko Nikula
2009-02-15 19:45 ` Jarkko Nikula
@ 2009-02-15 20:47 ` Felipe Balbi
1 sibling, 0 replies; 21+ messages in thread
From: Felipe Balbi @ 2009-02-15 20:47 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Tony Lindgren, Jarkko Nikula,
Shargorodsky Atal (EXT-Teleca/Helsinki), linux-omap
Hi,
On Sun, 15 Feb 2009 21:35:59 +0200, Jarkko Nikula <jhnikula@gmail.com>
wrote:
> On Fri, 13 Feb 2009 14:21:00 -0800
> Tony Lindgren <tony@atomide.com> wrote:
>
>> > Subject needs a "ARM: OMAP: " prefix, otherwise ok from me.
>> >
>> > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
>>
>> Sounds like a fix, except I posted a shorter version of the patch that
>> should do the trick (untested). Attached here too for reference.
>>
> Tony's version does not fix the issue since obj-$(CONFIG_I2C_OMAP) below
> still tries to compile arch/arm/plat-omap/i2c.c as a module.
>
> -obj-$(CONFIG_I2C_OMAP) += i2c.o
> +
> +ifneq ($(CONFIG_I2C_OMAP),)
> + obj-$(CONFIG_I2C_OMAP) += i2c.o
> +endif
>
> Problem was that drivers/i2c/busses/i2c-omap.c can be module but
> arch/arm/plat-omap/i2c.c cannot since it is for early board
> initialization code.
why don't you:
-obj-$(CONFIG_I2C_OMAP) += i2c.o
+obj-y += i2c.o
It's quite possible that we will need i2c
anyways in most boards. And for the ones who
won't need, it's just a few extra bytes
to kernel image. I guess it should be
ok to always build i2c utilities.
--
Best Regards,
Felipe Balbi
http://blog.felipebalbi.com
me@felipebalbi.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/1] Allow I2C_OMAP to compile as a module.
@ 2009-02-12 12:54 Atal Shargorodsky
2009-02-12 13:10 ` Jarkko Nikula
0 siblings, 1 reply; 21+ messages in thread
From: Atal Shargorodsky @ 2009-02-12 12:54 UTC (permalink / raw)
To: linux-omap; +Cc: Atal Shargorodsky
This patch allows I2C_OMAP to be compiled as a module.
Only drivers/i2c/busses/i2c-omap.c can be compiled as a module,
but not arch/arm/plat-omap/i2c.c , so let the contents of i2c.c
to compile into the kernel if I2C_OMAP was selected to compile in
or as a module.
Signed-off-by: Atal Shargorodsky <ext-atal.shargorodsky@nokia.com>
---
arch/arm/plat-omap/Makefile | 3 +--
arch/arm/plat-omap/i2c.c | 4 ++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 175bfd6..fe4738e 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -4,7 +4,7 @@
# Common support
obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \
- usb.o fb.o io.o dss.o
+ usb.o fb.o io.o dss.o i2c.o
obj-m :=
obj-n :=
obj- :=
@@ -21,7 +21,6 @@ obj-$(CONFIG_OMAP_COMPONENT_VERSION) += component-version.o
obj-$(CONFIG_OMAP_GPIO_SWITCH) += gpio-switch.o
obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
-obj-$(CONFIG_I2C_OMAP) += i2c.o
# OMAP MMU framework
obj-$(CONFIG_OMAP_MMU_FWK) += mmu.o
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index 89a6ab0..08b8681 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -34,6 +34,8 @@
#define OMAP2_I2C_BASE2 0x48072000
#define OMAP2_I2C_BASE3 0x48060000
+#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
+
static const char name[] = "i2c_omap";
#define I2C_RESOURCE_BUILDER(base, irq) \
@@ -162,3 +164,5 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate,
omap_i2c_mux_pins(bus_id - 1);
return platform_device_register(pdev);
}
+
+#endif
--
1.5.4.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] Allow I2C_OMAP to compile as a module.
2009-02-12 12:54 Atal Shargorodsky
@ 2009-02-12 13:10 ` Jarkko Nikula
0 siblings, 0 replies; 21+ messages in thread
From: Jarkko Nikula @ 2009-02-12 13:10 UTC (permalink / raw)
To: Shargorodsky Atal (EXT-Teleca/Helsinki); +Cc: linux-omap@vger.kernel.org
On Thu, 12 Feb 2009 13:54:54 +0100
"Shargorodsky Atal (EXT-Teleca/Helsinki)"
<ext-atal.shargorodsky@nokia.com> wrote:
> This patch allows I2C_OMAP to be compiled as a module.
> Only drivers/i2c/busses/i2c-omap.c can be compiled as a module,
> but not arch/arm/plat-omap/i2c.c , so let the contents of i2c.c
> to compile into the kernel if I2C_OMAP was selected to compile in
> or as a module.
>
> Signed-off-by: Atal Shargorodsky <ext-atal.shargorodsky@nokia.com>
> ---
> arch/arm/plat-omap/Makefile | 3 +--
> arch/arm/plat-omap/i2c.c | 4 ++++
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
> index 175bfd6..fe4738e 100644
> --- a/arch/arm/plat-omap/Makefile
> +++ b/arch/arm/plat-omap/Makefile
> @@ -4,7 +4,7 @@
>
> # Common support
> obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \
> - usb.o fb.o io.o dss.o
> + usb.o fb.o io.o dss.o i2c.o
Can you base this on linux-omap? There is no dss there so patch doesn't
apply.
Generally I agree the patch since it fixes linking error when
CONFIG_I2C_OMAP=m and arch/arm/plat-omap/i2c.o cannot be compiled as a
module because it is for board initialization code.
Jarkko
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2009-02-19 0:15 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-12 14:10 [PATCH 1/1] Allow I2C_OMAP to compile as a module Atal Shargorodsky
2009-02-13 6:58 ` Jarkko Nikula
2009-02-13 22:21 ` Tony Lindgren
2009-02-15 19:35 ` Jarkko Nikula
2009-02-15 19:45 ` Jarkko Nikula
2009-02-16 16:40 ` Aaro Koskinen
2009-02-16 23:09 ` Tony Lindgren
2009-02-17 9:25 ` Jarkko Nikula
2009-02-17 23:50 ` Tony Lindgren
2009-02-17 23:59 ` Otto Solares
2009-02-18 0:07 ` Tony Lindgren
2009-02-18 9:22 ` [PATCH] ARM: OMAP: Allow I2C bus driver to be compiled " Aaro Koskinen
2009-02-18 9:45 ` Jarkko Nikula
2009-02-18 23:40 ` Tony Lindgren
2009-02-18 23:43 ` Otto Solares
2009-02-18 23:59 ` Tony Lindgren
2009-02-19 0:15 ` Otto Solares
2009-02-16 23:09 ` [PATCH 1/1] Allow I2C_OMAP to compile " Tony Lindgren
2009-02-15 20:47 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2009-02-12 12:54 Atal Shargorodsky
2009-02-12 13:10 ` Jarkko Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox