linux.git/arch/arm, branch v3.2-rc2

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

2011-11-14T08:47:04+00:00

* 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh:
  ARM: mach-shmobile: cpuidle single/global and last_state fixes
  ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h
  ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h
  ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h
  ARM: mach-shmobile: ap4evb: remove white space from end of line
  ARM: mach-shmobile: clock-sh7372: remove un-necessary index
  ARM: mach-shmobile: kota2: add comment out separator
  ARM: mach-shmobile: sh73a0: add MMC data pin pull-up

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

2011-11-14T08:45:30+00:00

* 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh:
  mailmap: Fix up some renesas attributions
  sh: clkfwk: Kill off remaining debugfs cruft.
  drivers: sh: Kill off dead pathname for runtime PM stub.
  drivers: sh: Generalize runtime PM platform stub.
  sh: Wire up process_vm syscalls.
  sh: clkfwk: add clk_rate_mult_range_round()
  serial: sh-sci: Fix up SH-2A SCIF support.
  sh: Fix cached/uncaced address calculation in 29bit mode

Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes

2011-11-11T18:34:20+00:00

Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

2011-11-11T16:53:46+00:00

arm/imx: fix imx6q mmc error when mounting rootfs

2011-11-11T15:53:35+00:00

The following error is seen in some case when mounting rootfs from
SD/MMC cards.

  Waiting for root device /dev/mmcblk0p1...
  mmc1: host does not support reading read-only switch. assuming write-enable.
  mmc1: new high speed SDHC card at address b368
  mmcblk0: mmc1:b368 SDC   3.74 GiB
   mmcblk0: p1
  mmc1: Timeout waiting for hardware interrupt.
  mmcblk0: error -110 transferring data, sector 3678224, nr 40, cmd response 0x900, card status 0xc00
  end_request: I/O error, dev mmcblk0, sector 3678225
  Buffer I/O error on device mmcblk0p1, logical block 458754
  lost page write due to I/O error on mmcblk0p1

This patch fixes the problem by lowering the usdhc clock and correcting
watermark configuration.

Signed-off-by: Shawn Guo 
Cc: Chris Ball 
Cc: Sascha Hauer 
Signed-off-by: Sascha Hauer

arm/imx: fix AUTO_ZRELADDR selection

2011-11-11T15:53:34+00:00

The AUTO_ZRELADDR selection for ARCH_IMX_V4_V5 and ARCH_MX5 should
really be mutually exclusive to ZBOOT_ROM just like what ARCH_IMX_V6_V7
does.

Signed-off-by: Shawn Guo 
Cc: Sascha Hauer 
Signed-off-by: Sascha Hauer

arm/imx: fix the references to ARCH_MX3

2011-11-11T15:53:33+00:00

The config symbol ARCH_MX3 has been removed by commit 'a89cf59
arm/imx: merge i.MX3 and i.MX6', and it should not be referenced
any more.

The patch also change ARCH_MX* to SOC_IMX* for other platforms.

Signed-off-by: Shawn Guo 
Cc: Sascha Hauer 
Signed-off-by: Sascha Hauer

ARM: mx51/53: set pwm clock parent to ipg_perclk

2011-11-11T15:53:33+00:00

Signed-off-by: Richard Zhao 
Signed-off-by: Sascha Hauer

ARM: mach-shmobile: cpuidle single/global and last_state fixes

2011-11-11T07:49:28+00:00

The following commits break cpuidle on SH-Mobile ARM:

46bcfad cpuidle: Single/Global registration of idle states
e978aa7 cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state

This patch remedies these issues by up-porting the SH-Mobile
code to fit with the above introduced framework changes.

It is worth noting that the new code becomes significantly cleaner,
so these framework changes are very welcome. At the same time this
breakage could probably have been avoided by grepping for "last_state"
and "cpuidle_register_driver".

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

ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h

2011-11-11T07:45:35+00:00

Signed-off-by: Kuninori Morimoto 
Signed-off-by: Paul Mundt