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

Commit 9e7d24f6 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Sekhar Nori
Browse files

DA830: fix SPI1 base address 



Commit 54ce6883 (davinci: da8xx: add spi
resources and registration routine) wrongly assumed that SPI1 is mapped at
the same address on DA830/OMAP-L137 and DA850/OMAP-L138; actually, the base
address was valid only for the latter SoC. Teach the code to pass the correct
SPI1 memory resource for both SoCs...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 336f4027

arch/arm/mach-davinci/devices-da8xx.c

+9 −3
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 
#define DA8XX_GPIO_BASE			0x01e26000

#define DA8XX_I2C1_BASE			0x01e28000

#define DA8XX_SPI0_BASE			0x01c41000

#define DA8XX_SPI1_BASE			0x01f0e000

#define DA830_SPI1_BASE			0x01e12000

#define DA850_SPI1_BASE			0x01f0e000



#define DA8XX_EMAC_CTRL_REG_OFFSET	0x3000

#define DA8XX_EMAC_MOD_REG_OFFSET	0x2000
@@ -762,8 +763,8 @@ static struct resource da8xx_spi0_resources[] = { 


static struct resource da8xx_spi1_resources[] = {

	[0] = {

		.start	= DA8XX_SPI1_BASE,

		.end	= DA8XX_SPI1_BASE + SZ_4K - 1,

		.start	= DA830_SPI1_BASE,

		.end	= DA830_SPI1_BASE + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -832,5 +833,10 @@ int __init da8xx_register_spi(int instance, struct spi_board_info *info, 


	da8xx_spi_pdata[instance].num_chipselect = len;



	if (instance == 1 && cpu_is_davinci_da850()) {

		da8xx_spi1_resources[0].start = DA850_SPI1_BASE;

		da8xx_spi1_resources[0].end = DA850_SPI1_BASE + SZ_4K - 1;

	}



	return platform_device_register(&da8xx_spi_device[instance]);

}