pandora-kernel.git
12 years agoMerge branch 'devel-stable' into devel
Russell King [Mon, 17 May 2010 16:24:04 +0000 (17:24 +0100)]
Merge branch 'devel-stable' into devel

Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig

12 years agoMerge branch 'devel-pmu' into devel
Russell King [Mon, 17 May 2010 16:21:23 +0000 (17:21 +0100)]
Merge branch 'devel-pmu' into devel

12 years agoARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO
Hartley Sweeten [Mon, 17 May 2010 16:18:10 +0000 (17:18 +0100)]
ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
in turn will select GENERIC_GPIO.  Because of this, there is no
reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
architectures that have ARCH_REQUIRE_GPIOLIB.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6074/1: oprofile: convert from sysdev to platform device
Will Deacon [Fri, 30 Apr 2010 10:38:39 +0000 (11:38 +0100)]
ARM: 6074/1: oprofile: convert from sysdev to platform device

This is a reworking of an original patch posted by Aaro Koskinen:

oprofile does not work with PM, because sysdev_suspend() is done with
interrupts disabled and oprofile needs a mutex. Implementing oprofile
as a platform device solves this problem.

Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6073/1: oprofile: remove old files and update KConfig
Will Deacon [Fri, 30 Apr 2010 10:37:51 +0000 (11:37 +0100)]
ARM: 6073/1: oprofile: remove old files and update KConfig

Enable hardware perf-events if CPU_HAS_PMU and select
HAVE_OPROFILE if HAVE_PERF_EVENTS. If no hardware support
is present, OProfile will fall back to timer mode.

This patch also removes the old OProfile drivers in favour
of the code implemented by perf.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6072/1: oprofile: use perf-events framework as backend
Will Deacon [Fri, 30 Apr 2010 10:36:54 +0000 (11:36 +0100)]
ARM: 6072/1: oprofile: use perf-events framework as backend

There are currently two hardware performance monitoring subsystems in
the kernel for ARM: OProfile and perf-events. This creates the
following problems:

1.) Duplicate PMU accessor code. Inevitable code drift may lead to
bugs in one framework that are fixed in the other.

2.) Locking issues. OProfile doesn't reprogram hardware counters
between profiling runs if the events to be monitored have not been
changed. This means that other profiling frameworks cannot use the
counters if OProfile is in use.

3.) Due to differences in the two frameworks, it may not be possible to
compare the results obtained by OProfile with those obtained by perf.

This patch removes the OProfile PMU driver code and replaces it with
calls to perf, therefore solving the issues mentioned above.

The only userspace-visible change is the lack of SCU counter support
for 11MPCore. This is currently unsupported by OProfile userspace tools anyway and therefore shouldn't cause any problems.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Jamie Iles <jamie.iles@picochip.com>
Cc: Jean Pihet <jpihet@mvista.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6071/1: perf-events: allow modules to query the number of hardware counters
Will Deacon [Fri, 30 Apr 2010 10:34:26 +0000 (11:34 +0100)]
ARM: 6071/1: perf-events: allow modules to query the number of hardware counters

For OProfile to initialise oprofilefs correctly, it needs to know
the number of counters it can represent.

This patch adds a function to the ARM perf-events backend to return
the number of hardware counters available for the current PMU.

Cc: Jamie Iles <jamie.iles@picochip.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6070/1: perf-events: add support for xscale PMUs
Will Deacon [Fri, 30 Apr 2010 10:33:33 +0000 (11:33 +0100)]
ARM: 6070/1: perf-events: add support for xscale PMUs

The perf-events framework for ARM only supports v6 and v7 cores.

This patch adds support for xscale v1 and v2 PMUs to perf, based on the
OProfile drivers in arch/arm/oprofile/op_model_xscale.c

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6069/1: perf-events: use numeric ID to identify PMU
Will Deacon [Fri, 30 Apr 2010 10:32:44 +0000 (11:32 +0100)]
ARM: 6069/1: perf-events: use numeric ID to identify PMU

The ARM perf-events framework provides support for a number of different
PMUs using struct arm_pmu. The char *name field of this struct can be
used to identify the PMU, but this is cumbersome if used outside of perf.

This patch replaces the name string for a PMU with an enum, which holds
a unique ID for the PMU being represented. This ID can be used to index
an array of names within perf, so no functionality is lost. The presence
of the ID field, allows other kernel subsystems [currently oprofile] to
use their own mappings for the PMU name.

