raspberrypi · popcornmix · Jul 27, 2015 · Jul 24, 2015 · Jul 24, 2015 · Jul 24, 2015
diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
@@ -1078,7 +1078,6 @@ CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_MAILBOX=y
-CONFIG_BCM2708_MBOX=y
 CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXTCON=m

diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
@@ -1064,7 +1064,6 @@ CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_MAILBOX=y
-CONFIG_BCM2708_MBOX=y
 CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXTCON=m

diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
@@ -1071,7 +1071,6 @@ CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_MAILBOX=y
-CONFIG_BCM2708_MBOX=y
 CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXTCON=m

diff --git a/drivers/char/broadcom/vc_mem.c b/drivers/char/broadcom/vc_mem.c
@@ -22,7 +22,6 @@
 #include <linux/debugfs.h>
 #include <asm/uaccess.h>
 #include <linux/dma-mapping.h>
-#include <linux/platform_data/mailbox-bcm2708.h>
 #include <linux/broadcom/vc_mem.h>
 
 #define DRIVER_NAME  "vc-mem"

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
@@ -259,7 +259,7 @@ config ARM_SPEAR_CPUFREQ
 	  This adds the CPUFreq driver support for SPEAr SOCs.
 
 config ARM_BCM2835_CPUFREQ
-	depends on BCM2708_MBOX
+	depends on RASPBERRYPI_FIRMWARE
 	bool "BCM2835 Driver"
 	default y
 	help

diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
@@ -19,15 +19,13 @@
 #define MBOX_MSG(chan, data28)		(((data28) & ~0xf) | ((chan) & 0xf))
 #define MBOX_CHAN(msg)			((msg) & 0xf)
 #define MBOX_DATA28(msg)		((msg) & ~0xf)
-#define MBOX_CHAN_VCHIQ			3
 #define MBOX_CHAN_PROPERTY		8
 
 struct rpi_firmware {
 	struct mbox_client cl;
 	struct mbox_chan *chan; /* The property channel. */
 	struct completion c;
 	u32 enabled;
-	u32 received;
 };
 
 static struct platform_device *g_pdev;
@@ -37,15 +35,14 @@ static DEFINE_MUTEX(transaction_lock);
 static void response_callback(struct mbox_client *cl, void *msg)
 {
 	struct rpi_firmware *fw = container_of(cl, struct rpi_firmware, cl);
-	fw->received = *(u32 *)msg;
 	complete(&fw->c);
 }
 
 /*
  * Sends a request to the firmware through the BCM2835 mailbox driver,
  * and synchronously waits for the reply.
  */
-int
+static int
 rpi_firmware_transaction(struct rpi_firmware *fw, u32 chan, u32 data)
 {
 	u32 message = MBOX_MSG(chan, data);
@@ -57,8 +54,7 @@ rpi_firmware_transaction(struct rpi_firmware *fw, u32 chan, u32 data)
 	reinit_completion(&fw->c);
 	ret = mbox_send_message(fw->chan, &message);
 	if (ret >= 0) {
-		if (chan != MBOX_CHAN_VCHIQ)
-			wait_for_completion(&fw->c);
+		wait_for_completion(&fw->c);
 		ret = 0;
 	} else {
 		dev_err(fw->cl.dev, "mbox_send_message returned %d\n", ret);
@@ -67,13 +63,6 @@ rpi_firmware_transaction(struct rpi_firmware *fw, u32 chan, u32 data)
 
 	return ret;
 }
-EXPORT_SYMBOL(rpi_firmware_transaction);
-
-u32 rpi_firmware_transaction_received(struct rpi_firmware *fw)
-{
-	return MBOX_DATA28(fw->received);
-}
-EXPORT_SYMBOL(rpi_firmware_transaction_received);
 
 /**
  * rpi_firmware_property_list - Submit firmware property list

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
@@ -585,7 +585,7 @@ config TOUCHSCREEN_EDT_FT5X06
 
 config TOUCHSCREEN_RPI_FT5406
 	tristate "Raspberry Pi FT5406 driver"
-	depends on ARCH_BCM2708 || ARCH_BCM2709
+	depends on RASPBERRYPI_FIRMWARE
 	help
 	  Say Y here to enable the Raspberry Pi memory based FT5406 device
 

diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
@@ -7,12 +7,6 @@ menuconfig MAILBOX
 
 if MAILBOX
 
-config BCM2708_MBOX
-	bool "Broadcom BCM2708 Mailbox (vcio)"
-	depends on BCM2835_MBOX
-	help
-	  Broadcom BCM2708 Mailbox (vcio)
-
 config ARM_MHU
 	tristate "ARM MHU Mailbox"
 	depends on ARM_AMBA

diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile
@@ -2,8 +2,6 @@
 
 obj-$(CONFIG_MAILBOX)		+= mailbox.o
 
-obj-$(CONFIG_BCM2708_MBOX)	+= bcm2708-vcio.o
-
 obj-$(CONFIG_ARM_MHU)	+= arm_mhu.o
 
 obj-$(CONFIG_PL320_MBOX)	+= pl320-ipc.o

diff --git a/drivers/mailbox/bcm2708-vcio.c b/drivers/mailbox/bcm2708-vcio.c
diff --git a/drivers/misc/vc04_services/Kconfig b/drivers/misc/vc04_services/Kconfig
@@ -1,6 +1,6 @@
 config BCM2708_VCHIQ
 	tristate "Videocore VCHIQ"
-	depends on (MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835) && BCM2708_MBOX
+	depends on RASPBERRYPI_FIRMWARE
 	default y
 	help
 		Kernel to VideoCore communication interface for the

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
@@ -239,7 +239,7 @@ config INTEL_POWERCLAMP
 	  user interface is exposed via generic thermal framework.
 
 config THERMAL_BCM2835
-	depends on BCM2708_MBOX
+	depends on RASPBERRYPI_FIRMWARE
 	tristate "BCM2835 Thermal Driver"
 	help
 	  This will enable temperature monitoring for the Broadcom BCM2835

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
@@ -226,7 +226,7 @@ comment "Frame buffer hardware drivers"
 
 config FB_BCM2708
 	tristate "BCM2708 framebuffer support"
-	depends on FB && ARM && BCM2708_MBOX
+	depends on FB && RASPBERRYPI_FIRMWARE
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT

diff --git a/include/linux/platform_data/mailbox-bcm2708.h b/include/linux/platform_data/mailbox-bcm2708.h
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -116,8 +116,6 @@ enum rpi_firmware_property_tag {
 	RPI_FIRMWARE_GET_DMA_CHANNELS =                       0x00060001,
 };
 
-int rpi_firmware_transaction(struct rpi_firmware *fw, u32 chan, u32 data);
-u32 rpi_firmware_transaction_received(struct rpi_firmware *fw);
 int rpi_firmware_property(struct rpi_firmware *fw,
 			  u32 tag, void *data, size_t len);
 int rpi_firmware_property_list(struct rpi_firmware *fw,