Merge tag 'arm/soc/for-4.4/rpi-drivers' of https://github.com/Broadcom/stblinux into...

This pull request contains the Raspberry Pi firmware driver, for communicating
with the VPU which has exclusive control of some of the peripherals.

Eric adds the actual firmware driver and Alexander fixes the header file which
was missing include guards.

* tag 'arm/soc/for-4.4/rpi-drivers' of https://github.com/Broadcom/stblinux:
  ARM: bcm2835: add mutual inclusion protection
  ARM: bcm2835: Add the Raspberry Pi firmware driver

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc drivers/firmware/Kconfig
index d00c6d3,9e06188..cf478fe
--- 1/drivers/firmware/Kconfig
--- 2/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@@ -154,18 -135,17 +154,25 @@@ config ISCSI_IBF
          detect iSCSI boot parameters dynamically during system boot, say Y.
          Otherwise, say N.
  
 -config QCOM_SCM
 -      bool
 -      depends on ARM || ARM64
 -
+ config RASPBERRYPI_FIRMWARE
+       tristate "Raspberry Pi Firmware Driver"
+       depends on BCM2835_MBOX
+       help
+         This option enables support for communicating with the firmware on the
+         Raspberry Pi.
+ 
 +config QCOM_SCM
 +      bool
 +      depends on ARM || ARM64
 +
 +config QCOM_SCM_32
 +      def_bool y
 +      depends on QCOM_SCM && ARM
 +
 +config QCOM_SCM_64
 +      def_bool y
 +      depends on QCOM_SCM && ARM64
 +
  source "drivers/firmware/broadcom/Kconfig"
  source "drivers/firmware/google/Kconfig"
  source "drivers/firmware/efi/Kconfig"

diff --cc drivers/firmware/Makefile
index b984dd7,d20a8f7..48dd417
--- 1/drivers/firmware/Makefile
--- 2/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@@ -13,10 -12,10 +13,11 @@@ obj-$(CONFIG_DMIID)                += dmi-id.
  obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
  obj-$(CONFIG_ISCSI_IBFT)      += iscsi_ibft.o
  obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
 -obj-$(CONFIG_QCOM_SCM)                += qcom_scm.o
 -obj-$(CONFIG_QCOM_SCM)                += qcom_scm-32.o
 -CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
+ obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
 +obj-$(CONFIG_QCOM_SCM)                += qcom_scm.o
 +obj-$(CONFIG_QCOM_SCM_64)     += qcom_scm-64.o
 +obj-$(CONFIG_QCOM_SCM_32)     += qcom_scm-32.o
 +CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQUIRES_SEC=1) -march=armv7-a
  
  obj-y                         += broadcom/
  obj-$(CONFIG_GOOGLE_FIRMWARE) += google/