On Tue, Jul 22, 2014 at 09:28:39AM +0200, Arnd Bergmann wrote: > On Monday 21 July 2014 14:07:57 Brian Norris wrote: > > diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig > > index 0073633e7699..9782e8d80647 100644 > > --- a/arch/arm/mach-bcm/Kconfig > > +++ b/arch/arm/mach-bcm/Kconfig > > @@ -94,6 +94,7 @@ config ARCH_BRCMSTB > > select MIGHT_HAVE_PCI > > select HAVE_SMP > > select HAVE_ARM_ARCH_TIMER > > + select POWER_RESET_BRCMSTB > > help > > Say Y if you intend to run the kernel on a Broadcom ARM-based STB > > chipset. > > diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig > > index bdcf5173e377..fcb9825debe5 100644 > > --- a/drivers/power/reset/Kconfig > > +++ b/drivers/power/reset/Kconfig > > @@ -20,6 +20,16 @@ config POWER_RESET_AXXIA > > > > Say Y if you have an Axxia family SoC. > > > > +config POWER_RESET_BRCMSTB > > + bool "Broadcom STB reset driver" > > + depends on POWER_RESET && ARCH_BRCMSTB > > + help > > + This driver provides restart support for ARM-based Broadcom STB > > + boards. > > + > > + Say Y here if you have an ARM-based Broadcom STB board and you wish > > + to have restart support. > > + > > config POWER_RESET_GPIO > > bool "GPIO power-off driver" > > depends on OF_GPIO && POWER_RESET > > > > (nitpicking) > > You shouldn't have both a user-selectable option and 'select' it from > the platform, because it makes it inherently not selectable, in particular > in the combination with 'depends on ARCH_BRCMSTB'. OK, thanks for the comment. Note that there is some precedent for this bad Kconfig behavior in the same subsystem (POWER_RESET_GPIO and POWER_RESET_VEXPRESS are both 'select'ed in arch/arm/mach-*/Kconfig). [...] > My preference in this case however would be to just drop the 'select' > statement and add the driver to the defconfig file. How about a third option, where we drop the 'select' statement and set POWER_RESET_BRCMSTB to be 'default y'? Then we don't have to modify the defconfig, and it gives the added bonus of choosing a sane default even if you're not based on the multi_v7_defconfig. i.e.: diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 58c01aed9752..634de7b7fd28 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -94,7 +94,6 @@ config ARCH_BRCMSTB select MIGHT_HAVE_PCI select HAVE_SMP select HAVE_ARM_ARCH_TIMER - select POWER_RESET_BRCMSTB select BRCMSTB_GISB_ARB select BRCMSTB_L2_IRQ help diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index fcb9825debe5..ab5d57e2766d 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -23,6 +23,7 @@ config POWER_RESET_AXXIA config POWER_RESET_BRCMSTB bool "Broadcom STB reset driver" depends on POWER_RESET && ARCH_BRCMSTB + default y help This driver provides restart support for ARM-based Broadcom STB boards. Brian -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