Cc: Jean Pihet <jpihet@mvista.com>
Acked-by: Jamie Iles <jamie.iles@picochip.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6064/1: pmu: register IRQs at runtime
Will Deacon [Thu, 29 Apr 2010 16:13:24 +0000 (17:13 +0100)]
ARM: 6064/1: pmu: register IRQs at runtime

The current PMU infrastructure for ARM requires that the IRQs for the PMU
device are fixed at compile time and are selected based on the ARCH_ or MACH_ flags. This has the disadvantage of tying the Kernel down to a
particular board as far as profiling is concerned.

This patch replaces the compile-time IRQ registration with a runtime mechanism which allows the IRQs to be registered with the framework as
a platform_device.

A further advantage of this change is that there is scope for registering
different types of performance counters in the future by changing the id
of the platform_device and attaching different resources to it.

Acked-by: Jamie Iles <jamie.iles@picochip.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoMerge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa...
Russell King [Mon, 17 May 2010 10:52:31 +0000 (11:52 +0100)]
Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

Conflicts:
arch/arm/Makefile
arch/arm/common/Makefile
arch/arm/mm/Kconfig

12 years agoARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA
Russell King [Sat, 15 May 2010 10:02:43 +0000 (11:02 +0100)]
ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA

Provide a configuration option to allow the ARMv6 to use normal
bufferable memory for coherent DMA.  This option is forced to 'y'
for ARMv7, and offered as a configuration option on ARMv6.

Enabling this option requires drivers to have the necessary barriers
to ensure that data in DMA coherent memory is visible prior to the
DMA operation commencing.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoMerge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
Russell King [Mon, 17 May 2010 07:49:25 +0000 (08:49 +0100)]
Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable

12 years agoARM: 6134/1: Handle instruction cache maintenance fault properly
Kirill A. Shutemov [Sat, 15 May 2010 08:57:06 +0000 (09:57 +0100)]
ARM: 6134/1: Handle instruction cache maintenance fault properly

Between "clean D line..." and "invalidate I line" operations in
v7_coherent_user_range(), the memory page may get swapped out.
And the fault on "invalidate I line" could not be properly handled
causing the oops.

In ARMv6 "external abort on linefetch" replaced by "instruction cache
maintenance fault". Let's handle it as translation fault. It fixes the
issue.

I'm not sure if it's reasonable to check arch version in run-time.
Let's do it in compile time for now.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Siarhei Siamashka <siarhei.siamashka@nokia.com>
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: nwfpe: allow debugging output to be configured at runtime
Russell King [Sat, 15 May 2010 09:40:21 +0000 (10:40 +0100)]
ARM: nwfpe: allow debugging output to be configured at runtime

Enabling CONFIG_USER_DEBUG allows NWFPE to complain about every FP
exception, which with some programs can cause the kernel message log
to fill with NWFPE debug, swamping out other messages.

This change allows NWFPE debugging to be configured at run time.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: rename mach_cpu_disable() to platform_cpu_disable()
Russell King [Sat, 15 May 2010 09:18:05 +0000 (10:18 +0100)]
ARM: rename mach_cpu_disable() to platform_cpu_disable()

Consistently name all SMP platform related functions.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6132/1: PL330: Add common core driver
Jassi Brar [Fri, 14 May 2010 14:18:54 +0000 (15:18 +0100)]
ARM: 6132/1: PL330: Add common core driver

PL330 is a configurable DMA controller PrimeCell device.
The register map of the device is well defined.
The configuration of a particular implementation can be
read from the six configuration registers CR0-4,Dn.

This patch implements a driver for the specification:-
http://infocenter.arm.com/help/topic/com.arm.doc.ddi0424a/DDI0424A_dmac_pl330_r0p0_trm.pdf

The exported interface should be sufficient to implement
a driver for any DMA API.

Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310
Jason McMullan [Wed, 5 May 2010 17:59:37 +0000 (18:59 +0100)]
ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310

The L310 cache controller's interface is almost identical
to the L210. One major difference is that the PL310 can
have up to 16 ways.

This change uses the cache's part ID and the Associativity
bits in the AUX_CTRL register to determine the number of ways.

Also, this version prints out the CACHE_ID and AUX_CTRL registers.

Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Jason S. McMullan <jason.mcmullan@netronome.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: Move memory mapping into mmu.c
Russell King [Thu, 25 Mar 2010 18:56:05 +0000 (18:56 +0000)]
ARM: Move memory mapping into mmu.c

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: Ensure meminfo is sorted prior to sanity_check_meminfo
Russell King [Thu, 25 Mar 2010 18:47:20 +0000 (18:47 +0000)]
ARM: Ensure meminfo is sorted prior to sanity_check_meminfo

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: Remove useless linux/bootmem.h includes
Russell King [Thu, 25 Mar 2010 17:06:19 +0000 (17:06 +0000)]
ARM: Remove useless linux/bootmem.h includes

