| Message ID | 1398265476-29373-4-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 23 April 2014 17:04:34 Maxime Ripard wrote: > Make sure we have the restart hooks in the kernel by selecting them in Kconfig. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/mach-sunxi/Kconfig | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig > index b57d7d53b9d3..5fe80cc9b524 100644 > --- a/arch/arm/mach-sunxi/Kconfig > +++ b/arch/arm/mach-sunxi/Kconfig > @@ -9,6 +9,10 @@ config ARCH_SUNXI > select HAVE_ARM_ARCH_TIMER > select PINCTRL > select PINCTRL_SUNXI > + select POWER_RESET > + select POWER_RESET_SUN6I > + select POWER_SUPPLY > select RESET_CONTROLLER > select SUN4I_TIMER > select SUN5I_HSTIMER > + select SUNXI_WATCHDOG I think you can't select SUNXI_WATCHDOG without also selecting WATCHDOG first. I would prefer not to do that however, and leave it up to the defconfig to enable it, loading the reset/watchdog driver as a module seems entirely reasonable in a multiplatform distro kernel. Arnd
On Wed, Apr 23, 2014 at 06:00:03PM +0200, Arnd Bergmann wrote: > On Wednesday 23 April 2014 17:04:34 Maxime Ripard wrote: > > Make sure we have the restart hooks in the kernel by selecting them in Kconfig. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > arch/arm/mach-sunxi/Kconfig | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig > > index b57d7d53b9d3..5fe80cc9b524 100644 > > --- a/arch/arm/mach-sunxi/Kconfig > > +++ b/arch/arm/mach-sunxi/Kconfig > > @@ -9,6 +9,10 @@ config ARCH_SUNXI > > select HAVE_ARM_ARCH_TIMER > > select PINCTRL > > select PINCTRL_SUNXI > > + select POWER_RESET > > + select POWER_RESET_SUN6I > > + select POWER_SUPPLY > > select RESET_CONTROLLER > > select SUN4I_TIMER > > select SUN5I_HSTIMER > > + select SUNXI_WATCHDOG > > I think you can't select SUNXI_WATCHDOG without also selecting WATCHDOG > first. I would prefer not to do that however, and leave it up to the > defconfig to enable it, loading the reset/watchdog driver as a module > seems entirely reasonable in a multiplatform distro kernel. Ok. Let's drop this patch, and I'll send some patches for the defconfig. Thanks! Maxime
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index b57d7d53b9d3..5fe80cc9b524 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -9,6 +9,10 @@ config ARCH_SUNXI select HAVE_ARM_ARCH_TIMER select PINCTRL select PINCTRL_SUNXI + select POWER_RESET + select POWER_RESET_SUN6I + select POWER_SUPPLY select RESET_CONTROLLER select SUN4I_TIMER select SUN5I_HSTIMER + select SUNXI_WATCHDOG
Make sure we have the restart hooks in the kernel by selecting them in Kconfig. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/mach-sunxi/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)