Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8ae19ec3356901bafa64816d9ea9378896f8979c

Authored by Olof Johansson
2 parents fa22f66b82 ee880dbd16

Merge tag 'davinci-fixes-for-v3.13-rc3' of git://git.kernel.org/pub/scm/linux/ke… 

…rnel/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>

Showing 5 changed files Side-by-side Diff

arch/arm/mach-davinci/devices-da8xx.c
Diff comments   View file @ 8ae19ec
... ... @@ -487,7 +487,7 @@
487 487  
488 488 static struct resource da830_mcasp1_resources[] = {
489 489 {
490   - .name = "mcasp1",
  490 + .name = "mpu",
491 491 .start = DAVINCI_DA830_MCASP1_REG_BASE,
492 492 .end = DAVINCI_DA830_MCASP1_REG_BASE + (SZ_1K * 12) - 1,
493 493 .flags = IORESOURCE_MEM,
... ... @@ -515,7 +515,7 @@
515 515  
516 516 static struct resource da850_mcasp_resources[] = {
517 517 {
518   - .name = "mcasp",
  518 + .name = "mpu",
519 519 .start = DAVINCI_DA8XX_MCASP0_REG_BASE,
520 520 .end = DAVINCI_DA8XX_MCASP0_REG_BASE + (SZ_1K * 12) - 1,
521 521 .flags = IORESOURCE_MEM,
arch/arm/mach-davinci/dm355.c
Diff comments   View file @ 8ae19ec
... ... @@ -641,6 +641,7 @@
641 641  
642 642 static struct resource dm355_asp1_resources[] = {
643 643 {
  644 + .name = "mpu",
644 645 .start = DAVINCI_ASP1_BASE,
645 646 .end = DAVINCI_ASP1_BASE + SZ_8K - 1,
646 647 .flags = IORESOURCE_MEM,
arch/arm/mach-davinci/dm365.c
Diff comments   View file @ 8ae19ec
... ... @@ -942,6 +942,7 @@
942 942  
943 943 static struct resource dm365_asp_resources[] = {
944 944 {
  945 + .name = "mpu",
945 946 .start = DAVINCI_DM365_ASP0_BASE,
946 947 .end = DAVINCI_DM365_ASP0_BASE + SZ_8K - 1,
947 948 .flags = IORESOURCE_MEM,
arch/arm/mach-davinci/dm644x.c
Diff comments   View file @ 8ae19ec
... ... @@ -572,6 +572,7 @@
572 572 /* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */
573 573 static struct resource dm644x_asp_resources[] = {
574 574 {
  575 + .name = "mpu",
575 576 .start = DAVINCI_ASP0_BASE,
576 577 .end = DAVINCI_ASP0_BASE + SZ_8K - 1,
577 578 .flags = IORESOURCE_MEM,
arch/arm/mach-davinci/dm646x.c
Diff comments   View file @ 8ae19ec
... ... @@ -621,7 +621,7 @@
621 621  
622 622 static struct resource dm646x_mcasp0_resources[] = {
623 623 {
624   - .name = "mcasp0",
  624 + .name = "mpu",
625 625 .start = DAVINCI_DM646X_MCASP0_REG_BASE,
626 626 .end = DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1,
627 627 .flags = IORESOURCE_MEM,
... ... @@ -641,7 +641,7 @@
641 641  
642 642 static struct resource dm646x_mcasp1_resources[] = {
643 643 {
644   - .name = "mcasp1",
  644 + .name = "mpu",
645 645 .start = DAVINCI_DM646X_MCASP1_REG_BASE,
646 646 .end = DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1,
647 647 .flags = IORESOURCE_MEM,