| Message ID | 19769201.1MOf3JVGbC@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Arnd Bergmann <arnd@arndb.de> [140319 14:01]: > On Wednesday 19 March 2014 13:46:19 Tony Lindgren wrote: > > * Arnd Bergmann <arnd@arndb.de> [140319 12:33]: > > > The OMAP H2, OSK and OSIRIS machines cannot build without > > > I2C and TPS65010 both enabled unconditionally. > > > > > > In each case, failing to enable CONFIG_I2C results in a > > > build or link error, so most consistent solution is to > > > ensure that it is impossible to disable those options. > > > > > > It would be nice to leave CONFIG_I2C as user-selectable, > > > but doing that properly would require more work. > > > > We should not select drivers. How about let's just have > > the tps65010 stuff behind an ifdef CONFIG_TPS65010 for > > those boards? > > Good idea. Like this? Looks good to me :) Acked-by: Tony Lindgren <tony@atomide.com> > diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c > index fd90caf..65d2acb 100644 > --- a/arch/arm/mach-omap1/board-h2.c > +++ b/arch/arm/mach-omap1/board-h2.c > @@ -318,6 +318,9 @@ static void __init h2_init_smc91x(void) > > static int tps_setup(struct i2c_client *client, void *context) > { > + if (!IS_BUILTIN(CONFIG_TPS65010)) > + return -ENOSYS; > + > tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V | > TPS_LDO1_ENABLE | TPS_VLDO1_3_0V); > > diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c > index d68909b..3a02621 100644 > --- a/arch/arm/mach-omap1/board-osk.c > +++ b/arch/arm/mach-omap1/board-osk.c > @@ -191,6 +191,9 @@ static struct platform_device osk5912_tps_leds = { > > static int osk_tps_setup(struct i2c_client *client, void *context) > { > + if (!IS_BUILTIN(CONFIG_TPS65010)) > + return -ENOSYS; > + > /* Set GPIO 1 HIGH to disable VBUS power supply; > * OHCI driver powers it up/down as needed. > */ > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index fd90caf..65d2acb 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -318,6 +318,9 @@ static void __init h2_init_smc91x(void) static int tps_setup(struct i2c_client *client, void *context) { + if (!IS_BUILTIN(CONFIG_TPS65010)) + return -ENOSYS; + tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V | TPS_LDO1_ENABLE | TPS_VLDO1_3_0V); diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index d68909b..3a02621 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -191,6 +191,9 @@ static struct platform_device osk5912_tps_leds = { static int osk_tps_setup(struct i2c_client *client, void *context) { + if (!IS_BUILTIN(CONFIG_TPS65010)) + return -ENOSYS; + /* Set GPIO 1 HIGH to disable VBUS power supply; * OHCI driver powers it up/down as needed. */