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

Commit 49b1a616 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP1: Move omap_init_uwire to mach-omap1 



This hardware exists on omap1 only and there's no need to keep it
in plat-omap/devices.c. No functional changes.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fcc76a85

arch/arm/mach-omap1/devices.c

+44 −0
Original line number Diff line number Diff line
@@ -258,6 +258,49 @@ void __init omap1_camera_init(void *info) 


static inline void omap_init_sti(void) {}



/* Numbering for the SPI-capable controllers when used for SPI:

 * spi		= 1

 * uwire	= 2

 * mmc1..2	= 3..4

 * mcbsp1..3	= 5..7

 */



#if defined(CONFIG_SPI_OMAP_UWIRE) || defined(CONFIG_SPI_OMAP_UWIRE_MODULE)



#define	OMAP_UWIRE_BASE		0xfffb3000



static struct resource uwire_resources[] = {

	{

		.start		= OMAP_UWIRE_BASE,

		.end		= OMAP_UWIRE_BASE + 0x20,

		.flags		= IORESOURCE_MEM,

	},

};



static struct platform_device omap_uwire_device = {

	.name	   = "omap_uwire",

	.id	     = -1,

	.num_resources	= ARRAY_SIZE(uwire_resources),

	.resource	= uwire_resources,

};



static void omap_init_uwire(void)

{

	/* FIXME define and use a boot tag; not all boards will be hooking

	 * up devices to the microwire controller, and multi-board configs

	 * mean that CONFIG_SPI_OMAP_UWIRE may be configured anyway...

	 */



	/* board-specific code must configure chipselects (only a few

	 * are normally used) and SCLK/SDI/SDO (each has two choices).

	 */

	(void) platform_device_register(&omap_uwire_device);

}

#else

static inline void omap_init_uwire(void) {}

#endif





/*

 * This gets called after board-specific INIT_MACHINE, and initializes most

 * on-chip peripherals accessible on this board (except for few like USB):
@@ -295,6 +338,7 @@ static int __init omap1_init_devices(void) 
	omap_init_rtc();

	omap_init_spi100k();

	omap_init_sti();

	omap_init_uwire();



	return 0;

}

arch/arm/plat-omap/devices.c

+0 −45
Original line number Diff line number Diff line
@@ -109,50 +109,6 @@ static void omap_init_rng(void) 
static inline void omap_init_rng(void) {}

#endif



/*-------------------------------------------------------------------------*/



/* Numbering for the SPI-capable controllers when used for SPI:

 * spi		= 1

 * uwire	= 2

 * mmc1..2	= 3..4

 * mcbsp1..3	= 5..7

 */



#if defined(CONFIG_SPI_OMAP_UWIRE) || defined(CONFIG_SPI_OMAP_UWIRE_MODULE)



#define	OMAP_UWIRE_BASE		0xfffb3000



static struct resource uwire_resources[] = {

	{

		.start		= OMAP_UWIRE_BASE,

		.end		= OMAP_UWIRE_BASE + 0x20,

		.flags		= IORESOURCE_MEM,

	},

};



static struct platform_device omap_uwire_device = {

	.name	   = "omap_uwire",

	.id	     = -1,

	.num_resources	= ARRAY_SIZE(uwire_resources),

	.resource	= uwire_resources,

};



static void omap_init_uwire(void)

{

	/* FIXME define and use a boot tag; not all boards will be hooking

	 * up devices to the microwire controller, and multi-board configs

	 * mean that CONFIG_SPI_OMAP_UWIRE may be configured anyway...

	 */



	/* board-specific code must configure chipselects (only a few

	 * are normally used) and SCLK/SDI/SDO (each has two choices).

	 */

	(void) platform_device_register(&omap_uwire_device);

}

#else

static inline void omap_init_uwire(void) {}

#endif



#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)



static phys_addr_t omap_dsp_phys_mempool_base;
@@ -208,7 +164,6 @@ static int __init omap_init_devices(void) 
	 * in alphabetical order so they're easier to sort through.

	 */

	omap_init_rng();

	omap_init_uwire();

	return 0;

}

arch_initcall(omap_init_devices);