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

Commit 9e4e7fe1 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 6083/1: ux500: put DB8500-specific devices in devices-db8500.c 



Add devices-db8500.c for DB8500-specific devices, starting
with SSP0.

Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d48fd006

arch/arm/mach-ux500/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
#



obj-y				:= clock.o cpu.o devices.o

obj-$(CONFIG_ARCH_U8500)	+= cpu-u8500.o

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

obj-$(CONFIG_MACH_U8500_MOP)	+= board-mop500.o

obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o localtimer.o

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

+4 −17
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <mach/hardware.h>

#include <mach/setup.h>

#include <mach/devices.h>



#define __MEM_4K_RESOURCE(x) \

	.res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
@@ -91,22 +92,6 @@ static struct pl022_ssp_controller ssp0_platform_data = { 
	.num_chipselect = 5,

};



static struct amba_device pl022_device = {

	.dev = {

		.coherent_dma_mask = ~0,

		.init_name = "ssp0",

		.platform_data = &ssp0_platform_data,

	},

	.res = {

		.start = U8500_SSP0_BASE,

		.end   = U8500_SSP0_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {IRQ_SSP0, NO_IRQ },

	/* ST-Ericsson modified id */

	.periphid = SSP_PER_ID,

};



#define U8500_I2C_RESOURCES(id, size)		\

static struct resource u8500_i2c_resources_##id[] = {	\

	[0] = {					\
@@ -175,7 +160,7 @@ static struct amba_device *amba_devs[] __initdata = { 
	&uart0_device,

	&uart1_device,

	&uart2_device,

	&pl022_device,

	&u8500_ssp0_device,

};



/* add any platform devices here - TODO */
@@ -190,6 +175,8 @@ static void __init u8500_init_machine(void) 
{

	int i;



	u8500_ssp0_device.dev.platform_data = &ssp0_platform_data;



	/* Register the active AMBA devices on this board */

	for (i = 0; i < ARRAY_SIZE(amba_devs); i++)

		amba_device_register(amba_devs[i], &iomem_resource);

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) ST-Ericsson SA 2010

 *

 * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson

 * License terms: GNU General Public License (GPL) version 2

 */



#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/amba/bus.h>



#include <mach/hardware.h>

#include <mach/setup.h>



struct amba_device u8500_ssp0_device = {

	.dev = {

		.coherent_dma_mask = ~0,

		.init_name = "ssp0",

	},

	.res = {

		.start = U8500_SSP0_BASE,

		.end   = U8500_SSP0_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {IRQ_SSP0, NO_IRQ },

	/* ST-Ericsson modified id */

	.periphid = SSP_PER_ID,

};

arch/arm/mach-ux500/include/mach/devices.h

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ struct platform_device; 
struct amba_device;



extern struct amba_device ux500_pl031_device;

extern struct amba_device u8500_ssp0_device;



#endif