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

Commit ee880dbd authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Sekhar Nori
Browse files

ARM: davinci: Fix McASP mem resource names 



The ASoC McASP driver looks for the mem resources by name
"mpu" and "dat" regions.
Change/add the needed name for the mem resources so the driver can pick the
correct resource.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 6ce4eac1

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

+2 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ int __init da8xx_register_emac(void) 


static struct resource da830_mcasp1_resources[] = {

	{

		.name	= "mcasp1",

		.name	= "mpu",

		.start	= DAVINCI_DA830_MCASP1_REG_BASE,

		.end	= DAVINCI_DA830_MCASP1_REG_BASE + (SZ_1K * 12) - 1,

		.flags	= IORESOURCE_MEM,
@@ -515,7 +515,7 @@ static struct platform_device da830_mcasp1_device = { 


static struct resource da850_mcasp_resources[] = {

	{

		.name	= "mcasp",

		.name	= "mpu",

		.start	= DAVINCI_DA8XX_MCASP0_REG_BASE,

		.end	= DAVINCI_DA8XX_MCASP0_REG_BASE + (SZ_1K * 12) - 1,

		.flags	= IORESOURCE_MEM,

arch/arm/mach-davinci/dm355.c

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ static struct platform_device dm355_edma_device = { 


static struct resource dm355_asp1_resources[] = {

	{

		.name	= "mpu",

		.start	= DAVINCI_ASP1_BASE,

		.end	= DAVINCI_ASP1_BASE + SZ_8K - 1,

		.flags	= IORESOURCE_MEM,

arch/arm/mach-davinci/dm365.c

+1 −0
Original line number Diff line number Diff line
@@ -942,6 +942,7 @@ static struct platform_device dm365_edma_device = { 


static struct resource dm365_asp_resources[] = {

	{

		.name	= "mpu",

		.start	= DAVINCI_DM365_ASP0_BASE,

		.end	= DAVINCI_DM365_ASP0_BASE + SZ_8K - 1,

		.flags	= IORESOURCE_MEM,

arch/arm/mach-davinci/dm644x.c

+1 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ static struct platform_device dm644x_edma_device = { 
/* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */

static struct resource dm644x_asp_resources[] = {

	{

		.name	= "mpu",

		.start	= DAVINCI_ASP0_BASE,

		.end	= DAVINCI_ASP0_BASE + SZ_8K - 1,

		.flags	= IORESOURCE_MEM,

arch/arm/mach-davinci/dm646x.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static struct platform_device dm646x_edma_device = { 


static struct resource dm646x_mcasp0_resources[] = {

	{

		.name	= "mcasp0",

		.name	= "mpu",

		.start 	= DAVINCI_DM646X_MCASP0_REG_BASE,

		.end 	= DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1,

		.flags 	= IORESOURCE_MEM,
@@ -641,7 +641,7 @@ static struct resource dm646x_mcasp0_resources[] = { 


static struct resource dm646x_mcasp1_resources[] = {

	{

		.name	= "mcasp1",

		.name	= "mpu",

		.start	= DAVINCI_DM646X_MCASP1_REG_BASE,

		.end	= DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1,

		.flags	= IORESOURCE_MEM,