[GIT PULL] u300, ux500 and Nomadik changes for v2.6.39

Linus Walleij linus.walleij at linaro.org
Mon Mar 14 10:20:06 EDT 2011


On Mon, Mar 14, 2011 at 1:43 PM, Linus Walleij <linus.walleij at linaro.org> wrote:
> On Mon, Mar 14, 2011 at 12:51 PM, Russell King - ARM Linux
> <linux at arm.linux.org.uk> wrote:
>
>> Why not base your tree off my devel-stable if the commits are already in
>> that branch?
>
> OK I'll fix!

The following changes since commit 8688a1a8637c6b833b9b70148809db4538352d2e:

  Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into
devel-stable (2011-03-12 20:33:51 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
for-rmk-devel-stable

Bibek Basu (1):
      mach-ux500: add hrefv60 GPIO pins

Jonas Aaberg (1):
      plat-nomadik: pull-up/down settings for GPIO resume

Lee Jones (1):
      mach-ux500: Add Rohm BH1780GLI Light Sensor to i2c_board_info

Linus Walleij (9):
      mach-ux500: add DB5500 PMU resources
      mach-ux500: add a few AB8500 regulator consumers v3
      mach-ux500: delete old keypad board file
      mach-u300: use mmci driver for GPIO card detect
      mach-u300: config U300 PL180 PL011 PL022 for DMA
      mach-ux500: config Ux500 PL011 PL022 PL180 for DMA
      plat-nomadik: fix compilation warning
      mach-ux500: basic HREFv60 support v2
      mach-u300: define a dummy filter function for coh901318

Mian Yousaf Kaukab (4):
      mach-ux500: add platform data for musb
      mach-ux500: update MUSB clock configurations
      mach-ux500: add MUSB to db8500 devices
      mach-ux500: add MUSB to db5500 devices

Philippe Langlais (4):
      mach-ux500: platform data for SFH7741 proximity sensor driver
      mach-ux500: platform data for LP5521 leds driver
      mach-ux500: set sd/mmc clock rate to 100MHz
      mach-ux500: fix inverted SD-card GPIO pin

Rabin Vincent (10):
      mach-ux500: dynamic UIB (user interface boards) detection
      plat-nomadik: support varying number of GPIOs per block
      plat-nomadik: add custom dbg_show for GPIO
      plat-nomadik: implement suspend/resume for GPIO
      plat-nomadik: support secondary GPIO interrupts
      plat-nomadik: set altfunc to GPIO when enabling the sleep config
      plat-nomadik: implement safe switch sequence for Alt-C
      plat-nomadik: get rid of unused GPIO PM code
      mach-ux500: move MOP500 pins to separate file
      plat-nomadik: make GPIO interrupts work with cpuidle ApSleep

Rikard Olsson (1):
      plat-nomadik: change sleep/wakeup setting in GPIO SLPM register

Sundar Iyer (3):
      mach-ux500: fix ux500 build error
      mach-ux500: add ST-UIB platform data
      mach-ux500: add U8500 UIB platform data

Virupax Sadashivpetimath (1):
      plat-nomadik: type secondary IRQ correctly

 arch/arm/mach-u300/core.c                     |  179 ++++++++-
 arch/arm/mach-u300/include/mach/coh901318.h   |    7 +
 arch/arm/mach-u300/mmc.c                      |  160 ++-------
 arch/arm/mach-u300/spi.c                      |   21 +-
 arch/arm/mach-ux500/Makefile                  |    8 +-
 arch/arm/mach-ux500/board-mop500-keypads.c    |  229 ------------
 arch/arm/mach-ux500/board-mop500-pins.c       |  241 ++++++++++++
 arch/arm/mach-ux500/board-mop500-regulators.c |   62 ++++
 arch/arm/mach-ux500/board-mop500-sdi.c        |  184 ++++++----
 arch/arm/mach-ux500/board-mop500-stuib.c      |  205 +++++++++++
 arch/arm/mach-ux500/board-mop500-u8500uib.c   |  111 ++++++
 arch/arm/mach-ux500/board-mop500-uib.c        |  135 +++++++
 arch/arm/mach-ux500/board-mop500.c            |  328 ++++++++++++++----
 arch/arm/mach-ux500/board-mop500.h            |   25 ++-
 arch/arm/mach-ux500/board-u5500-sdi.c         |   25 ++
 arch/arm/mach-ux500/board-u5500.c             |    6 +-
 arch/arm/mach-ux500/clock.c                   |    6 +-
 arch/arm/mach-ux500/cpu-db5500.c              |   53 +++-
 arch/arm/mach-ux500/cpu-db8500.c              |   25 ++
 arch/arm/mach-ux500/devices-common.c          |    1 +
 arch/arm/mach-ux500/devices-common.h          |    7 +-
 arch/arm/mach-ux500/devices-db5500.h          |   19 +-
 arch/arm/mach-ux500/devices-db8500.c          |   67 ++++-
 arch/arm/mach-ux500/devices-db8500.h          |   15 +-
 arch/arm/mach-ux500/dma-db5500.c              |   16 +
 arch/arm/mach-ux500/include/mach/uncompress.h |    6 +-
 arch/arm/mach-ux500/include/mach/usb.h        |   25 ++
 arch/arm/mach-ux500/usb.c                     |  160 ++++++++
 arch/arm/plat-nomadik/gpio.c                  |  487 +++++++++++++++++++++----
 arch/arm/plat-nomadik/include/plat/gpio.h     |    6 +
 30 files changed, 2192 insertions(+), 627 deletions(-)
 delete mode 100644 arch/arm/mach-ux500/board-mop500-keypads.c
 create mode 100644 arch/arm/mach-ux500/board-mop500-pins.c
 create mode 100644 arch/arm/mach-ux500/board-mop500-stuib.c
 create mode 100644 arch/arm/mach-ux500/board-mop500-u8500uib.c
 create mode 100644 arch/arm/mach-ux500/board-mop500-uib.c
 create mode 100644 arch/arm/mach-ux500/include/mach/usb.h
 create mode 100644 arch/arm/mach-ux500/usb.c

Thanks,
Linus Walleij



More information about the linux-arm-kernel mailing list