These files include linux/bootmem.h without using anything from this
file; remove the unnecessary include.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: convert /proc/cpu/aligment to seq_file
Alexey Dobriyan [Sun, 2 May 2010 09:40:35 +0000 (12:40 +0300)]
ARM: convert /proc/cpu/aligment to seq_file

Convert code away from ->read_proc/->write_proc interfaces.  Switch to
proc_create()/proc_create_data() which makes addition of proc entries
reliable wrt NULL ->proc_fops, NULL ->data and so on.

Problem with ->read_proc et al is described here commit
786d7e1612f0b0adb6046f19b906609e4fe8b1ba "Fix rmmod/read/write races in
/proc entries"

This patch is part of an effort to remove the old simple procfs PAGE_SIZE
buffer interface.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoarm: use asm-generic/scatterlist.h
FUJITA Tomonori [Sun, 4 Apr 2010 14:25:52 +0000 (23:25 +0900)]
arm: use asm-generic/scatterlist.h

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion...
Russell King [Fri, 14 May 2010 19:09:46 +0000 (20:09 +0100)]
Merge branch 'master' of git://git./linux/kernel/git/nico/orion into devel-stable

12 years agoARM: 6107/1: plat-nomadik: use the MTU clocksrc for sched_clock
Linus Walleij [Fri, 7 May 2010 09:03:02 +0000 (10:03 +0100)]
ARM: 6107/1: plat-nomadik: use the MTU clocksrc for sched_clock

This provides some serious scheduling for the Nomadik family by
introducing a sched_clock() using the MTU clock source in the
same manner as e.g. OMAP or U300. This type of solutions has been
discussed at no end in the past, however we need this resolution
for making measurements and using HRTimers.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoARM: 6124/1: ep93xx: SPI driver platform support code
Mika Westerberg [Tue, 11 May 2010 14:34:54 +0000 (15:34 +0100)]
ARM: 6124/1: ep93xx: SPI driver platform support code

This patch adds platform side support code for the EP93xx SPI
driver. This includes clock, resources and muxing. There is a new
function: ep93xx_register_spi() which can be used by board support
code to register new SPI devices for the board.

This patch depends on patch
  5998/1 ep93xx: added chip revision reading function

Cc: Ryan Mallon <ryan@bluewatersys.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Martin Guy <martinwguy@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 years agoMerge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
Russell King [Thu, 13 May 2010 08:56:24 +0000 (09:56 +0100)]
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

12 years ago[ARM] pxa: add namespace on ssp
Haojian Zhuang [Wed, 5 May 2010 14:11:15 +0000 (10:11 -0400)]
[ARM] pxa: add namespace on ssp

In order to prevent code ambiguous, add namespace on functions in ssp driver.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: append device support in jasper
Haojian Zhuang [Wed, 28 Apr 2010 19:43:21 +0000 (15:43 -0400)]
[ARM] mmp: append device support in jasper

Support regulator MAX8649, PMIC MAX8925 into the Jasper.
Backlight & power supply components of MAX8925 are enabled in Jasper.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: update twsi index
Haojian Zhuang [Wed, 28 Apr 2010 19:34:04 +0000 (15:34 -0400)]
[ARM] mmp: update twsi index

Sync twsi index to register index. It's used to avoid typo error.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: add smc registers definition
Mingliang Hu [Mon, 12 Apr 2010 10:14:18 +0000 (18:14 +0800)]
[ARM] mmp: add smc registers definition

Signed-off-by: Mingliang Hu <mhu4@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: add dma support to mmp2
Haojian Zhuang [Wed, 28 Apr 2010 19:24:24 +0000 (15:24 -0400)]
[ARM] mmp: add dma support to mmp2

Add DMA support in MMP2.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: update mfp setting
Haojian Zhuang [Wed, 28 Apr 2010 19:18:59 +0000 (15:18 -0400)]
[ARM] mmp: update mfp setting

Update mfp setting for mmp2.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: fix clock tick rate in mmp2
Mingliang Hu [Mon, 12 Apr 2010 09:55:21 +0000 (17:55 +0800)]
[ARM] mmp: fix clock tick rate in mmp2

In MMP2, clock tick rate should be 6500000.

