summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/dm365.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-04 14:28:26 -0800
committerOlof Johansson <olof@lixom.net>2013-12-04 14:28:26 -0800
commit8ae19ec3356901bafa64816d9ea9378896f8979c (patch)
treed2d4d6afdc368596cf19a989ee03708507d339ef /arch/arm/mach-davinci/dm365.c
parentfa22f66b82de3576aa1c35f116a8b3824ed9e123 (diff)
parentee880dbd1688c99084052c7890246c1e16c89820 (diff)
downloadop-kernel-dev-8ae19ec3356901bafa64816d9ea9378896f8979c.zip
op-kernel-dev-8ae19ec3356901bafa64816d9ea9378896f8979c.tar.gz
Merge tag 'davinci-fixes-for-v3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
From Sekhar Nori: This pull request includes a patch to align platform code to driver's usage of platform_get_resource_byname() This is needed to start successfully probing audio again. The regression was introduced in v3.13 merge window. * tag 'davinci-fixes-for-v3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: Fix McASP mem resource names Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-davinci/dm365.c')
-rw-r--r--arch/arm/mach-davinci/dm365.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 9c96520..d7c6f85 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -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,
OpenPOWER on IntegriCloud