diff options
author | Noralf Trønnes <noralf@tronnes.org> | 2015-05-02 09:34:26 +0200 |
---|---|---|
committer | popcornmix <popcornmix@gmail.com> | 2015-05-18 14:13:11 +0100 |
commit | 6ca78da96b81439f7ca50e05df10410669ebbb10 (patch) | |
tree | dd51717437b017c32cda0dd91c1d5b37bdff8949 | |
parent | 8707f869b973a648f7cd8c92693f18e2c643e5b8 (diff) | |
download | linux-6ca78da96b81439f7ca50e05df10410669ebbb10.tar.gz |
BCM270x: Use bcm2708-vcio
Use bcm2708-vcio instead of the arch version.
Change affected drivers to use linux/platform_data/mailbox-bcm2708.h
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-rw-r--r-- | arch/arm/configs/bcm2709_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/bcmrpi_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcm2708/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcm2708/power.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcm2708/vc_mem.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcm2709/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcm2709/power.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcm2709/vc_mem.c | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | arch/arm/mach-bcm2709/vc_support.c | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | drivers/cpufreq/bcm2835-cpufreq.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/bcm2835-hwmon.c | 2 | ||||
-rw-r--r-- | drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 | ||||
-rw-r--r-- | drivers/thermal/bcm2835-thermal.c | 2 | ||||
-rw-r--r-- | drivers/video/fbdev/bcm2708_fb.c | 2 |
14 files changed, 16 insertions, 12 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 diff --git a/drivers/cpufreq/bcm2835-cpufreq.c b/drivers/cpufreq/bcm2835-cpufreq.c index 447ca0902704..6735da9d31e3 100755..100644 --- a/drivers/cpufreq/bcm2835-cpufreq.c +++ b/drivers/cpufreq/bcm2835-cpufreq.c @@ -26,7 +26,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/cpufreq.h> -#include <mach/vcio.h> +#include <linux/platform_data/mailbox-bcm2708.h> /* ---------- DEFINES ---------- */ /*#define CPUFREQ_DEBUG_ENABLE*/ /* enable debugging */ diff --git a/drivers/hwmon/bcm2835-hwmon.c b/drivers/hwmon/bcm2835-hwmon.c index 5bbed450100a..d14502ca8a5a 100644 --- a/drivers/hwmon/bcm2835-hwmon.c +++ b/drivers/hwmon/bcm2835-hwmon.c @@ -17,9 +17,9 @@ #include <linux/init.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/platform_device.h> #include <linux/sysfs.h> -#include <mach/vcio.h> #include <linux/slab.h> #include <linux/err.h> diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index 8ec88bb15eba..70e5086292e7 100644 --- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -40,13 +40,13 @@ #include <linux/dma-mapping.h> #include <linux/version.h> #include <linux/io.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/uaccess.h> #include <asm/pgtable.h> #include <mach/irqs.h> #include <mach/platform.h> -#include <mach/vcio.h> #define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32) diff --git a/drivers/thermal/bcm2835-thermal.c b/drivers/thermal/bcm2835-thermal.c index 85fceb5feab2..0c556d10c853 100644 --- a/drivers/thermal/bcm2835-thermal.c +++ b/drivers/thermal/bcm2835-thermal.c @@ -15,10 +15,10 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/sysfs.h> -#include <mach/vcio.h> #include <linux/thermal.h> diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c index 52e655acf25d..345c15e2b16b 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -24,6 +24,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/list.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/printk.h> @@ -32,7 +33,6 @@ #include <mach/dma.h> #include <mach/platform.h> -#include <mach/vcio.h> #include <asm/sizes.h> #include <linux/io.h> |