diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-08-23 09:56:47 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 11:08:49 +0200 |
| commit | 7585382ad5ca26134fffc860da9bfc1947895eb3 (patch) | |
| tree | d342f58a97711a7ba60475f1bf375d80d15a7015 | |
| parent | 2f0eebcbb4ae68bc8f4bf1d78bd23bbe817e58fd (diff) | |
| download | talos-obmc-linux-7585382ad5ca26134fffc860da9bfc1947895eb3.tar.gz talos-obmc-linux-7585382ad5ca26134fffc860da9bfc1947895eb3.zip | |
ARM: ux500: Take out STUIB support when not booting with Device Tree
It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.
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/board-mop500-stuib.c | 14 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-uib.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 1 |
4 files changed, 1 insertions, 24 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 0d2a89394e7b..4f55eccae704 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ board-mop500-regulators.o \ - board-mop500-uib.o board-mop500-stuib.o \ + board-mop500-uib.o \ board-mop500-pins.o \ board-mop500-audio.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o diff --git a/arch/arm/mach-ux500/board-mop500-stuib.c b/arch/arm/mach-ux500/board-mop500-stuib.c deleted file mode 100644 index 7fa30217cc01..000000000000 --- a/arch/arm/mach-ux500/board-mop500-stuib.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * License terms: GNU General Public License (GPL), version 2 - */ - -#include <linux/kernel.h> -#include <linux/init.h> - -#include "board-mop500.h" - -void __init mop500_stuib_init(void) -{ -} diff --git a/arch/arm/mach-ux500/board-mop500-uib.c b/arch/arm/mach-ux500/board-mop500-uib.c index 0e94f1dc7a6f..2742eeccbcd0 100644 --- a/arch/arm/mach-ux500/board-mop500-uib.c +++ b/arch/arm/mach-ux500/board-mop500-uib.c @@ -15,7 +15,6 @@ #include "id.h" enum mop500_uib { - STUIB, }; struct uib { @@ -25,11 +24,6 @@ struct uib { }; static struct uib __initdata mop500_uibs[] = { - [STUIB] = { - .name = "ST-UIB", - .option = "stuib", - .init = mop500_stuib_init, - }, }; static struct uib *mop500_uib; @@ -99,7 +93,5 @@ int __init mop500_uib_init(void) return 0; } - __mop500_uib_init(&mop500_uibs[STUIB], "detected"); - return 0; } diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 223639b50441..2fb89e2d5faa 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -89,7 +89,6 @@ extern struct msp_i2s_platform_data msp2_platform_data; extern struct msp_i2s_platform_data msp3_platform_data; extern struct pl022_ssp_controller ssp0_plat; -void __init mop500_stuib_init(void); void __init mop500_pinmaps_init(void); void __init snowball_pinmaps_init(void); void __init hrefv60_pinmaps_init(void); |