Signed-off-by: Mingliang Hu <mhu4@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: configure gpio pins from 128 to 192
Haojian Zhuang [Wed, 28 Apr 2010 15:43:00 +0000 (11:43 -0400)]
[ARM] mmp: configure gpio pins from 128 to 192

In mmp2, 6 banks of GPIO registers are supported. So we can support 192
GPIO pins at most.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: update mmp2 defconfig
Haojian Zhuang [Wed, 28 Apr 2010 15:32:30 +0000 (11:32 -0400)]
[ARM] mmp: update mmp2 defconfig

Enable MAX8649 & MAX8925 regulator, dynamic debug, Marvell Jasper platform.
Disable DNOTIFY, MAX8660 regulator, 88pm860x PMIC.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: enable L2 in mmp2
Haojian Zhuang [Wed, 28 Apr 2010 14:59:45 +0000 (10:59 -0400)]
[ARM] mmp: enable L2 in mmp2

Enable Tauros2 L2 in mmp2. Tauros2 L2 is shared in Marvell ARM cores.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: update clock register function
Haojian Zhuang [Wed, 28 Apr 2010 14:48:24 +0000 (10:48 -0400)]
[ARM] mmp: update clock register function

Use clk_add_table in order to sync with clock driver.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond
Eric Miao [Tue, 13 Apr 2010 23:00:42 +0000 (07:00 +0800)]
[ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond

delay_detect in HZ is confusing, convert it to be millisecond based. And
thus remove those unnecessary call to msecs_to_jiffies() at runtime for
this field. Other constants are converted assuming HZ == 100, which are
basically true for those platforms.

The assignment in csb726.c was incorrect, and is fixed in this patch as
a result.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Marc Zyngier <maz@misterjones.org>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Daniel Mack <daniel@caiaq.de>
12 years agoMAINTAINERS: New MAINTAINERS entries for Zipit Z2 and Voipac PXA270
Marek Vasut [Fri, 26 Mar 2010 05:51:32 +0000 (06:51 +0100)]
MAINTAINERS: New MAINTAINERS entries for Zipit Z2 and Voipac PXA270

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: fix now invalid bit of UP2OCR
Marek Vasut [Sun, 2 May 2010 04:10:25 +0000 (06:10 +0200)]
[ARM] pxa/vpac270: fix now invalid bit of UP2OCR

This patch removes write to UP2OCR[DMSTATE] (ex-UP2OCR_DPPUBE) which is invalid
on PXA270C5 and later.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: add OneNAND support
Marek Vasut [Sat, 1 May 2010 04:54:36 +0000 (06:54 +0200)]
[ARM] pxa/vpac270: add OneNAND support

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: remove TS_IRQ magic number
Marek Vasut [Mon, 26 Apr 2010 21:23:48 +0000 (23:23 +0200)]
[ARM] pxa/vpac270: remove TS_IRQ magic number

The touchscreen GPIO IRQ was used as a magic number. Define it properly in the
board header file. This is a simple cleanup patch.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: add ide support
Marek Vasut [Mon, 26 Apr 2010 19:46:07 +0000 (21:46 +0200)]
[ARM] pxa/vpac270: add ide support

This patch adds support for the on-board IDE channel. I tested this with a CDROM
connected over 2.5-3.5 IDE reduction with external power supplied to the CDROM.
This was not tested with the Voipac 270-HDD-000 (official Voipac HDD module),
but I expect no problems.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: Add DS1339 RTC support
Marek Vasut [Fri, 26 Mar 2010 04:38:10 +0000 (05:38 +0100)]
[ARM] pxa/vpac270: Add DS1339 RTC support

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: Add touchscreen support
Marek Vasut [Fri, 26 Mar 2010 03:45:54 +0000 (04:45 +0100)]
[ARM] pxa/vpac270: Add touchscreen support

This adds support for the UCB1400 touchscreen found in the VPAC270 device.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: add ethernet support
Marek Vasut [Wed, 10 Mar 2010 04:38:54 +0000 (05:38 +0100)]
[ARM] pxa/vpac270: add ethernet support

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/vpac270: UDC and UHC support
Marek Vasut [Wed, 10 Mar 2010 04:24:27 +0000 (05:24 +0100)]
[ARM] pxa/vpac270: UDC and UHC support

NOTE:
I wasn't able to get it running without reseting the HXOE (so it's there based
on my tests with the hardware). I'll have to investigate it properly when I have
more time.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Reviewed-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: add support for Voipac PXA270 PCMCIA
Marek Vasut [Wed, 10 Mar 2010 03:16:28 +0000 (04:16 +0100)]
[ARM] pxa: add support for Voipac PXA270 PCMCIA

