[GIT PULL 2/4] BCM2835 drivers changes for 4.5

[Arnd Bergmann]

On Monday 28 December 2015 21:01:20 Eric Anholt wrote:

> ----------------------------------------------------------------
> This pull request includes the bcm2835 changes for 4.5 targeting the
> arm-soc next/drivers branch.

(sorry for the late mail, this was stuck in my outbox because of
one failed recipient address)

I've applied this one on top, following the output of the build bot.

	Arnd

>From d635e88df44c8b9860b05d4df22c90bf96e9f986 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd at arndb.de>
Date: Thu, 31 Dec 2015 23:39:14 +0100
Subject: [PATCH] ARM: bcm2835: clarify RASPBERRYPI_FIRMWARE dependency

The firmware driver can be a loadable module, but the power domain
can only be built-in, so we get a build error in an allmodconfig
kernel:

:(.text+0x17e59c): undefined reference to `rpi_firmware_property'
:(.text+0x17e51c): undefined reference to `rpi_firmware_get'
:(.text+0x17e244): undefined reference to `rpi_firmware_property'

This changes the dependency to only allow the power domain code
to be enabled when the firmware driver is built-in. Other users
of the firmware driver may still be loadable modules and not
everyone needs the power domains, so we don't change the firmware
code.

Signed-off-by: Arnd Bergmann <arnd at arndb.de>

diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig
index 5ba1827fe36f..3066edea184d 100644
--- a/drivers/soc/bcm/Kconfig
+++ b/drivers/soc/bcm/Kconfig
@@ -1,7 +1,7 @@
 config RASPBERRYPI_POWER
 	bool "Raspberry Pi power domain driver"
 	depends on ARCH_BCM2835 || COMPILE_TEST
-	depends on RASPBERRYPI_FIRMWARE
+	depends on RASPBERRYPI_FIRMWARE=y
 	select PM_GENERIC_DOMAINS if PM
 	select PM_GENERIC_DOMAINS_OF if PM
 	help