OMAP4: Keyboard: Mux changes in the board file

Commit Message

Kevin Hilman July 11, 2011, 8:08 p.m. UTC

On Fri, 2011-07-01 at 00:48 -0700, Tony Lindgren wrote:
> * Shubhrajyoti D <[e-mail]> [110623 05:10]:
> > The mux settings for keypad  are done for omap4430sdp in
> > board file.
> 
> Applying into devel-board branch.
> 
> > +static struct omap_board_data keypad_data = {
> > +	.id	    = 1,
> > +	.pads	 = keypad_pads,
> > +	.pads_cnt       = ARRAY_SIZE(keypad_pads),
> > +};
> 
> Aligned this struct better.

This patch (and this struct) introduces another section mismatch warning
because it references another struct which is __initdata but the struct
itself is not:

WARNING: vmlinux.o(.data+0x37788): Section mismatch in reference from
the variable keypad_data to the (unknown reference) .init.data:(unknown)
The variable keypad_data references
the (unknown reference) __initdata (unknown)

A quick glance suggests the the right fix is that this struct should
also be __initdata:

 	.pads_cnt       	= ARRAY_SIZE(keypad_pads),


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Shubhrajyoti Datta July 12, 2011, 6:33 a.m. UTC | #1

On Tuesday 12 July 2011 01:38 AM, Kevin Hilman wrote:
> On Fri, 2011-07-01 at 00:48 -0700, Tony Lindgren wrote:
>> * Shubhrajyoti D<[e-mail]>  [110623 05:10]:
>>> The mux settings for keypad  are done for omap4430sdp in
>>> board file.
>> Applying into devel-board branch.
>>
>>> +static struct omap_board_data keypad_data = {
>>> +	.id	    = 1,
>>> +	.pads	 = keypad_pads,
>>> +	.pads_cnt       = ARRAY_SIZE(keypad_pads),
>>> +};
>> Aligned this struct better.
> This patch (and this struct) introduces another section mismatch warning
> because it references another struct which is __initdata but the struct
> itself is not:
>
> WARNING: vmlinux.o(.data+0x37788): Section mismatch in reference from
> the variable keypad_data to the (unknown reference) .init.data:(unknown)
> The variable keypad_data references
> the (unknown reference) __initdata (unknown)
>
> A quick glance suggests the the right fix is that this struct should
> also be __initdata:
Yes , will incorporate the comments and send a patch.
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c
> b/arch/arm/mach-omap2/board-4430sdp.c
> index c7cef44..66758bf 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -199,7 +199,7 @@ static struct omap4_keypad_platform_data
> sdp4430_keypad_data = {
>   	.cols			= 8,
>   };
>
> -static struct omap_board_data keypad_data = {
> +static struct omap_board_data keypad_data __initdata = {
>   	.id	    		= 1,
>   	.pads	 		= keypad_pads,
>   	.pads_cnt       	= ARRAY_SIZE(keypad_pads),
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/mach-omap2/board-4430sdp.c
b/arch/arm/mach-omap2/board-4430sdp.c
index c7cef44..66758bf 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -199,7 +199,7 @@  static struct omap4_keypad_platform_data
sdp4430_keypad_data = {
 	.cols			= 8,
 };
 
-static struct omap_board_data keypad_data = {
+static struct omap_board_data keypad_data __initdata = {
 	.id	    		= 1,
 	.pads	 		= keypad_pads,