mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

ARM: ux500: Take out STUIB support when not booting with Device Tree

Browse source 
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>
This commit is contained in:
Lee Jones 2013-08-23 09:56:47 +01:00 committed by Linus Walleij
parent 2f0eebcbb4
commit 7585382ad5
4 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-ux500/Makefile
View file

@ -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

14
arch/arm/mach-ux500/board-mop500-stuib.c
View file

@ -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)
{
}

8
arch/arm/mach-ux500/board-mop500-uib.c
View file

@ -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;
}

1
arch/arm/mach-ux500/board-mop500.h
View file

@ -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);