From: Arnd Bergmann <arnd@arndb.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, arm@kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: [GIT PULL 06/09] ARM: board specific updates
Date: Sat, 24 Mar 2012 22:02:45 +0000 [thread overview]
Message-ID: <1332626568-17812-9-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1332626568-17812-1-git-send-email-arnd@arndb.de>
These changes are all specific to one board only. We're trying to keep
the number of board files low, but generally board level updates are
ok on platforms that are working on moving towards DT based probing,
which will eventually lead to removing them.
The board-ams-delta.c board file gets a conflict between the removal of
ams_delta_config and the addition of a lot of other data. The Kconfig
file has two changes in the same line, and in exynos, the power domain
cleanup conflicts with the addition of the image sensor device.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
The following changes since commit "abd43e4 Merge branch 'next/boards'
into for-next", leading up to commit " b9e1122 Merge tag 'asoc-3.4'
of git://git.kernel.org/pub/scm", are available in
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/boards
Aaro Koskinen (1):
ARM: OMAP: add minimal support for Nokia RM-696
Alex (1):
ARM: OMAP: Add omap_reserve functionality
Alex Gershgorin (1):
i.MX35-PDK: Add Camera support
Andrzej Pietrasiewicz (2):
ARM: EXYNOS: Register JPEG on universal_c210
ARM: EXYNOS: Register JPEG on nuri
Arnd Bergmann (11):
Merge branch 'kirkwood/board' into next/boards
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
Merge branch 'omap1' of git://git.kernel.org/.../tmlind/linux-omap into next/boards
Merge branch 'features/imx27-visstrim' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
Merge tag 'tegra-boards' of git://git.kernel.org/.../olof/tegra into tegra/boards
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
Merge tag 'imx35-cam-fb' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
Merge branch 'for-3.4/boards' of git://git.kernel.org/.../olof/tegra into next/boards
Merge tag 'asoc-3.4' of git://git.kernel.org/.../broonie/sound into next/boards
Merge branch 'next/boards' into for-next
Fabio Estevam (2):
ARM: mx28: Remove duplicate OCOTP error message
ARM: mx28evk: Simplify GPIO requests
Grazvydas Ignotas (1):
ARM: OMAP: pandora: add support for backlight and poweroff
Haojian Zhuang (2):
ARM: mmp: append irq name of gpio device
ARM: pxa: add dummy clock for pxa25x and pxa27x
Igor Grinberg (1):
ARM: OMAP3: cm-t3517: add EMAC support
Ilya Yanok (1):
ARM: OMAP: move generic EMAC init to separate file
Janusz Krzysztofik (12):
ARM: OMAP1: ams-delta: register latch dependent devices later
ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
LED: drop leds-ams-delta driver
MTD: NAND: ams-delta: use GPIO instead of custom I/O
omapfb: lcd_ams_delta: drive control lines over GPIO
input: serio: ams-delta: toggle keyboard power over GPIO
ARM: OMAP1: ams-delta: fix incorrect section tags
ARM: OMAP1: ams-delta: clean up init data section assignments
ARM: OMAP1: ams-delta: set up regulator over modem reset GPIO pin
ARM: OMAP1: ams-delta: update the modem to use regulator API
ASoC: OMAP: ams-delta: drop .set_bias_level callback
Jason Cooper (2):
ARM: kirkwood: add dreamplug (fdt) support.
ARM: kirkwood: convert uart0 to devicetree.
Javier Martin (5):
i.MX27: visstrim_m10: Add m41t00 RTC support.
i.MX27: visstrim_m10: Sort IMX_HAVE_PLATFORM_MXC_MMC properly.
i.MX27: visstrim_m10: Register I2C devices after I2C busses have been added.
i.MX27: visstrim_m10: Add video support.
i.MX27: visstrim_m10: Add led support.
Kamil Debski (2):
ARM: EXYNOS: add G2D to mach-nuri
ARM: EXYNOS: add G2D to mach-universal
Lauri Hintsala (1):
ARM: mxs: Add initial support for Bluegiga APX4 Development Kit
Marc Dietrich (3):
ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree
ARM: dt: tegra: add the power gpio key to paz00 device tree
ARM: dt: tegra: add the wifi led to paz00 device tree
Mark Brown (8):
ARM: S3C64XX: Support GPIO LEDs on Cragganmore
ARM: S3C64XX: Fix build of Cragganmore after SPI changes
ARM: S3C64XX: Enable power management for disk on Cragganmore
ARM: S3C64XX: Enable power management for WiFi on Cragganmore
ARM: S3C64XX: Add hookup for Tomatin module on Cragganmore
ARM: S3C64XX: Add a SPKVDD supply for CODECs on Cragganmore
ARM: S3C64XX: Add some more Cragganmore module IDs to the table
ARM: S3C64XX: Supply platform data for SPI on Cragganmore
Mircea Gherzan (1):
ARM: OMAP: enable Bluetooth on the PandaBoard
MyungJoo Ham (1):
ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
Olof Johansson (4):
Merge branch 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/boards
Merge branch 'ams-delta' of git://git.kernel.org/.../tmlind/linux-omap into next/boards
Merge branch 'board' of git://git.kernel.org/.../tmlind/linux-omap into next/boards
Merge branch 'next/board-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Paul Parsons (6):
pxa/hx4700: Correct StrataFlash block size discovery
pxa/hx4700: Add ASIC3 LED support
pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
ARM: pxa/hx4700: Remove unwanted request for GPIO105
ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
pxa/hx4700: Remove pcmcia platform_device structure
Philippe Rétornaz (2):
mx31moboard: update maintainer
mx31moboard: Add watchdog support
Sachin Kamat (13):
ARM: EXYNOS: Enable G2D on ORIGEN
ARM: S5PV210: Add missing FIMC media device to Aquila
ARM: EXYNOS: Add missing FIMC media device to SMDKV310
ARM: EXYNOS: Add missing FIMC media device to Origen
ARM: EXYNOS: Enable G2D on SMDKV310
ARM: S5PV210: Enable MFC on SMDKV210
ARM: S5PV210: Enable MFC on SMDKC110
ARM: S5PV210: Enable FIMC on SMDKV210
ARM: S5PV210: Enable FIMC on SMDKC110
ARM: EXYNOS: Enable JPEG on SMDKV310
ARM: EXYNOS: Enable JPEG on Origen
ARM: S5PV210: Add JPEG board definition
ARM: S5PV210: Enable JPEG on SMDKV210
Sangwook Lee (1):
ARM: EXYNOS: Enable Bluetooth on ORIGEN
Shawn Guo (1):
ARM: mxs: detect SoC by checking CHIPID register
Stephen Warren (2):
ARM: tegra: match SoC name not board name in DT board files
ARM: tegra: update defconfig
Sylwester Nawrocki (3):
ARM: EXYNOS: Increase virtual framebuffer size on Universal C210 board
ARM: EXYNOS: Add support for S5K6AAFX image sensor on Universal C210 board
ARM: SAMSUNG: Add support for S5K6AAFX camera on Nuri board
Thierry Reding (1):
ARM: tegra: PCIe: Provide 3.3V supply voltage
Tony Lindgren (2):
Merge branch 'omap1-part2' into omap1
Merge branch 'omap1' into ams-delta
Tushar Behera (2):
ARM: EXYNOS: Add __init attribute to nuri_camera_init()
ARM: EXYNOS: Add __init attribute to universal_camera_init()
Uwe Kleine-König (1):
ARM: OMAP4: board-4430sdp: don't initialize value that is never used
Vladimir Zapolskiy (1):
ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios
Wolfram Sang (1):
ARM: mxs: read correct values when setting up MAC
wu guoxing (1):
ARM : mx35: 3ds-board: add framebuffer device
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/kirkwood-dreamplug.dts | 25 ++
arch/arm/boot/dts/kirkwood.dtsi | 6 +
arch/arm/boot/dts/tegra-paz00.dts | 26 ++
arch/arm/configs/tegra_defconfig | 33 ++-
arch/arm/mach-exynos/Kconfig | 10 +
arch/arm/mach-exynos/mach-nuri.c | 80 +++++-
arch/arm/mach-exynos/mach-origen.c | 37 +++
arch/arm/mach-exynos/mach-smdkv310.c | 3 +
arch/arm/mach-exynos/mach-universal_c210.c | 80 +++++-
arch/arm/mach-imx/Kconfig | 5 +-
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 139 +++++++++-
arch/arm/mach-imx/mach-mx31moboard.c | 4 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 216 ++++++++++++++
arch/arm/mach-kirkwood/Kconfig | 14 +
arch/arm/mach-kirkwood/Makefile | 1 +
arch/arm/mach-kirkwood/Makefile.boot | 2 +
arch/arm/mach-kirkwood/board-dt.c | 180 ++++++++++++
arch/arm/mach-mmp/mmp2.c | 1 +
arch/arm/mach-mmp/pxa168.c | 1 +
arch/arm/mach-mmp/pxa910.c | 1 +
arch/arm/mach-mxs/Kconfig | 16 +
arch/arm/mach-mxs/Makefile | 1 +
arch/arm/mach-mxs/include/mach/digctl.h | 1 +
arch/arm/mach-mxs/include/mach/mxs.h | 29 +-
arch/arm/mach-mxs/include/mach/uncompress.h | 13 +-
arch/arm/mach-mxs/mach-apx4devkit.c | 260 +++++++++++++++++
arch/arm/mach-mxs/mach-m28evk.c | 7 +-
arch/arm/mach-mxs/mach-mx28evk.c | 80 ++----
arch/arm/mach-omap1/Kconfig | 4 +
arch/arm/mach-omap1/board-ams-delta.c | 314 ++++++++++++++++++---
arch/arm/mach-omap2/Kconfig | 3 +-
arch/arm/mach-omap2/Makefile | 3 +
arch/arm/mach-omap2/am35xx-emac.c | 117 ++++++++
arch/arm/mach-omap2/am35xx-emac.h | 15 +
arch/arm/mach-omap2/board-4430sdp.c | 5 +-
arch/arm/mach-omap2/board-am3517evm.c | 117 +--------
arch/arm/mach-omap2/board-cm-t3517.c | 2 +
arch/arm/mach-omap2/board-omap3logic.c | 2 +
arch/arm/mach-omap2/board-omap3pandora.c | 11 +
arch/arm/mach-omap2/board-omap4panda.c | 6 +
arch/arm/mach-omap2/board-rm680.c | 14 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 25 +-
arch/arm/mach-pxa/hx4700.c | 44 ++--
arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 2 +
arch/arm/mach-s3c64xx/Kconfig | 1 +
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 31 ++-
arch/arm/mach-s3c64xx/mach-crag6410.c | 67 +++++-
arch/arm/mach-s5pv210/Kconfig | 9 +
arch/arm/mach-s5pv210/clock.c | 5 +
arch/arm/mach-s5pv210/include/mach/map.h | 4 +
arch/arm/mach-s5pv210/mach-aquila.c | 1 +
arch/arm/mach-s5pv210/mach-smdkc110.c | 14 +
arch/arm/mach-s5pv210/mach-smdkv210.c | 15 +
arch/arm/mach-tegra/board-dt-tegra20.c | 6 +-
arch/arm/mach-tegra/board-dt-tegra30.c | 2 +-
arch/arm/mach-tegra/board-harmony-power.c | 3 +-
arch/arm/plat-omap/include/plat/board-ams-delta.h | 49 ++--
arch/arm/plat-omap/include/plat/uncompress.h | 1 +
drivers/input/serio/ams_delta_serio.c | 54 +++--
drivers/leds/Kconfig | 7 -
drivers/leds/Makefile | 1 -
drivers/leds/leds-ams-delta.c | 126 --------
drivers/mtd/nand/ams-delta.c | 74 ++++--
drivers/video/omap/lcd_ams_delta.c | 27 ++-
sound/soc/omap/ams-delta.c | 34 +---
66 files changed, 1929 insertions(+), 558 deletions(-)
next prev parent reply other threads:[~2012-03-24 22:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-24 22:02 [GIT PULL 0/9] arm-soc updates, first batch Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 01/09] ARM: Non-critical bug fixes Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 02/09] ARM: global cleanups Arnd Bergmann
2012-03-25 10:21 ` Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 02/09] ARM: subarch maintainer updates Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 03/09] ARM: global cleanups Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 03/09] ARM: subarch maintainer updates Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 04/09] ARM: timer cleanup work Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 05/09] ARM: SoC specific updates Arnd Bergmann
2012-03-24 22:02 ` Arnd Bergmann [this message]
2012-03-27 22:26 ` [GIT PULL 06/09] ARM: board " Olof Johansson
2012-03-24 22:02 ` [GIT PULL 07/09] remoteproc/rpmsg: new subsystem Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 08/09] ARM: driver specific updates Arnd Bergmann
2012-03-24 22:02 ` [GIT PULL 09/09] ARM: device tree work Arnd Bergmann
2012-03-25 10:50 ` [GIT PULL 0/9] arm-soc updates, first batch Russell King - ARM Linux
2012-03-25 14:55 ` Arnd Bergmann
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=1332626568-17812-9-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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
Powered by JetHome