From: peter.ujfalusi@ti•com (Peter Ujfalusi)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: OMAP2+: twl-common: Remove code for twl6030 and twl6040 setup for legacy boot
Date: Fri, 12 Jul 2013 10:13:52 +0200 [thread overview]
Message-ID: <51DFBAC0.5070806@ti.com> (raw)
In-Reply-To: <20130712072650.GC7656@atomide.com>
On 07/12/2013 09:26 AM, Tony Lindgren wrote:
> * Peter Ujfalusi <peter.ujfalusi@ti•com> [130711 07:30]:
>> OMAP4 no longer boots in legacy mode so the code here is no longer used.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti•com>
>> ---
>> arch/arm/mach-omap2/twl-common.c | 332 ++-------------------------------------
>> arch/arm/mach-omap2/twl-common.h | 8 -
>> 2 files changed, 12 insertions(+), 328 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
>> index c05898f..932dea7 100644
>> --- a/arch/arm/mach-omap2/twl-common.c
>> +++ b/arch/arm/mach-omap2/twl-common.c
>> @@ -38,20 +38,6 @@ static struct i2c_board_info __initdata pmic_i2c_board_info = {
>> .flags = I2C_CLIENT_WAKE,
>> };
>>
>> -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
>> -static int twl_set_voltage(void *data, int target_uV)
>> -{
>> - struct voltagedomain *voltdm = (struct voltagedomain *)data;
>> - return voltdm_scale(voltdm, target_uV);
>> -}
>> -
>> -static int twl_get_voltage(void *data)
>> -{
>> - struct voltagedomain *voltdm = (struct voltagedomain *)data;
>> - return voltdm_get_voltage(voltdm);
>> -}
>> -#endif
>
> Looks like the code above is also needed for omap3 based on the
> if defined?
Yes it is still needed for OMAP3 when booting in legacy. I have moved these
two function down within the #if defined(CONFIG_ARCH_OMAP3) :
#if defined(CONFIG_ARCH_OMAP3)
@@ -189,6 +160,18 @@ static struct regulator_init_data omap3_vdd2 = {
.consumer_supplies = omap3_vdd2_supply,
};
+static int twl_set_voltage(void *data, int target_uV)
+{
+ struct voltagedomain *voltdm = (struct voltagedomain *)data;
+ return voltdm_scale(voltdm, target_uV);
+}
+
+static int twl_get_voltage(void *data)
+{
+ struct voltagedomain *voltdm = (struct voltagedomain *)data;
+ return voltdm_get_voltage(voltdm);
+}
+
static struct twl_regulator_driver_data omap3_vdd1_drvdata = {
.get_voltage = twl_get_voltage,
.set_voltage = twl_set_voltage,
@@ -235,297 +218,6 @@ void __init omap3_pmic_get_config(struct
twl4030_platform_data *pmic_data,
}
#endif /* CONFIG_ARCH_OMAP3 */
--
P?ter
next prev parent reply other threads:[~2013-07-12 8:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-11 14:23 [PATCH] ARM: OMAP2+: twl-common: Remove code for twl6030 and twl6040 setup for legacy boot Peter Ujfalusi
2013-07-11 14:59 ` Nishanth Menon
2013-07-11 15:45 ` Peter Ujfalusi
2013-07-11 16:35 ` Nishanth Menon
2013-07-12 8:59 ` Peter Ujfalusi
2013-07-12 9:27 ` Peter Ujfalusi
2013-07-12 7:26 ` Tony Lindgren
2013-07-12 8:13 ` Peter Ujfalusi [this message]
2013-07-12 8:32 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51DFBAC0.5070806@ti.com \
--to=peter.ujfalusi@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox