diff mbox

power: reset: Add MFD_SYSCON depends for brcmstb

Message ID 1430423702-6320-1-git-send-email-f.fainelli@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Florian Fainelli April 30, 2015, 7:55 p.m. UTC
The Broadcom STB reboot driver depends on MFD_SYSCON, it uses
syscon_regmap_lookup_by_phandle() which will not lookup syscon phandles
if MFD_SYSCON is disabled, and instead will return -ENOSYS since it is
turned into an inline stub.

Fixes: 030494e75064c ("power: reset: Add reboot driver for brcmstb")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Sebastian,

Could you queue this as a fix for 4.1? Thanks!

 drivers/power/reset/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Sebastian Reichel May 1, 2015, 8:54 p.m. UTC | #1
Hi,

On Thu, Apr 30, 2015 at 12:55:02PM -0700, Florian Fainelli wrote:
> The Broadcom STB reboot driver depends on MFD_SYSCON, it uses
> syscon_regmap_lookup_by_phandle() which will not lookup syscon phandles
> if MFD_SYSCON is disabled, and instead will return -ENOSYS since it is
> turned into an inline stub.
> 
> Fixes: 030494e75064c ("power: reset: Add reboot driver for brcmstb")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks, queued into fixes branch.

P.S.: Please rebase patches to current tree before sending them. It
had a conflict with 4f5fd6404698 ("power/reset: brcmstb: Make the
driver buildable on MIPS").

-- Sebastian
diff mbox

Patch

diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 028e76504519..f37135c312fd 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -41,6 +41,7 @@  config POWER_RESET_AXXIA
 config POWER_RESET_BRCMSTB
 	bool "Broadcom STB reset driver" if COMPILE_TEST
 	depends on ARM
+	depends on MFD_SYSCON
 	default ARCH_BRCMSTB
 	help
 	  This driver provides restart support for ARM-based Broadcom STB