Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7585382a authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

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: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2f0eebcb

arch/arm/mach-ux500/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-ux500/board-mop500-stuib.c

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * 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)

{

}

arch/arm/mach-ux500/board-mop500-uib.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

}

arch/arm/mach-ux500/board-mop500.h

+0 −1
Original line number Diff line number Diff line
@@ -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);