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

Commit 6f6d6433 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Consolidate [A|D]B8500 platform data 



Move the platform data from all these files into one, delete empty
files and remove all references to them.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d4033047

arch/arm/mach-ux500/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -4,8 +4,8 @@ 




obj-y				:= cpu.o devices.o id.o timer.o pm.o

obj-y				:= cpu.o devices.o id.o timer.o pm.o

obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o

obj-$(CONFIG_MACH_MOP500)	+= board-mop500.o board-mop500-sdi.o \

obj-$(CONFIG_MACH_MOP500)	+= board-mop500-sdi.o \

				board-mop500-regulators.o \

				board-mop500-regulators.o \

				board-mop500-pins.o \

				board-mop500-pins.o \

				board-mop500-audio.o

				board-mop500-audio.o

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -10,13 +10,11 @@ 
#include <linux/platform_data/pinctrl-nomadik.h>

#include <linux/platform_data/pinctrl-nomadik.h>

#include <linux/platform_data/dma-ste-dma40.h>

#include <linux/platform_data/dma-ste-dma40.h>





#include "devices.h"

#include "irqs.h"

#include "irqs.h"

#include <linux/platform_data/asoc-ux500-msp.h>

#include <linux/platform_data/asoc-ux500-msp.h>





#include "ste-dma40-db8500.h"

#include "ste-dma40-db8500.h"

#include "board-mop500.h"

#include "board-mop500.h"

#include "devices-db8500.h"





static struct stedma40_chan_cfg msp0_dma_rx = {

static struct stedma40_chan_cfg msp0_dma_rx = {

	.high_priority = true,

	.high_priority = true,

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -14,10 +14,8 @@ 
#include <linux/platform_data/dma-ste-dma40.h>

#include <linux/platform_data/dma-ste-dma40.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include "devices.h"





#include "db8500-regs.h"

#include "db8500-regs.h"

#include "devices-db8500.h"

#include "board-mop500.h"

#include "board-mop500.h"

#include "ste-dma40-db8500.h"

#include "ste-dma40-db8500.h"

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

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

 * Copyright (C) 2008-2012 ST-Ericsson

 *

 * Author: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2, as

 * published by the Free Software Foundation.

 *

 */

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/platform_data/db8500_thermal.h>

#include <linux/amba/bus.h>

#include <linux/amba/pl022.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/regulator/ab8500.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/driver.h>

#include <linux/mfd/tps6105x.h>

#include <linux/platform_data/leds-lp55xx.h>

#include <linux/input.h>

#include <linux/delay.h>

#include <linux/leds.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_data/pinctrl-nomadik.h>

#include <linux/platform_data/dma-ste-dma40.h>



#include <asm/mach-types.h>



#include "setup.h"

#include "devices.h"

#include "irqs.h"



#include "ste-dma40-db8500.h"

#include "db8500-regs.h"

#include "devices-db8500.h"

#include "board-mop500.h"

#include "board-mop500-regulators.h"



struct ab8500_platform_data ab8500_platdata = {

	.irq_base	= MOP500_AB8500_IRQ_BASE,

	.regulator	= &ab8500_regulator_plat_data,

};

arch/arm/mach-ux500/cpu-db8500.c

+15 −3
Original line number Original line Diff line number Diff line
@@ -28,14 +28,26 @@ 
#include <asm/mach/map.h>

#include <asm/mach/map.h>





#include "setup.h"

#include "setup.h"

#include "devices.h"

#include "irqs.h"

#include "irqs.h"





#include "devices-db8500.h"

#include "board-mop500-regulators.h"

#include "db8500-regs.h"

#include "board-mop500.h"

#include "board-mop500.h"

#include "db8500-regs.h"

#include "id.h"

#include "id.h"





struct ab8500_platform_data ab8500_platdata = {

	.irq_base	= MOP500_AB8500_IRQ_BASE,

	.regulator	= &ab8500_regulator_plat_data,

};



struct prcmu_pdata db8500_prcmu_pdata = {

	.ab_platdata	= &ab8500_platdata,

	.ab_irq		= IRQ_DB8500_AB8500,

	.irq_base	= IRQ_PRCMU_BASE,

	.version_offset	= DB8500_PRCMU_FW_VERSION_OFFSET,

	.legacy_offset	= DB8500_PRCMU_LEGACY_OFFSET,

};



/* minimum static i/o mapping required to boot U8500 platforms */

/* minimum static i/o mapping required to boot U8500 platforms */

static struct map_desc u8500_uart_io_desc[] __initdata = {

static struct map_desc u8500_uart_io_desc[] __initdata = {

	__IO_DEV_DESC(U8500_UART0_BASE, SZ_4K),

	__IO_DEV_DESC(U8500_UART0_BASE, SZ_4K),