From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 4/5] ARM: arm-soc: driver specific changes
Date: Wed, 12 Dec 2012 17:57:36 -0800 [thread overview]
Message-ID: <20121213015736.GD28281@quad.lixom.net> (raw)
In-Reply-To: <20121213015543.GA18953@quad.lixom.net>
Hi Linus,
A collection of mostly SoC-specific driver updates:
- a handful of pincontrol and setup changes
- new drivers for hwmon and reset controller for vexpress
- timing support updates for OMAP (gpmc and other interfaces)
- + a collection of smaller cleanups
Conflicts seen with this merge:
None
----------------------------------------------------------------
The following changes since commit 93dd6e875a23bb2b41b527d869dbbd0d9595760d:
Merge branch 'next/pm-merge' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/drivers
for you to fetch changes up to 4aa7cf79b1f760b5751d1686329351c2e060791b:
Merge branch 'next/gpio-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
----------------------------------------------------------------
Afzal Mohammed (6):
ARM: OMAP2+: nand: remove redundant rounding
ARM: OMAP2+: gpmc: handle additional timings
ARM: OMAP2+: gpmc: generic timing calculation
ARM: OMAP2+: onenand: generic timing calculation
ARM: OMAP2+: smc91x: generic timing calculation
ARM: OMAP2+: tusb6010: generic timing calculation
Arnd Bergmann (6):
Merge branch 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux into next/drivers
Merge tag 'ux500-pins-for-arm-soc' of http://git.kernel.org/.../linusw/linux-stericsson into next/drivers
Merge branch 'omap/headers4' into next/drivers
Merge tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/drivers
Merge branch 'omap/dt' into next/drivers
Merge tag 'omap-for-v3.8/timer-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/drivers
Eunki Kim (2):
ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip
gpio: samsung: Fix input mode setting function for GPIO int
Jean-Nicolas Graux (1):
ARM: ux500: add STM pin configuration
Jingoo Han (1):
gpio: samsung: use pr_* instead of printk
Jorgen Jonsson (1):
ARM: ux500: fixup magnetometer pins
Linus Walleij (2):
ARM: ux500: delete duplicate macro
ARM: ux500: fix pin warning
Olof Johansson (1):
Merge branch 'next/gpio-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Patrice Chotard (6):
ARM: ux500: 8500: register LCD VSI pinctrl table
ARM: ux500: 8500: add IDLE pin configuration for SPI
ARM: ux500: 8500: update SKE keypad pinctrl table
ARM: ux500: 8500: define SDI sleep states
ARM: ux500: cosmetic fixups for uart0
ARM: ux500: 8500: add pinctrl support for uart1 and uart2
Pawel Moll (2):
hwmon: Versatile Express hwmon driver
ARM: vexpress: Reset driver
Tony Lindgren (1):
Merge tag 'gpmc-generic-timing' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/gpmc
Documentation/bus-devices/ti-gpmc.txt | 122 ++++++
.../devicetree/bindings/hwmon/vexpress.txt | 23 +
Documentation/hwmon/vexpress | 34 ++
arch/arm/mach-omap2/gpmc-nand.c | 26 +-
arch/arm/mach-omap2/gpmc-onenand.c | 143 ++-----
arch/arm/mach-omap2/gpmc-smc91x.c | 43 +-
arch/arm/mach-omap2/gpmc.c | 373 ++++++++++++++++
arch/arm/mach-omap2/gpmc.h | 113 ++++-
arch/arm/mach-omap2/usb-tusb6010.c | 181 ++------
arch/arm/mach-ux500/board-mop500-pins.c | 425 ++++++++++++++++---
arch/arm/mach-vexpress/reset.c | 141 ++++++
arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +
arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +-
drivers/gpio/gpio-samsung.c | 25 +-
drivers/hwmon/Kconfig | 8 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/vexpress.c | 229 ++++++++++
17 files changed, 1525 insertions(+), 372 deletions(-)
create mode 100644 Documentation/bus-devices/ti-gpmc.txt
create mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt
create mode 100644 Documentation/hwmon/vexpress
create mode 100644 arch/arm/mach-vexpress/reset.c
create mode 100644 drivers/hwmon/vexpress.c
next prev parent reply other threads:[~2012-12-13 1:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 1:55 [GIT PULL 0/5] ARM: arm-soc: Second batch of pull requests Olof Johansson
2012-12-13 1:56 ` [GIT PULL 1/5] ARM: arm-soc: device tree conversions and enablement Olof Johansson
2012-12-13 1:56 ` [GIT PULL 2/5] ARM: arm-soc: multiplatform conversion patches Olof Johansson
2012-12-13 1:57 ` [GIT PULL 3/5] ARM: arm-soc: power management and clock changes Olof Johansson
2012-12-13 1:57 ` Olof Johansson [this message]
2012-12-13 1:57 ` [GIT PULL 5/5] ARM: arm-soc board updates, take 2 Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121213015736.GD28281@quad.lixom.net \
--to=olof@lixom.net \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).