PCMCIA support for Voipac PXA270

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: add basic support for Voipac PXA270 SBC
Marek [Tue, 9 Mar 2010 03:04:12 +0000 (04:04 +0100)]
[ARM] pxa: add basic support for Voipac PXA270 SBC

This patch adds basic support for the Voipac PXA270 SBC.
The device consists of the following hardware:
- PXA270 @ 520 MHz
- 256MB RAM (sparsemem, 2*128MB regions)
- 64MB NOR flash
- 640x480 LCD
- Ports: 2xUHC, 1xUDC, 1xPCMCIA, VGA, FFUART, 2xPS2, Speaker, MIC

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: add basic support for the Aeronix Zipit Z2 handheld
Marek Vasut [Sun, 28 Feb 2010 11:41:23 +0000 (12:41 +0100)]
[ARM] pxa: add basic support for the Aeronix Zipit Z2 handheld

This patch adds support for the Zipit Z2. The parts missing from this
patch are the battery support, SPI driver for the LCD and support for
the Silicon Serial ID chip.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/cm-x300: update the memory fixup.
Igor Grinberg [Tue, 9 Mar 2010 09:43:52 +0000 (11:43 +0200)]
[ARM] pxa/cm-x300: update the memory fixup.

CM-X300 bootloader passes DRAM configuration information in ATAGS,
however, the first memory bank is reported at actual physical address 0x8000000.
Use the configuration information supplied by the bootloader and
cope with the necessity to have PHYS_ADDR=0xa0000000.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/cm-x300: add regulator on vcc_core
Igor Grinberg [Tue, 9 Mar 2010 09:43:51 +0000 (11:43 +0200)]
[ARM] pxa/cm-x300: add regulator on vcc_core

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/cm-x300: fix da903x IRQ line assignment
Igor Grinberg [Tue, 9 Mar 2010 09:43:50 +0000 (11:43 +0200)]
[ARM] pxa/cm-x300: fix da903x IRQ line assignment

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/cm-x300: da903x WLED is not connected on cm-x300
Igor Grinberg [Tue, 9 Mar 2010 09:43:49 +0000 (11:43 +0200)]
[ARM] pxa/cm-x300: da903x WLED is not connected on cm-x300

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/cm-x300.c: add battery charger support
Igor Grinberg [Tue, 9 Mar 2010 09:43:48 +0000 (11:43 +0200)]
[ARM] pxa/cm-x300.c: add battery charger support

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: remove pxa_gpio_mode() and files
Eric Miao [Tue, 27 Apr 2010 07:09:33 +0000 (15:09 +0800)]
[ARM] pxa: remove pxa_gpio_mode() and files

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years agoinput: remove obsolete {corgi,spitz,tosa}kbd.c
Eric Miao [Tue, 27 Apr 2010 06:50:54 +0000 (14:50 +0800)]
input: remove obsolete {corgi,spitz,tosa}kbd.c

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/Kconfig
Eric Miao [Tue, 27 Apr 2010 06:43:03 +0000 (14:43 +0800)]
[ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/Kconfig

Tosa is now able to use generic matrix keypad driver instead of the deprecated
tosakbd.c, where CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is still useful.  Move
it to mach/Kconfig.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/corgi: cleanup GPIO configurations and low power mode settings
Eric Miao [Mon, 11 Jan 2010 13:27:21 +0000 (21:27 +0800)]
[ARM] pxa/corgi: cleanup GPIO configurations and low power mode settings

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/corgi: use generic GPIO API and remove pxa_gpio_mode()
Eric Miao [Fri, 8 Jan 2010 05:32:46 +0000 (13:32 +0800)]
[ARM] pxa/corgi: use generic GPIO API and remove pxa_gpio_mode()

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa/spitz: use generic GPIO API and remove pxa_gpio_mode()
Eric Miao [Mon, 11 Jan 2010 08:17:25 +0000 (16:17 +0800)]
[ARM] pxa/spitz: use generic GPIO API and remove pxa_gpio_mode()

REVISIT: change to GPIO18 is ugly, need to make sure whether that's
really necessary - GPIO18_RDY as an VLIO input signal - we don't
normally need to do such kind of trick during low power mode.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: allow MFP_LPM_INPUT to be explicitly specified
Eric Miao [Tue, 27 Apr 2010 03:14:24 +0000 (11:14 +0800)]
[ARM] pxa: allow MFP_LPM_INPUT to be explicitly specified

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: allow keypad GPIOs to wakeup when configured as generic
Eric Miao [Tue, 20 Apr 2010 06:52:50 +0000 (14:52 +0800)]
[ARM] pxa: allow keypad GPIOs to wakeup when configured as generic

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: add MFP_LPM_KEEP_OUTPUT flag to pin config
Eric Miao [Mon, 11 Jan 2010 13:25:15 +0000 (21:25 +0800)]
[ARM] pxa: add MFP_LPM_KEEP_OUTPUT flag to pin config

Some pins are expected to keep their last level during suspend, and
introduce MFP_LPM_KEEP_OUTPUT for this.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: use resource_size() in ssp.c
Julia Lawall [Mon, 22 Mar 2010 08:16:24 +0000 (16:16 +0800)]
[ARM] pxa: use resource_size() in ssp.c

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: avoid NULL dereferencing in error handling of ssp.c
Julia Lawall [Mon, 22 Mar 2010 08:11:55 +0000 (16:11 +0800)]
[ARM] pxa: avoid NULL dereferencing in error handling of ssp.c

The assignments of res to the results of the two calls to
platform_get_resource make it impossible to use res in the error handling
code in the arguments to release_mem_region.

The semantic match that finds the former problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
expression E, E1;
identifier f;
statement S1,S3;
iterator iter;
@@

if ((E == NULL && ...) || ...)
{
 ... when != false ((E == NULL && ...) || ...)
     when != true  ((E != NULL && ...) || ...)
     when != iter(E,...) S1
     when != E = E1
(
 sizeof(E->f)
|
* E->f
)
 ... when any
 return ...;
}
else S3
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: enable ssp in aspenite
Haojian Zhuang [Fri, 19 Mar 2010 15:55:14 +0000 (11:55 -0400)]
[ARM] mmp: enable ssp in aspenite

Configure both ssp and wm8753 in aspenite.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] mmp: support ssp in pxa168
Haojian Zhuang [Fri, 19 Mar 2010 15:53:17 +0000 (11:53 -0400)]
[ARM] mmp: support ssp in pxa168

