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

Commit e172274c authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Russell King
Browse files

[ARM] 5088/3: pxa2xx: add pxa2xx_set_spi_info to register pxa2xx-spi platform devices 



Add a function to dynamically allocate and register pxa2xx-spi platform
devices, to be used by PXA2xx and PXA3xx based systems. Switch pcm027 and
lubbock to use it.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cabb352a

arch/arm/mach-pxa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ config MACH_PCM027 
	bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"

	select PXA27x

	select IWMMXT

	select PXA_SSP



endmenu

arch/arm/mach-pxa/devices.c

+18 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/arch/mfp-pxa27x.h>

#include <asm/arch/ohci.h>

#include <asm/arch/pxa27x_keypad.h>

#include <asm/arch/pxa2xx_spi.h>

#include <asm/arch/camera.h>

#include <asm/arch/audio.h>
@@ -831,3 +832,20 @@ void __init pxa3xx_set_mci3_info(struct pxamci_platform_data *info) 
}



#endif /* CONFIG_PXA3xx */



/* pxa2xx-spi platform-device ID equals respective SSP platform-device ID + 1.

 * See comment in arch/arm/mach-pxa/ssp.c::ssp_probe() */

void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info)

{

	struct platform_device *pd;



	pd = platform_device_alloc("pxa2xx-spi", id);

	if (pd == NULL) {

		printk(KERN_ERR "pxa2xx-spi: failed to allocate device id %d\n",

		       id);

		return;

	}



	pd->dev.platform_data = info;

	platform_device_add(pd);

}

arch/arm/mach-pxa/lubbock.c

+1 −9
Original line number Diff line number Diff line
@@ -226,14 +226,6 @@ static struct pxa2xx_spi_master pxa_ssp_master_info = { 
	.num_chipselect	= 0,

};



static struct platform_device pxa_ssp = {

	.name		= "pxa2xx-spi",

	.id		= 1,

	.dev = {

		.platform_data	= &pxa_ssp_master_info,

	},

};



static int lubbock_ads7846_pendown_state(void)

{

	/* TS_BUSY is bit 8 in LUB_MISC_RD, but pendown is irq-only */
@@ -367,7 +359,6 @@ static struct platform_device *devices[] __initdata = { 
	&smc91x_device,

	&lubbock_flash_device[0],

	&lubbock_flash_device[1],

	&pxa_ssp,

};



static struct pxafb_mode_info sharp_lm8v31_mode = {
@@ -501,6 +492,7 @@ static void __init lubbock_init(void) 
	lubbock_flash_data[flashboot].name = "boot-rom";

	(void) platform_add_devices(devices, ARRAY_SIZE(devices));



	pxa2xx_set_spi_info(1, &pxa_ssp_master_info);

	spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));

}

arch/arm/mach-pxa/pcm027.c

+31 −0
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ 
#include <linux/platform_device.h>

#include <linux/mtd/physmap.h>

#include <linux/spi/spi.h>

#include <linux/spi/max7301.h>

#include <linux/leds.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/arch/hardware.h>
@@ -108,6 +110,32 @@ static struct platform_device smc91x_device = { 
	.resource	= smc91x_resources,

};



/*

 * SPI host and devices

 */

static struct pxa2xx_spi_master pxa_ssp_master_info = {

	.num_chipselect	= 1,

};



static struct max7301_platform_data max7301_info = {

	.base = -1,

};



/* bus_num must match id in pxa2xx_set_spi_info() call */

static struct spi_board_info spi_board_info[] __initdata = {

	{

		.modalias	= "max7301",

		.platform_data	= &max7301_info,

		.max_speed_hz	= 13000000,

		.bus_num	= 1,

		.chip_select	= 0,

		.mode		= SPI_MODE_0,

	},

};



/*

 * NOR flash

 */

static struct physmap_flash_data pcm027_flash_data = {

	.width  = 4,

};
@@ -190,6 +218,9 @@ static void __init pcm027_init(void) 
#ifdef CONFIG_MACH_PCM990_BASEBOARD

	pcm990_baseboard_init();

#endif



	pxa2xx_set_spi_info(1, &pxa_ssp_master_info);

	spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));

}



static void __init pcm027_map_io(void)

include/asm-arm/arch-pxa/pxa2xx_spi.h

+2 −0
Original line number Diff line number Diff line
@@ -41,4 +41,6 @@ struct pxa2xx_spi_chip { 
	void (*cs_control)(u32 command);

};



extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info);



#endif /*PXA2XX_SPI_H_*/