From: Greg Kroah-Hartman Date: Thu, 5 Jul 2012 16:56:46 +0000 (-0700) Subject: driver bugfix patch from Simon added X-Git-Tag: v3.0.38-ltsi~7^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efd12536c82924a574a21dd19a37d6369f8105a0;p=platform%2Fkernel%2Flinux-stable.git driver bugfix patch from Simon added --- diff --git a/patches.armadillo800eva/arm-mach-shmobile-sh7372-ap4evb-and-mackerel-timer-rework.patch b/patches.armadillo800eva/arm-mach-shmobile-sh7372-ap4evb-and-mackerel-timer-rework.patch new file mode 100644 index 000000000000..9854a18225d5 --- /dev/null +++ b/patches.armadillo800eva/arm-mach-shmobile-sh7372-ap4evb-and-mackerel-timer-rework.patch @@ -0,0 +1,67 @@ +From horms@vergenet.net Tue May 29 17:45:19 2012 +From: Simon Horman +Date: Wed, 30 May 2012 09:45:07 +0900 +Subject: [PATCH] ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework +To: ltsi-dev@lists.linuxfoundation.org +Cc: Greg KH , Magnus Damm , Kuninori Morimoto , Simon Horman +Message-ID: <1338338707-29333-2-git-send-email-horms@verge.net.au> + + +From: Magnus Damm + +Move the SoC specific timer code from AP4EVB and Mackerel +to sh7372 setup code. This makes is possible to share +the SoC specific timer code across boards and it also +removes the need for a board specific timer structure. + +Signed-off-by: Magnus Damm +Signed-off-by: Rafael J. Wysocki +(cherry picked from commit 17254bffd6e4fda97d825acec153614f09bb33e7) + +Conflicts: + + arch/arm/mach-shmobile/board-ap4evb.c + arch/arm/mach-shmobile/board-mackerel.c + arch/arm/mach-shmobile/setup-sh7372.c + +Signed-off-by: Simon Horman +--- + arch/arm/mach-shmobile/setup-sh7372.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c +index 8ddef91..42d9619 100644 +--- a/arch/arm/mach-shmobile/setup-sh7372.c ++++ b/arch/arm/mach-shmobile/setup-sh7372.c +@@ -32,8 +32,10 @@ + #include + #include + #include ++#include + #include + #include ++#include + + /* SCIFA0 */ + static struct plat_sci_port scif0_platform_data = { +@@ -848,8 +850,17 @@ void __init sh7372_add_standard_devices(void) + ARRAY_SIZE(sh7372_late_devices)); + } + ++static void __init sh7372_earlytimer_init(void) ++{ ++ sh7372_clock_init(); ++ shmobile_earlytimer_init(); ++} ++ + void __init sh7372_add_early_devices(void) + { + early_platform_add_devices(sh7372_early_devices, + ARRAY_SIZE(sh7372_early_devices)); ++ ++ /* override timer setup with soc-specific code */ ++ shmobile_timer.init = sh7372_earlytimer_init; + } +-- +1.7.10.2.484.gcd07cc5 + diff --git a/patches.kzm9g/0180-arm-mach-shmobile-add-a-resource-name-for-shdma.patch b/patches.kzm9g/0180-arm-mach-shmobile-add-a-resource-name-for-shdma.patch index df953d69a435..f4b2b450e5fb 100644 --- a/patches.kzm9g/0180-arm-mach-shmobile-add-a-resource-name-for-shdma.patch +++ b/patches.kzm9g/0180-arm-mach-shmobile-add-a-resource-name-for-shdma.patch @@ -9,15 +9,13 @@ Signed-off-by: Paul Mundt Signed-off-by: Simon Horman --- - arch/arm/mach-shmobile/setup-sh7372.c | 6 +++--- - arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- + arch/arm/mach-shmobile/setup-sh7372.c | 6 +++--- + arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c -index cd807ee..8ddef91 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c -@@ -503,7 +503,7 @@ static struct resource sh7372_dmae0_resources[] = { +@@ -505,7 +505,7 @@ static struct resource sh7372_dmae0_reso .flags = IORESOURCE_MEM, }, { @@ -26,7 +24,7 @@ index cd807ee..8ddef91 100644 .start = evt2irq(0x20c0), .end = evt2irq(0x20c0), .flags = IORESOURCE_IRQ, -@@ -531,7 +531,7 @@ static struct resource sh7372_dmae1_resources[] = { +@@ -533,7 +533,7 @@ static struct resource sh7372_dmae1_reso .flags = IORESOURCE_MEM, }, { @@ -35,7 +33,7 @@ index cd807ee..8ddef91 100644 .start = evt2irq(0x21c0), .end = evt2irq(0x21c0), .flags = IORESOURCE_IRQ, -@@ -559,7 +559,7 @@ static struct resource sh7372_dmae2_resources[] = { +@@ -561,7 +561,7 @@ static struct resource sh7372_dmae2_reso .flags = IORESOURCE_MEM, }, { @@ -44,11 +42,9 @@ index cd807ee..8ddef91 100644 .start = evt2irq(0x22c0), .end = evt2irq(0x22c0), .flags = IORESOURCE_IRQ, -diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c -index e46821c..20e71e5 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c -@@ -607,7 +607,7 @@ static struct resource sh73a0_dmae_resources[] = { +@@ -607,7 +607,7 @@ static struct resource sh73a0_dmae_resou .flags = IORESOURCE_MEM, }, { @@ -57,6 +53,3 @@ index e46821c..20e71e5 100644 .start = gic_spi(129), .end = gic_spi(129), .flags = IORESOURCE_IRQ, --- -1.7.10.2.565.gbd578b5 - diff --git a/series b/series index 857c31e36af7..c471c6a7b586 100644 --- a/series +++ b/series @@ -313,7 +313,7 @@ patches.armadillo800eva/0250-ARM-mach-shmobile-armadillo800eva-add-support-LCDC0 patches.armadillo800eva/0251-ARM-mach-shmobile-armadillo800eva-add-support-ST1232.patch patches.armadillo800eva/0252-ARM-mach-shmobile-armadillo800eva-add-support-gpio_k.patch patches.armadillo800eva/0253-ARM-mach-shmobile-armadillo800eva-add-support-sh_eth.patch - +patches.armadillo800eva/arm-mach-shmobile-sh7372-ap4evb-and-mackerel-timer-rework.patch