Support ssp devices in PXA168. PXA168 could reuse the code of PXA SSP.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: simplify ifdef in ssp.h
Haojian Zhuang [Fri, 19 Mar 2010 15:52:39 +0000 (11:52 -0400)]
[ARM] pxa: simplify ifdef in ssp.h

Try to keep minimum ifdef in ssp.h.  Some of the definitions are valid
only to specific SoCs, and device drivers should be responsible to take
care of these difference.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: remove incorrect select PXA_SSP in Kconfig
Eric Miao [Tue, 16 Mar 2010 09:30:15 +0000 (17:30 +0800)]
[ARM] pxa: remove incorrect select PXA_SSP in Kconfig

PXA_SSP is actually used by drivers like drivers/spi/pxa2xx_spi.c and
sound/soc/pxa/pxa-ssp.c, not by boards. Remove those incorrect 'select'
from Kconfig and make SOC_PXA_SSP to select.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: move ssp into common plat-pxa
Haojian Zhuang [Tue, 16 Mar 2010 09:12:37 +0000 (17:12 +0800)]
[ARM] pxa: move ssp into common plat-pxa

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: remove unnecessary #include of <mach/ssp.h>
Eric Miao [Tue, 16 Mar 2010 09:21:57 +0000 (17:21 +0800)]
[ARM] pxa: remove unnecessary #include of <mach/ssp.h>

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: merge regs-ssp.h into ssp.h
Eric Miao [Tue, 16 Mar 2010 09:03:20 +0000 (17:03 +0800)]
[ARM] pxa: merge regs-ssp.h into ssp.h

No need to separate them as they should be together from the begining.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: correct SSCR0_SCR to support multiple SoCs
Eric Miao [Tue, 16 Mar 2010 08:48:01 +0000 (16:48 +0800)]
[ARM] pxa: correct SSCR0_SCR to support multiple SoCs

The previous definitions of SSCR0_SCR and SSCR0_SerClkDiv() prevented
them being used simultaneously when supporting multiple PXA SoCs, esp.
in drivers/spi/pxa2xx_spi.c, make them correct.

