diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-11-06 05:05:46 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-26 15:01:58 -0500 |
| commit | cef2e06cf4184cadbfeb459a8a5ab7205f526f78 (patch) | |
| tree | 0ace47aaecb0afd428a08dbd1eb6d5aa59d62f87 | |
| parent | e937274f4268923c5220843cadddb7b78a51ecac (diff) | |
ARM: ux500: Remove unused call to register AMBA devices
Decomission the AMBA device register functions.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices.c | 26 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/setup.h | 3 |
3 files changed, 1 insertions, 30 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 66f351f9358e..d05ba759da30 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for the linux kernel, U8500 machine. | 2 | # Makefile for the linux kernel, U8500 machine. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := cpu.o devices.o id.o timer.o pm.o | 5 | obj-y := cpu.o id.o timer.o pm.o |
| 6 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o | 6 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o |
| 7 | obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o | 7 | obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o |
| 8 | obj-$(CONFIG_MACH_MOP500) += board-mop500-sdi.o \ | 8 | obj-$(CONFIG_MACH_MOP500) += board-mop500-sdi.o \ |
diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c deleted file mode 100644 index 0f9e52b95935..000000000000 --- a/arch/arm/mach-ux500/devices.c +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) ST-Ericsson SA 2010 | ||
| 3 | * | ||
| 4 | * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson | ||
| 5 | * License terms: GNU General Public License (GPL) version 2 | ||
| 6 | */ | ||
| 7 | |||
| 8 | #include <linux/kernel.h> | ||
| 9 | #include <linux/platform_device.h> | ||
| 10 | #include <linux/interrupt.h> | ||
| 11 | #include <linux/io.h> | ||
| 12 | #include <linux/amba/bus.h> | ||
| 13 | |||
| 14 | #include "setup.h" | ||
| 15 | |||
| 16 | #include "db8500-regs.h" | ||
| 17 | |||
| 18 | void __init amba_add_devices(struct amba_device *devs[], int num) | ||
| 19 | { | ||
| 20 | int i; | ||
| 21 | |||
| 22 | for (i = 0; i < num; i++) { | ||
| 23 | struct amba_device *d = devs[i]; | ||
| 24 | amba_device_register(d, &iomem_resource); | ||
| 25 | } | ||
| 26 | } | ||
diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h index bdb356498a74..e5682daadfd8 100644 --- a/arch/arm/mach-ux500/setup.h +++ b/arch/arm/mach-ux500/setup.h | |||
| @@ -27,9 +27,6 @@ extern void __init ux500_init_irq(void); | |||
| 27 | 27 | ||
| 28 | extern struct device *ux500_soc_device_init(const char *soc_id); | 28 | extern struct device *ux500_soc_device_init(const char *soc_id); |
| 29 | 29 | ||
| 30 | struct amba_device; | ||
| 31 | extern void __init amba_add_devices(struct amba_device *devs[], int num); | ||
| 32 | |||
| 33 | extern void ux500_timer_init(void); | 30 | extern void ux500_timer_init(void); |
| 34 | 31 | ||
| 35 | #define __IO_DEV_DESC(x, sz) { \ | 32 | #define __IO_DEV_DESC(x, sz) { \ |
