twl4030 power scripts, initsection fixups
PATCH 1/1 twl4030 power scripts, initsection fixups
From: David Brownell <[email protected]>
Remove section mismatch warnings from twl4030 power script declaration ... unfortunately, this use-once data can't live in initdata sections (or initconst) until some driver stacks (starting with I2C) have better support for non-hotpluggable componentry.
--- arch/arm/mach-omap2/board-3430sdp.c | 16 ++++++++-------- arch/arm/mach-omap2/board-ldp.c | 16 ++++++++-------- arch/arm/mach-omap2/twl4030-generic-scripts.c | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-)
arch/arm/mach-omap2/board-3430sdp.c +8 -8
@@ -394,7 +394,7 @@ static struct twl4030_madc_platform_data }; -static struct twl4030_ins __initdata sleep_on_seq[] = { +static struct twl4030_ins sleep_on_seq[] = {/* * Turn off VDD1 and VDD2. */
@@ -409,13 +409,13 @@ static struct twl4030_ins __initdata sle#endif }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT , }; -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { #ifndef CONFIG_DISABLE_HFCLK/* * Wakeup VDD1 and VDD2.
@@ -435,13 +435,13 @@ static struct twl4030_ins wakeup_seq[] _#endif /* #ifndef CONFIG_DISABLE_HFCLK */ }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_ins wrst_seq[]__initdata = { +static struct twl4030_ins wrst_seq[] = {/* * Reset twl4030. * Reset VDD1 regulator.
@@ -457,19 +457,19 @@ static struct twl4030_ins wrst_seq[] __i {MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2}, {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2}, }; -static struct twl4030_script wrst_script__initdata = { +static struct twl4030_script wrst_script = { .script = wrst_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WRST_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, &wrst_script, }; -static struct twl4030_power_data sdp3430_t2scripts_data__initdata = { +static struct twl4030_power_data sdp3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
arch/arm/mach-omap2/board-ldp.c +8 -8
@@ -374,7 +374,7 @@ static int ldp_batt_table[] = {4040 ,3910 ,3790 ,3670 ,3550 }; -static struct twl4030_ins __initdata sleep_on_seq[] = { +static struct twl4030_ins sleep_on_seq[] = {/* * Turn off VDD1 and VDD2. */
@@ -389,13 +389,13 @@ static struct twl4030_ins __initdata sle#endif }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT , }; -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { #ifndef CONFIG_DISABLE_HFCLK/* * Wakeup VDD1 and VDD2.
@@ -415,13 +415,13 @@ static struct twl4030_ins wakeup_seq[] _#endif /* #ifndef CONFIG_DISABLE_HFCLK */ }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_ins wrst_seq[]__initdata = { +static struct twl4030_ins wrst_seq[] = {/* * Reset twl4030. * Reset VDD1 regulator.
@@ -438,19 +438,19 @@ static struct twl4030_ins wrst_seq[] __i {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2}, }; -static struct twl4030_script wrst_script__initdata = { +static struct twl4030_script wrst_script = { .script = wrst_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WRST_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, &wrst_script, }; -static struct twl4030_power_data sdp3430_t2scripts_data__initdata = { +static struct twl4030_power_data sdp3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
arch/arm/mach-omap2/twl4030-generic-scripts.c +6 -6
@@ -35,14 +35,14 @@* resources to sleep and then all the other resources. */ -static struct twl4030_ins sleep_on_seq[]__initdata = { +static struct twl4030_ins sleep_on_seq[] = { {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_RC ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_SLEEP ),4 }, {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_ALL ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_SLEEP ),4 }, }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT ,
@@ -53,7 +53,7 @@ static struct twl4030_script sleep_on_sc* regulators and then all other resources. */ -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { {MSG_SINGULAR (DEV_GRP_NULL ,0x17 ,RES_STATE_ACTIVE ),0x30 }, {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_PP_PR ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_ACTIVE ),0x37 },
@@ -61,18 +61,18 @@ static struct twl4030_ins wakeup_seq[] _ RES_STATE_ACTIVE), 0x2}, }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, }; -struct twl4030_power_data generic3430_t2scripts_data__initdata = { +struct twl4030_power_data generic3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
Quoted 7 lines · David Brownell
From: David Brownell <[email protected]>
Remove section mismatch warnings from twl4030 power script declaration ... unfortunately, this use-once data can't live in initdata sections (or initconst) until some driver stacks (starting with I2C) have better support for non-hotpluggable componentry.
should you update this with the following ?
drivers/mfd/twl4030-power.c +9 -9
@@ -66,7 +66,7 @@ static u8 triton_next_free_address = 0x2b;#define KEY_1 0xC0#define KEY_2 0x0C -static int __init twl4030_write_script_byte (u8 address,u8 byte) +static int twl4030_write_script_byte (u8 address,u8 byte) {int err;
@@ -78,7 +78,7 @@ static int __init twl4030_write_script_byte(u8 address, u8 byte)return err; } -static int __init twl4030_write_script_ins (u8 address,u16 pmb_message, +static int twl4030_write_script_ins (u8 address,u16 pmb_message,u8 delay,u8 next) {int err =0 ;
@@ -92,7 +92,7 @@ static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,return err; } -static int __init twl4030_write_script (u8 address,struct twl4030_ins *script, +static int twl4030_write_script (u8 address,struct twl4030_ins *script,int len) {int err =0 ;
@@ -113,7 +113,7 @@ static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,return err; } -static int __init config_wakeup3_sequence (u8 address) +static int config_wakeup3_sequence (u8 address) {int err =0 ;
@@ -131,7 +131,7 @@ static int __init config_wakeup3_sequence(u8 address)return err; } -static int __init config_wakeup12_sequence (u8 address) +static int config_wakeup12_sequence (u8 address) {int err =0 ;
@@ -162,7 +162,7 @@ static int __init config_wakeup12_sequence(u8 address)return err; } -static int __init config_sleep_sequence (u8 address) +static int config_sleep_sequence (u8 address) {int err =0 ;
@@ -184,7 +184,7 @@ static int __init config_sleep_sequence(u8 address)return err; } -static int __init config_warmreset_sequence (u8 address) +static int config_warmreset_sequence (u8 address) {int err =0 ;
@@ -219,7 +219,7 @@ static int __init config_warmreset_sequence(u8 address)return err; } -static int __init load_triton_script (struct twl4030_script *tscript) +static int load_triton_script (struct twl4030_script *tscript) {u8 address = triton_next_free_address;int err;
@@ -245,7 +245,7 @@ static int __init load_triton_script(struct twl4030_script *tscript)return err; } -void __init twl4030_power_init (struct twl4030_power_data *triton2_scripts) +void twl4030_power_init (struct twl4030_power_data *triton2_scripts) {int err =0 ;int i;
Signature · 1 line
balbi
Quoted 8 lines · Felipe Balbi
Quoted 6 lines
Remove section mismatch warnings from twl4030 power script declaration ... unfortunately, this use-once data can't live in initdata sections (or initconst) until some driver stacks (starting with I2C) have better support for non-hotpluggable componentry.
should you update this with the following ?
I didn't see any section mismatch warnings from this goofage. ;)
But, yes this looks wrong too. Resend with your s-o-b ...
Quoted 11 lines
drivers/mfd/twl4030-power.c +0
-0@@ -66,7 +66,7 @@ static u8 triton_next_free_address = 0x2b; #define KEY_1 0xC0 #define KEY_2 0x0Cdrivers/mfd/twl4030-power.c +1
-1-static int __init twl4030_write_script_byte (u8 address,u8 byte) +static int twl4030_write_script_byte (u8 address,u8 byte){
int err;
Quoted 1 line
... deleted similar changes ...
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · David Brownell
Quoted 7 lines · Felipe Balbi
Quoted 6 lines
Remove section mismatch warnings from twl4030 power script declaration ... unfortunately, this use-once data can't live in initdata sections (or initconst) until some driver stacks (starting with I2C) have better support for non-hotpluggable componentry.
Quoted 5 lines
Quoted 1 line
should you update this with the following ?
I didn't see any section mismatch warnings from this goofage. ;)
But, yes this looks wrong too. Resend with your s-o-b ...
how about applying this one instead ?
================ cut here ===================
Quoted 1 line
From
1ce7606214e9b3caad9ccd3cc356f905c7a5ee23Mon Sep 17 00:00:00 2001
From: David Brownell <[email protected]>
Date: Fri, 13 Mar 2009 18:25:52 -0700
Subject: [PATCH] twl4030 power scripts, initsection fixups
Remove section mismatch warnings from twl4030 power script declaration ... unfortunately, this use-once data can't live in initdata sections (or initconst) until some driver stacks (starting with I2C) have better support for non-hotpluggable componentry.
[[email protected]: updated twl4030-power.c]
--- arch/arm/mach-omap2/board-3430sdp.c | 16 ++++++++-------- arch/arm/mach-omap2/board-ldp.c | 16 ++++++++-------- arch/arm/mach-omap2/twl4030-generic-scripts.c | 12 ++++++------ drivers/mfd/twl4030-power.c | 18 +++++++++--------- 4 files changed, 31 insertions(+), 31 deletions(-)
arch/arm/mach-omap2/board-3430sdp.c +8 -8
@@ -388,7 +388,7 @@ static struct twl4030_madc_platform_data sdp3430_madc_data = { }; -static struct twl4030_ins __initdata sleep_on_seq[] = { +static struct twl4030_ins sleep_on_seq[] = {/* * Turn off VDD1 and VDD2. */
@@ -403,13 +403,13 @@ static struct twl4030_ins __initdata sleep_on_seq[] = {#endif }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT , }; -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { #ifndef CONFIG_DISABLE_HFCLK/* * Wakeup VDD1 and VDD2.
@@ -429,13 +429,13 @@ static struct twl4030_ins wakeup_seq[] __initdata = {#endif /* #ifndef CONFIG_DISABLE_HFCLK */ }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_ins wrst_seq[]__initdata = { +static struct twl4030_ins wrst_seq[] = {/* * Reset twl4030. * Reset VDD1 regulator.
@@ -451,19 +451,19 @@ static struct twl4030_ins wrst_seq[] __initdata = { {MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2}, {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2}, }; -static struct twl4030_script wrst_script__initdata = { +static struct twl4030_script wrst_script = { .script = wrst_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WRST_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, &wrst_script, }; -static struct twl4030_power_data sdp3430_t2scripts_data__initdata = { +static struct twl4030_power_data sdp3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
arch/arm/mach-omap2/board-ldp.c +8 -8
@@ -374,7 +374,7 @@ static int ldp_batt_table[] = {4040 ,3910 ,3790 ,3670 ,3550 }; -static struct twl4030_ins __initdata sleep_on_seq[] = { +static struct twl4030_ins sleep_on_seq[] = {/* * Turn off VDD1 and VDD2. */
@@ -389,13 +389,13 @@ static struct twl4030_ins __initdata sleep_on_seq[] = {#endif }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT , }; -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { #ifndef CONFIG_DISABLE_HFCLK/* * Wakeup VDD1 and VDD2.
@@ -415,13 +415,13 @@ static struct twl4030_ins wakeup_seq[] __initdata = {#endif /* #ifndef CONFIG_DISABLE_HFCLK */ }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_ins wrst_seq[]__initdata = { +static struct twl4030_ins wrst_seq[] = {/* * Reset twl4030. * Reset VDD1 regulator.
@@ -438,19 +438,19 @@ static struct twl4030_ins wrst_seq[] __initdata = { {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2}, }; -static struct twl4030_script wrst_script__initdata = { +static struct twl4030_script wrst_script = { .script = wrst_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WRST_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, &wrst_script, }; -static struct twl4030_power_data sdp3430_t2scripts_data__initdata = { +static struct twl4030_power_data sdp3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
arch/arm/mach-omap2/twl4030-generic-scripts.c +6 -6
@@ -35,14 +35,14 @@* resources to sleep and then all the other resources. */ -static struct twl4030_ins sleep_on_seq[]__initdata = { +static struct twl4030_ins sleep_on_seq[] = { {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_RC ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_SLEEP ),4 }, {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_ALL ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_SLEEP ),4 }, }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT ,
@@ -53,7 +53,7 @@ static struct twl4030_script sleep_on_script __initdata = {* regulators and then all other resources. */ -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { {MSG_SINGULAR (DEV_GRP_NULL ,0x17 ,RES_STATE_ACTIVE ),0x30 }, {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_PP_PR ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_ACTIVE ),0x37 },
@@ -61,18 +61,18 @@ static struct twl4030_ins wakeup_seq[] __initdata = { RES_STATE_ACTIVE), 0x2}, }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, }; -struct twl4030_power_data generic3430_t2scripts_data__initdata = { +struct twl4030_power_data generic3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
drivers/mfd/twl4030-power.c +9 -9
@@ -66,7 +66,7 @@ static u8 triton_next_free_address = 0x2b;#define KEY_1 0xC0#define KEY_2 0x0C -static int __init twl4030_write_script_byte (u8 address,u8 byte) +static int twl4030_write_script_byte (u8 address,u8 byte) {int err;
@@ -78,7 +78,7 @@ static int __init twl4030_write_script_byte(u8 address, u8 byte)return err; } -static int __init twl4030_write_script_ins (u8 address,u16 pmb_message, +static int twl4030_write_script_ins (u8 address,u16 pmb_message,u8 delay,u8 next) {int err =0 ;
@@ -92,7 +92,7 @@ static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,return err; } -static int __init twl4030_write_script (u8 address,struct twl4030_ins *script, +static int twl4030_write_script (u8 address,struct twl4030_ins *script,int len) {int err =0 ;
@@ -113,7 +113,7 @@ static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,return err; } -static int __init config_wakeup3_sequence (u8 address) +static int config_wakeup3_sequence (u8 address) {int err =0 ;
@@ -131,7 +131,7 @@ static int __init config_wakeup3_sequence(u8 address)return err; } -static int __init config_wakeup12_sequence (u8 address) +static int config_wakeup12_sequence (u8 address) {int err =0 ;
@@ -162,7 +162,7 @@ static int __init config_wakeup12_sequence(u8 address)return err; } -static int __init config_sleep_sequence (u8 address) +static int config_sleep_sequence (u8 address) {int err =0 ;
@@ -184,7 +184,7 @@ static int __init config_sleep_sequence(u8 address)return err; } -static int __init config_warmreset_sequence (u8 address) +static int config_warmreset_sequence (u8 address) {int err =0 ;
@@ -219,7 +219,7 @@ static int __init config_warmreset_sequence(u8 address)return err; } -static int __init load_triton_script (struct twl4030_script *tscript) +static int load_triton_script (struct twl4030_script *tscript) {u8 address = triton_next_free_address;int err;
@@ -245,7 +245,7 @@ static int __init load_triton_script(struct twl4030_script *tscript)return err; } -void __init twl4030_power_init (struct twl4030_power_data *triton2_scripts) +void twl4030_power_init (struct twl4030_power_data *triton2_scripts) {int err =0 ;int i;
Signature · 4 lines
1.6.1.3 -- balbi
Quoted 1 line · Felipe Balbi
how about applying this one instead ?
Looks OK to me, though it implies re-ordering the patches I sent on Friday since change prevents the updated
From: "Peter 'p2' De Schrijver" <[email protected]>
Subject: Group and resource assignments for TWL4030
patch from applying ... that is, I *think* just applying this one after that one will work.
Quoted 17 lines
================ cut here ===================
Quoted 1 line
From
1ce7606214e9b3caad9ccd3cc356f905c7a5ee23Mon Sep 17 00:00:00 2001From: David Brownell <[email protected]>
Date: Fri, 13 Mar 2009 18:25:52 -0700
Subject: [PATCH] twl4030 power scripts, initsection fixupsRemove section mismatch warnings from twl4030 power script declaration ... unfortunately, this use-once data can't live in initdata sections (or initconst) until some driver stacks (starting with I2C) have better support for non-hotpluggable componentry.
[[email protected]: updated
twl4030-power.c]Signed-off-by David Brownell <[email protected]>Signed-off-by Felipe Balbi <[email protected]>
Quoted 11 lines · David Brownell
Quoted 1 line · Felipe Balbi
how about applying this one instead ?
Looks OK to me, though it implies re-ordering the patches I sent on Friday since change prevents the updated
From: "Peter 'p2' De Schrijver" <[email protected]>
Subject: Group and resource assignments for TWL4030patch from applying ... that is, I *think* just applying this one after that one will work.
I'll rebase on top of that an reply soon.
Signature · 1 line
balbi
Quoted 9 lines · Felipe Balbi
Quoted 8 lines · David Brownell
Quoted 1 line · Felipe Balbi
how about applying this one instead ?
Looks OK to me, though it implies re-ordering the patches I sent on Friday since change prevents the updated
From: "Peter 'p2' De Schrijver" <[email protected]>
Subject: Group and resource assignments for TWL4030
Actually, this patch doesn't apply on current HEAD. Any dependency ?
Signature · 1 line
balbi
Quoted 5 lines · Felipe Balbi
Quoted 4 lines · Felipe Balbi
Quoted 3 lines · David Brownell
Quoted 1 line · Felipe Balbi
how about applying this one instead ?
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Looks OK to me, though it implies re-ordering the patches I sent on Friday since change prevents the updated
From: "Peter 'p2' De Schrijver" <[email protected]>
Subject: Group and resource assignments for TWL4030Actually, this patch doesn't apply on current HEAD. Any dependency ?
nevermind. Found it.
Depends on "expose VPLL2" patch. Sending this one rebased in a bit
Signature · 1 line
balbi
PATCH 1/1 twl4030 power scripts, initsection fixups
From: David Brownell <[email protected]>
Remove section mismatch warnings from twl4030 power script declaration ... unfortunately, this use-once data can't live in initdata sections (or initconst) until some driver stacks (starting with I2C) have better support for non-hotpluggable componentry.
[[email protected]: updated twl4030-power.c]
---
This patch depends on patches [1] and [2]
[1] http://patchwork.kernel.org/patch/11961/
[2] http://patchwork.kernel.org/patch/11962/
arch/arm/mach-omap2/board-3430sdp.c | 16 ++++++++-------- arch/arm/mach-omap2/board-ldp.c | 16 ++++++++-------- arch/arm/mach-omap2/twl4030-generic-scripts.c | 12 ++++++------ drivers/mfd/twl4030-power.c | 18 +++++++++--------- 4 files changed, 31 insertions(+), 31 deletions(-)
arch/arm/mach-omap2/board-3430sdp.c +8 -8
@@ -394,7 +394,7 @@ static struct twl4030_madc_platform_data sdp3430_madc_data = { }; -static struct twl4030_ins __initdata sleep_on_seq[] = { +static struct twl4030_ins sleep_on_seq[] = {/* * Turn off VDD1 and VDD2. */
@@ -409,13 +409,13 @@ static struct twl4030_ins __initdata sleep_on_seq[] = {#endif }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT , }; -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { #ifndef CONFIG_DISABLE_HFCLK/* * Wakeup VDD1 and VDD2.
@@ -435,13 +435,13 @@ static struct twl4030_ins wakeup_seq[] __initdata = {#endif /* #ifndef CONFIG_DISABLE_HFCLK */ }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_ins wrst_seq[]__initdata = { +static struct twl4030_ins wrst_seq[] = {/* * Reset twl4030. * Reset VDD1 regulator.
@@ -457,19 +457,19 @@ static struct twl4030_ins wrst_seq[] __initdata = { {MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2}, {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2}, }; -static struct twl4030_script wrst_script__initdata = { +static struct twl4030_script wrst_script = { .script = wrst_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WRST_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, &wrst_script, }; -static struct twl4030_power_data sdp3430_t2scripts_data__initdata = { +static struct twl4030_power_data sdp3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
arch/arm/mach-omap2/board-ldp.c +8 -8
@@ -374,7 +374,7 @@ static int ldp_batt_table[] = {4040 ,3910 ,3790 ,3670 ,3550 }; -static struct twl4030_ins __initdata sleep_on_seq[] = { +static struct twl4030_ins sleep_on_seq[] = {/* * Turn off VDD1 and VDD2. */
@@ -389,13 +389,13 @@ static struct twl4030_ins __initdata sleep_on_seq[] = {#endif }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT , }; -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { #ifndef CONFIG_DISABLE_HFCLK/* * Wakeup VDD1 and VDD2.
@@ -415,13 +415,13 @@ static struct twl4030_ins wakeup_seq[] __initdata = {#endif /* #ifndef CONFIG_DISABLE_HFCLK */ }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_ins wrst_seq[]__initdata = { +static struct twl4030_ins wrst_seq[] = {/* * Reset twl4030. * Reset VDD1 regulator.
@@ -438,19 +438,19 @@ static struct twl4030_ins wrst_seq[] __initdata = { {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2}, }; -static struct twl4030_script wrst_script__initdata = { +static struct twl4030_script wrst_script = { .script = wrst_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WRST_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, &wrst_script, }; -static struct twl4030_power_data sdp3430_t2scripts_data__initdata = { +static struct twl4030_power_data sdp3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
arch/arm/mach-omap2/twl4030-generic-scripts.c +6 -6
@@ -35,14 +35,14 @@* resources to sleep and then all the other resources. */ -static struct twl4030_ins sleep_on_seq[]__initdata = { +static struct twl4030_ins sleep_on_seq[] = { {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_RC ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_SLEEP ),4 }, {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_ALL ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_SLEEP ),4 }, }; -static struct twl4030_script sleep_on_script__initdata = { +static struct twl4030_script sleep_on_script = { .script = sleep_on_seq, .size =ARRAY_SIZE (sleep_on_seq), .flags =TRITON_SLEEP_SCRIPT ,
@@ -53,7 +53,7 @@ static struct twl4030_script sleep_on_script __initdata = {* regulators and then all other resources. */ -static struct twl4030_ins wakeup_seq[]__initdata = { +static struct twl4030_ins wakeup_seq[] = { {MSG_SINGULAR (DEV_GRP_NULL ,0x17 ,RES_STATE_ACTIVE ),0x30 }, {MSG_BROADCAST (DEV_GRP_NULL ,RES_GRP_PP_PR ,RES_TYPE_ALL ,RES_TYPE2_R0 ,RES_STATE_ACTIVE ),0x37 },
@@ -61,18 +61,18 @@ static struct twl4030_ins wakeup_seq[] __initdata = { RES_STATE_ACTIVE), 0x2}, }; -static struct twl4030_script wakeup_script__initdata = { +static struct twl4030_script wakeup_script = { .script = wakeup_seq, .size =ARRAY_SIZE (wakeup_seq), .flags =TRITON_WAKEUP12_SCRIPT |TRITON_WAKEUP3_SCRIPT , }; -static struct twl4030_script *twl4030_scripts[]__initdata = { +static struct twl4030_script *twl4030_scripts[] = { &sleep_on_script, &wakeup_script, }; -struct twl4030_power_data generic3430_t2scripts_data__initdata = { +struct twl4030_power_data generic3430_t2scripts_data = { .scripts = twl4030_scripts, .size =ARRAY_SIZE (twl4030_scripts), };
drivers/mfd/twl4030-power.c +9 -9
@@ -104,7 +104,7 @@ static u8 res_config_addrs[] = { [RES_Main_Ref] = 0x94, }; -static int __init twl4030_write_script_byte (u8 address,u8 byte) +static int twl4030_write_script_byte (u8 address,u8 byte) {int err;
@@ -116,7 +116,7 @@ static int __init twl4030_write_script_byte(u8 address, u8 byte)return err; } -static int __init twl4030_write_script_ins (u8 address,u16 pmb_message, +static int twl4030_write_script_ins (u8 address,u16 pmb_message,u8 delay,u8 next) {int err =0 ;
@@ -130,7 +130,7 @@ static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,return err; } -static int __init twl4030_write_script (u8 address,struct twl4030_ins *script, +static int twl4030_write_script (u8 address,struct twl4030_ins *script,int len) {int err =0 ;
@@ -151,7 +151,7 @@ static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,return err; } -static int __init config_wakeup3_sequence (u8 address) +static int config_wakeup3_sequence (u8 address) {int err =0 ;
@@ -169,7 +169,7 @@ static int __init config_wakeup3_sequence(u8 address)return err; } -static int __init config_wakeup12_sequence (u8 address) +static int config_wakeup12_sequence (u8 address) {int err =0 ;
@@ -200,7 +200,7 @@ static int __init config_wakeup12_sequence(u8 address)return err; } -static int __init config_sleep_sequence (u8 address) +static int config_sleep_sequence (u8 address) {int err =0 ;
@@ -222,7 +222,7 @@ static int __init config_sleep_sequence(u8 address)return err; } -static int __init config_warmreset_sequence (u8 address) +static int config_warmreset_sequence (u8 address) {int err =0 ;
@@ -304,7 +304,7 @@ void twl4030_configure_resource(struct twl4030_resconfig *rconfig) } -static int __init load_triton_script (struct twl4030_script *tscript) +static int load_triton_script (struct twl4030_script *tscript) {u8 address = triton_next_free_address;int err;
@@ -330,7 +330,7 @@ static int __init load_triton_script(struct twl4030_script *tscript)return err; } -void __init twl4030_power_init (struct twl4030_power_data *triton2_scripts) +void twl4030_power_init (struct twl4030_power_data *triton2_scripts) {int err =0 ;int i;
Signature · 1 line
1.6.1.3