The change from SSCR0_SerClkDiv(2) to SSCR0_SCR(2), will make the result
a little bit different in pxa2xx_spi_probe(), however, since that's only
used as a default initialization value, it's acceptable.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: remove the now legacy SSP API
Eric Miao [Tue, 16 Mar 2010 06:44:05 +0000 (14:44 +0800)]
[ARM] pxa: remove the now legacy SSP API

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
12 years ago[ARM] pxa: remove now un-used corgi_ssp.c and corgi_lcd.c
Eric Miao [Mon, 15 Mar 2010 14:39:27 +0000 (22:39 +0800)]
[ARM] pxa: remove now un-used corgi_ssp.c and corgi_lcd.c

The only use of corgi_ssp.c is corgi_ts.c, which is now deprecated
and removed. Remove corgi_ssp.c and corgi_lcd.c and their relevant
function declarations and data structures.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Pavel Machek <pavel@ucw.cz>
12 years agoinput: remove now deprecated corgi_ts.c touchscreen driver
Eric Miao [Mon, 15 Mar 2010 14:23:09 +0000 (22:23 +0800)]
input: remove now deprecated corgi_ts.c touchscreen driver

The corgi touchscreen is now deprecated in favour of the generic ads7846.c
driver. The noise reduction technique used in corgi_ts.c, which is to wait
till vsync before ADC sampling, is also integrated into ads7846 driver now.
Provided that the original driver is not generic and is difficult to maintain,
it will be removed now.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
12 years agoARM: SAMSUNG: Update S3C2416 entry with S3C2450
Ben Dooks [Fri, 30 Apr 2010 07:32:26 +0000 (16:32 +0900)]
ARM: SAMSUNG: Update S3C2416 entry with S3C2450

These devices are so similar that they share the same SoC
ID code, so note this.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2413: Update GPIO pull-up support
Ben Dooks [Fri, 30 Apr 2010 10:48:02 +0000 (19:48 +0900)]
ARM: S3C2413: Update GPIO pull-up support

Ensure the right get/set pull code is selected and assigned to the GPIO
core.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2416: Use s3c2440 style i2c controller
Ben Dooks [Mon, 3 May 2010 07:44:35 +0000 (16:44 +0900)]
ARM: S3C2416: Use s3c2440 style i2c controller

The s3c2416 i2c controllers are compatible with the s3c2440 style i2c
block, so change the device name appropriately.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>y
12 years agoARM: S3C2416: Add support for OHCI on SMDK2416
Ben Dooks [Fri, 30 Apr 2010 01:59:42 +0000 (10:59 +0900)]
ARM: S3C2416: Add support for OHCI on SMDK2416

Add device definition and ensure that the host port is powered up
at start time. Full power control can be added at a later date.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2416: Add support for second HSMMC channel
Ben Dooks [Thu, 29 Apr 2010 09:59:43 +0000 (18:59 +0900)]
ARM: S3C2416: Add support for second HSMMC channel

Add support for the second HSMMC channel on the S3C2416.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2416: Add basic clock support
Ben Dooks [Fri, 30 Apr 2010 02:12:58 +0000 (11:12 +0900)]
ARM: S3C2416: Add basic clock support

Add basic clock support for the PLLs, HSMMC channels and
PWM clocks. This is enough to get a basic system up and
running.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2443: Move parts of the clock code to common clock file
Ben Dooks [Wed, 28 Apr 2010 09:03:57 +0000 (18:03 +0900)]
ARM: S3C2443: Move parts of the clock code to common clock file

To share code with some of the newer parts such as the S3C2416, move
parts of arch/arm/mach-s3c2443/clock.c to a common file called
arch/arm/plat-s3c24xx/s3c2443-clock.c.

Update the build configuration to deal with this new file.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C24XX: Identify S3C2416 if S3C2412/S3C2413 built in
Ben Dooks [Wed, 28 Apr 2010 09:00:07 +0000 (18:00 +0900)]
ARM: S3C24XX: Identify S3C2416 if S3C2412/S3C2413 built in

Extend the ARMv5 ID code to deal with S3C2416 being built with
S3C2412/S3C2413 enabled, as these have their ID registers in a
different place.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2416: Add initial support of SMDK2416
Yauhen Kharuzhy [Wed, 19 Aug 2009 13:31:07 +0000 (16:31 +0300)]
ARM: S3C2416: Add initial support of SMDK2416

Add support of SMDK2416 development board.

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2416: Add arch support
Yauhen Kharuzhy [Wed, 28 Apr 2010 09:09:01 +0000 (18:09 +0900)]
ARM: S3C2416: Add arch support

Add arch/arm/mach-s3c2416 for support of the Samsung S3C2416 SoC.

