From: Olof Johansson <olof@lixom.net>
To: torvalds@linux-foundation.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, arm@kernel.org
Subject: [GIT PULL 5/5] ARM: arm-soc board updates, take 2
Date: Wed, 12 Dec 2012 17:57:54 -0800 [thread overview]
Message-ID: <20121213015754.GE28281@quad.lixom.net> (raw)
In-Reply-To: <20121213015543.GA18953@quad.lixom.net>
Hi Linus,
This branch contains board updates for shmobile that had dependencies
on earlier branches past the first driver branch, and thus are merged
separately.
Most of these are to enable audio and USB on shmobile. They contain a
dependent ASoC branch that has been coordinated with Mark Brown.
Conflict seen with this merge:
None
----------------------------------------------------------------
The following changes since commit 370cdda68eb40e69a7a8950abec230976e5d9117:
Merge branch 'next/drivers' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/boards2
for you to fetch changes up to d7460f4a3d75469deb1c6c028961da69608d02d9:
Merge branch 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2
----------------------------------------------------------------
Arnd Bergmann (3):
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
Merge branches 'depends/asoc', 'renesas/boards', 'renesas/soc' and 'renesas/soc2' into next/boards2
Merge branch 'boards' of git://git.kernel.org/.../horms/renesas into next/boards2
Bastian Hecht (1):
ARM: shmobile: mackerel: Add FLCTL IRQ resource
Kuninori Morimoto (12):
ASoC: fsi: fixup channels_min/max
ASoC: fsi: use devm_request_irq()
ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only
ASoC: fsi: care fsi_hw_start/stop() return value
ASoC: fsi: add master clock control functions
ARM: shmobile: marzen: add USB phy support
ARM: shmobile: marzen: add USB EHCI driver support
ARM: shmobile: marzen: add USB OHCI driver support
ARM: shmobile: mackerel: enable DMAEngine on USB Host
ARM: shmobile: use FSI driver's audio clock on armadillo800eva
ARM: shmobile: use FSI driver's audio clock on mackerel
ARM: shmobile: use FSI driver's audio clock on ap4evb
Olof Johansson (1):
Merge branch 'boards3' of git://git.kernel.org/.../horms/renesas into next/boards2
Simon Horman (1):
Merge branch 'soc' into boards
arch/arm/configs/marzen_defconfig | 14 +-
arch/arm/mach-shmobile/Kconfig | 2 +
arch/arm/mach-shmobile/board-ap4evb.c | 139 +-----
arch/arm/mach-shmobile/board-armadillo800eva.c | 38 +-
arch/arm/mach-shmobile/board-mackerel.c | 80 +---
arch/arm/mach-shmobile/board-marzen.c | 186 ++++++++-
include/sound/sh_fsi.h | 6 +
sound/soc/sh/fsi.c | 441 ++++++++++++++++++--
8 files changed, 617 insertions(+), 289 deletions(-)
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 ` [GIT PULL 4/5] ARM: arm-soc: driver specific changes Olof Johansson
2012-12-13 1:57 ` Olof Johansson [this message]
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=20121213015754.GE28281@quad.lixom.net \
--to=olof@lixom.net \
--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