| Message ID | 1330199334-5133-6-git-send-email-mathieu.poirier@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Sat, Feb 25, 2012 at 8:48 PM, <mathieu.poirier@linaro.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The U8500 platform selects the TPS6105X, so also select the I2C > layer that this driver depends on. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- > arch/arm/mach-ux500/Kconfig | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig > index c7d1fb5..f0f6199 100644 > --- a/arch/arm/mach-ux500/Kconfig > +++ b/arch/arm/mach-ux500/Kconfig > @@ -29,6 +29,7 @@ config MACH_U8500 > select UX500_SOC_DB8500 > select TPS6105X > select SOC_BUS > + select I2C Acked-by: Linus Walleij <linus.walleij@linaro.org> But should it not also select I2C_NOMADIK, which is surely required too. I cannot apply this one since I don't have Lee's SOC_BUS patches on my branch, so it'd be better if this was applied directly on the proper branch ARM SoC tree, Arnd can you take care of it? Yours, Linus Walleij
On Wednesday 29 February 2012, Linus Walleij wrote: > On Sat, Feb 25, 2012 at 8:48 PM, <mathieu.poirier@linaro.org> wrote: > > > From: Arnd Bergmann <arnd@arndb.de> > > > > The U8500 platform selects the TPS6105X, so also select the I2C > > layer that this driver depends on. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > --- > > arch/arm/mach-ux500/Kconfig | 1 + > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig > > index c7d1fb5..f0f6199 100644 > > --- a/arch/arm/mach-ux500/Kconfig > > +++ b/arch/arm/mach-ux500/Kconfig > > @@ -29,6 +29,7 @@ config MACH_U8500 > > select UX500_SOC_DB8500 > > select TPS6105X > > select SOC_BUS > > + select I2C > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > But should it not also select I2C_NOMADIK, which is surely > required too. That's a different question: I2C is needed to build the kernel successfully, while I2C_NOMADIK is (probably) needed to actually run on a given hardware. We normally don't prevent people from selecting silly combinations of config options, but we do try to make sure that any random configuration actually builds. Maybe the answer is instead to remove the 'select TPS6105X' and make sure the platform actually builds without I2C > I cannot apply this one since I don't have Lee's SOC_BUS > patches on my branch, so it'd be better if this was applied > directly on the proper branch ARM SoC tree, Arnd can you > take care of it? I can, but I would prefer if the patches were rebased on to an upstream -rc and I just handle the merge conflicts. Arnd
On Wed, Feb 29, 2012 at 5:34 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Wednesday 29 February 2012, Linus Walleij wrote: > >> I cannot apply this one since I don't have Lee's SOC_BUS >> patches on my branch, so it'd be better if this was applied >> directly on the proper branch ARM SoC tree, Arnd can you >> take care of it? > > I can, but I would prefer if the patches were rebased on to > an upstream -rc and I just handle the merge conflicts. OK I can do that, no problem! Thanks, Linus Walleij
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index c7d1fb5..f0f6199 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -29,6 +29,7 @@ config MACH_U8500 select UX500_SOC_DB8500 select TPS6105X select SOC_BUS + select I2C help Include support for the mop500 development platform.