This patch adds support of the S3C2416 SoC, clocks, timers,
and initial IRQ support (without support of secondary set of registers).

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
[ben-linux@fluff.org: removed files to be reworked, fixed conflicts]
[ben-linux@fluff.org: use s3c2443 reset instead of specific reset code]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage
Ben Dooks [Wed, 28 Apr 2010 03:58:13 +0000 (12:58 +0900)]
ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage

Add s3c_disable_clocks() and change the clock registration code to use
the s3c_register_clocks() followed by s3c_disable_clocks() instead of
the loops it was using.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use
Ben Dooks [Wed, 28 Apr 2010 09:10:02 +0000 (18:10 +0900)]
ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use

The S3C6400 EPLL code matches the S3C2416 and compatible SoCs, so move
it from mach-s3c64xx into <plat/pll.h> for easy reuse.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoARM: S3C2416: Add S3C2416-specific registers definitions
Yauhen Kharuzhy [Wed, 19 Aug 2009 13:31:03 +0000 (16:31 +0300)]
ARM: S3C2416: Add S3C2416-specific registers definitions

Add macros for S3C2416 SoC support.

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
[ben-linux@fluff.org: removed files that need changing]
[ben-linux@fluff.org: Fix S3C2416_GPH0_TXD0 definition]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
12 years agoLinux 2.6.34-rc7 v2.6.34-rc7
Linus Torvalds [Mon, 10 May 2010 01:36:28 +0000 (18:36 -0700)]
Linux 2.6.34-rc7

12 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Linus Torvalds [Mon, 10 May 2010 01:35:53 +0000 (18:35 -0700)]
Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 I/O error
  [SCSI] Enable retries for SYNCRONIZE_CACHE commands to fix I/O error
  [SCSI] scsi_debug: virtual_gb ignores sector_size
  [SCSI] libiscsi: regression: fix header digest errors
  [SCSI] fix locking around blk_abort_request()
  [SCSI] advansys: fix narrow board error path

12 years agocpuidle: Fix incorrect optimization
Arjan van de Ven [Sat, 8 May 2010 22:47:37 +0000 (15:47 -0700)]
cpuidle: Fix incorrect optimization

commit 672917dcc78 ("cpuidle: menu governor: reduce latency on exit")
added an optimization, where the analysis on the past idle period moved
from the end of idle, to the beginning of the new idle.

Unfortunately, this optimization had a bug where it zeroed one key
variable for new use, that is needed for the analysis.  The fix is
simple, zero the variable after doing the work from the previous idle.

During the audit of the code that found this issue, another issue was
also found; the ->measured_us data structure member is never set, a
local variable is always used instead.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Corrado Zoccolo <czoccolo@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
12 years agoMerge branch 'for-linus' of git://neil.brown.name/md
Linus Torvalds [Fri, 7 May 2010 21:11:40 +0000 (14:11 -0700)]
Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  md: restore ability of spare drives to spin down.
  md/raid6: Fix raid-6 read-error correction in degraded state

12 years agoMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
Linus Torvalds [Fri, 7 May 2010 21:11:09 +0000 (14:11 -0700)]
Merge branch 'urgent' of git://git./linux/kernel/git/brodo/pcmcia-2.6

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: fix compilation after 16bit state locking changes
  pcmcia: order userspace suspend and resume requests
  pcmcia: avoid pccard_validate_cis failure in resume callpath

12 years agoMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Fri, 7 May 2010 21:07:20 +0000 (14:07 -0700)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  blk-cgroup: Fix an RCU warning in blkiocg_create()
  blk-cgroup: Fix RCU correctness warning in cfq_init_queue()
  drbd: don't expose failed local READ to upper layers

12 years agoMerge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
Linus Torvalds [Fri, 7 May 2010 21:02:01 +0000 (14:02 -0700)]
Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/ttm: Remove the ttm_bo_block_reservation() function.
  drm/ttm: Remove some leftover debug messages.
  drm/radeon: async event synchronization for drmWaitVblank

12 years agovirtio: initialize earlier
Stijn Tintel [Fri, 7 May 2010 04:58:34 +0000 (14:28 +0930)]
virtio: initialize earlier

Move initialization of the virtio framework before the initialization of
mtd, so that block2mtd can be used on virtio-based block devices.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15644

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
12 years agoMerge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
Linus Torvalds [Fri, 7 May 2010 20:59:48 +0000 (13:59 -0700)]
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Fix RCU issues in the NFSv4 delegation code
  NFSv4: Fix the locking in nfs_inode_reclaim_delegation()