summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/bcm2709_defconfig2
-rw-r--r--arch/arm/configs/bcmrpi_defconfig2
-rw-r--r--arch/arm/mach-bcm2708/Makefile2
-rw-r--r--arch/arm/mach-bcm2708/power.c2
-rw-r--r--arch/arm/mach-bcm2708/vc_mem.c2
-rw-r--r--arch/arm/mach-bcm2709/Makefile2
-rw-r--r--arch/arm/mach-bcm2709/power.c2
-rw-r--r--arch/arm/mach-bcm2709/vc_mem.c2
-rw-r--r--[-rwxr-xr-x]arch/arm/mach-bcm2709/vc_support.c2
9 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
index 367a04abee52..ff875811ce91 100644
--- a/arch/arm/configs/bcm2709_defconfig
+++ b/arch/arm/configs/bcm2709_defconfig
@@ -1052,6 +1052,8 @@ CONFIG_FB_TFT_UPD161704=m
CONFIG_FB_TFT_WATTEROTT=m
CONFIG_FB_FLEX=m
CONFIG_FB_TFT_FBTFT_DEVICE=m
+CONFIG_MAILBOX=y
+CONFIG_BCM2708_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXTCON=m
CONFIG_EXTCON_ARIZONA=m
diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
index db287f3a40e4..e3399796aa03 100644
--- a/arch/arm/configs/bcmrpi_defconfig
+++ b/arch/arm/configs/bcmrpi_defconfig
@@ -1045,6 +1045,8 @@ CONFIG_FB_TFT_UPD161704=m
CONFIG_FB_TFT_WATTEROTT=m
CONFIG_FB_FLEX=m
CONFIG_FB_TFT_FBTFT_DEVICE=m
+CONFIG_MAILBOX=y
+CONFIG_BCM2708_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXTCON=m
CONFIG_EXTCON_ARIZONA=m
diff --git a/arch/arm/mach-bcm2708/Makefile b/arch/arm/mach-bcm2708/Makefile
index 454408cbeade..c1e7d41d8f4c 100644
--- a/arch/arm/mach-bcm2708/Makefile
+++ b/arch/arm/mach-bcm2708/Makefile
@@ -2,6 +2,6 @@
# Makefile for the linux kernel.
#
-obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o vcio.o power.o
+obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o power.o
obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o
obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o
diff --git a/arch/arm/mach-bcm2708/power.c b/arch/arm/mach-bcm2708/power.c
index 0db355dcc233..796837f2702c 100644
--- a/arch/arm/mach-bcm2708/power.c
+++ b/arch/arm/mach-bcm2708/power.c
@@ -14,8 +14,8 @@
#include <linux/module.h>
#include <linux/semaphore.h>
#include <linux/bug.h>
+#include <linux/platform_data/mailbox-bcm2708.h>
#include <mach/power.h>
-#include <mach/vcio.h>
#include <mach/arm_power.h>
#define DRIVER_NAME "bcm2708_power"
diff --git a/arch/arm/mach-bcm2708/vc_mem.c b/arch/arm/mach-bcm2708/vc_mem.c
index 2982af7182ba..226b737d102f 100644
--- a/arch/arm/mach-bcm2708/vc_mem.c
+++ b/arch/arm/mach-bcm2708/vc_mem.c
@@ -22,6 +22,7 @@
#include <linux/debugfs.h>
#include <asm/uaccess.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_data/mailbox-bcm2708.h>
#ifdef CONFIG_ARCH_KONA
#include <chal/chal_ipc.h>
@@ -31,7 +32,6 @@
#endif
#include "mach/vc_mem.h"
-#include <mach/vcio.h>
#define DRIVER_NAME "vc-mem"
diff --git a/arch/arm/mach-bcm2709/Makefile b/arch/arm/mach-bcm2709/Makefile
index f07c38b77aba..77b842945050 100644
--- a/arch/arm/mach-bcm2709/Makefile
+++ b/arch/arm/mach-bcm2709/Makefile
@@ -2,6 +2,6 @@
# Makefile for the linux kernel.
#
-obj-$(CONFIG_MACH_BCM2709) += bcm2709.o armctrl.o vcio.o power.o
+obj-$(CONFIG_MACH_BCM2709) += bcm2709.o armctrl.o power.o
obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o
obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o
diff --git a/arch/arm/mach-bcm2709/power.c b/arch/arm/mach-bcm2709/power.c
index 88c1e28231d7..960e4728ae57 100644
--- a/arch/arm/mach-bcm2709/power.c
+++ b/arch/arm/mach-bcm2709/power.c
@@ -14,8 +14,8 @@
#include <linux/module.h>
#include <linux/semaphore.h>
#include <linux/bug.h>
+#include <linux/platform_data/mailbox-bcm2708.h>
#include <mach/power.h>
-#include <mach/vcio.h>
#include <mach/arm_power.h>
#define DRIVER_NAME "bcm2708_power"
diff --git a/arch/arm/mach-bcm2709/vc_mem.c b/arch/arm/mach-bcm2709/vc_mem.c
index ac578db0de3c..d2adfd1db242 100644
--- a/arch/arm/mach-bcm2709/vc_mem.c
+++ b/arch/arm/mach-bcm2709/vc_mem.c
@@ -22,6 +22,7 @@
#include <linux/debugfs.h>
#include <asm/uaccess.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_data/mailbox-bcm2708.h>
#ifdef CONFIG_ARCH_KONA
#include <chal/chal_ipc.h>
@@ -31,7 +32,6 @@
#endif
#include "mach/vc_mem.h"
-#include <mach/vcio.h>
#define DRIVER_NAME "vc-mem"
diff --git a/arch/arm/mach-bcm2709/vc_support.c b/arch/arm/mach-bcm2709/vc_support.c
index 0bc41c4f5dd4..c4dc7d68f0f0 100755..100644
--- a/arch/arm/mach-bcm2709/vc_support.c
+++ b/arch/arm/mach-bcm2709/vc_support.c
@@ -6,7 +6,7 @@
*/
#include <linux/module.h>
-#include <mach/vcio.h>
+#include <linux/platform_data/mailbox-bcm2708.h>
#ifdef ECLIPSE_IGNORE