linux-toradex.git/arch/arm/mach-shmobile, branch v3.2.2

Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh

2011-12-20T19:32:18+00:00

* 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh:
  ARM: mach-shmobile: SH73A0 external Ethernet fix
  ARM: mach-shmobile: AG5EVM GIC Sparse IRQ fix
  ARM: mach-shmobile: Kota2 TPU LED platform data
  ARM: mach-shmobile: Kota2 GIC Sparse IRQ fix
  ARM: mach-shmobile: Kota2 PINT fix

Merge branches 'rmobile/core', 'rmobile/kota2' and 'rmobile/ag5' into rmobile-fixes-for-linus

2011-11-24T08:32:59+00:00

ARM: mach-shmobile: SH73A0 external Ethernet fix

2011-11-24T08:32:29+00:00

Keep the ZB clock enabled on sh73a0 to allow the BSC
to access external peripherals hooked up to CS signals.

This is needed to unbreak Ethernet support on sh73a0 boards
such as AG5EVM and Kota2 together with the following patch:

 794d78f drivers: sh: late disabling of clocks V2

Signed-off-by: Magnus Damm 
Signed-off-by: Paul Mundt

ARM: mach-shmobile: AG5EVM GIC Sparse IRQ fix

2011-11-24T08:30:28+00:00

Fix IRQ support on the AG5EVM board. The sh73a0 and the AG5EVM
board make use of the ARM GIC hardware block as main interrupt
controller. The following commit changed the default behaviour
for non-device tree platforms and broke AG5EVM irq support:

f37a53c ARM: gic: fix irq_alloc_descs handling for sparse irq

Without this fix the following warning triggers at boot:

NR_IRQS:1024 nr_irqs:1024 1024
------------[ cut here ]------------
WARNING: at arch/arm/common/gic.c:607 gic_init+0x90/0x2e4()
Cannot allocate irq_descs @ IRQ16, assuming pre-allocated
[] (unwind_backtrace+0x0/0xe0) from [] (warn_slowpath_commo)
[] (warn_slowpath_common+0x48/0x60) from [] (warn_slowpath_)
[] (warn_slowpath_fmt+0x2c/0x3c) from [] (gic_init+0x90/0x2)
[] (gic_init+0x90/0x2e4) from [] (sh73a0_init_irq+0x30/0x18)
[] (sh73a0_init_irq+0x30/0x184) from [] (init_IRQ+0x14/0x1c)
[] (init_IRQ+0x14/0x1c) from [] (start_kernel+0x15c/0x2b8)
[] (start_kernel+0x15c/0x2b8) from [<4000803c>] (0x4000803c)
---[ end trace 1b75b31a2719ed1c ]---

With this fix applied interrupts work as expected.

Signed-off-by: Magnus Damm 
Acked-by: Rob Herring 
Signed-off-by: Paul Mundt

ARM: mach-shmobile: Kota2 TPU LED platform data

2011-11-24T08:24:08+00:00

This patch updates the Kota2 board support code to
use the recently merged TPU LED driver whenever
possible.

The sh73a0 SoC has 5 TPU hardware blocks each with
4 timer channels which in theory allows a total of
20 LEDs to be controlled by "leds-renesas-tpu"
driver instances. The Kota2 board has 4 LEDs connected
to GPIO pins that also come with TPU pin functions, so
this patch ties up these 4 LEDS and leaves the remaining
3 LEDS for the GPIO based LED driver.

Signed-off-by: Magnus Damm 
Signed-off-by: Paul Mundt

ARM: mach-shmobile: Kota2 GIC Sparse IRQ fix

2011-11-24T08:24:04+00:00

Fix IRQ support on the Kota2 board. The sh73a0 and the Kota2
board make use of the ARM GIC hardware block as main interrupt
controller. The following commit changed the default behaviour
for non-device tree platforms and broke Kota2 irq support:

f37a53c ARM: gic: fix irq_alloc_descs handling for sparse irq

Without this fix the following warning triggers at boot:

NR_IRQS:1024 nr_irqs:1024 1024
------------[ cut here ]------------
WARNING: at arch/arm/common/gic.c:607 gic_init+0x90/0x2e4()
Cannot allocate irq_descs @ IRQ16, assuming pre-allocated
[] (unwind_backtrace+0x0/0xe0) from [] (warn_slowpath_commo)
[] (warn_slowpath_common+0x48/0x60) from [] (warn_slowpath_)
[] (warn_slowpath_fmt+0x2c/0x3c) from [] (gic_init+0x90/0x2)
[] (gic_init+0x90/0x2e4) from [] (sh73a0_init_irq+0x30/0x18)
[] (sh73a0_init_irq+0x30/0x184) from [] (init_IRQ+0x14/0x1c)
[] (init_IRQ+0x14/0x1c) from [] (start_kernel+0x15c/0x2b8)
[] (start_kernel+0x15c/0x2b8) from [<4000803c>] (0x4000803c)
---[ end trace 1b75b31a2719ed1c ]---

With this fix applied interrupts work as expected.

Signed-off-by: Magnus Damm 
Acked-by: Rob Herring 
Signed-off-by: Paul Mundt

ARM: mach-shmobile: Kota2 PINT fix

2011-11-24T08:23:58+00:00

Support PINT on sh73a0 and Kota2 using INTC PINT macros.

With this patch applied the Kota2 ethernet is handled
through one of the chained sh73a0 PINT interrupt controllers.

sh73a0 PINT support is included in 3.2-rc but the Kota2 board
code does not make use of this shared code base without this
patch. Without this patch kota2 on-board ethernet is broken.

Signed-off-by: Magnus Damm 
Signed-off-by: Paul Mundt

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2011-11-20T22:33:02+00:00

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Suspend: Fix bug in suspend statistics update
  PM / Hibernate: Fix the early termination of test modes
  PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset
  PM Sleep: Do not extend wakeup paths to devices with ignore_children set
  PM / driver core: disable device's runtime PM during shutdown
  PM / devfreq: correct Kconfig dependency
  PM / devfreq: fix use after free in devfreq_remove_device
  PM / shmobile: Avoid restoring the INTCS state during initialization
  PM / devfreq: Remove compiler error after irq.h update
  PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()
  PM / Clocks: Only disable enabled clocks in pm_clk_suspend()
  ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix
  PM / shmobile: Don't skip debugging output in pd_power_up()

PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset

2011-11-17T20:39:55+00:00

Fix build regression introduced by commit 056879d2f244001b2888cdc8cf
(ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix) by moving
the intialization of the A3SP domain to a separate function and
providing an empty definition of it for CONFIG_PM unset.

Reported-and-tested-by: Guennadi Liakhovetski 
Signed-off-by: Rafael J. Wysocki

PM / shmobile: Avoid restoring the INTCS state during initialization

2011-11-14T22:30:21+00:00

The SH7372 PM domain initialization routine calls pd_power_up()
that executes the domain's .resume() callback, if present, and for
the A4R domain this callback attepmts to restore the INTCS state from
uninitialized data.  To avoid that, introduce __pd_power_up() that
will only execute the domain's .resume() callback if its second
argument is 'true' and make the SH7372 PM domain initialization
use it with 'false' as its second argument.  Redefine pd_power_up()
as a wrapper around __pd_power_up().

Reported-by: Guennadi Liakhovetski 
Tracked-down-by: Magnus Damm 
Signed-off-by: Rafael J. Wysocki 
Acked-by: Magnus Damm