From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT 00/19 v2] Renesas ARM based SoC pinmux updates for v3.12
Date: Wed, 24 Jul 2013 17:05:32 +0900 [thread overview]
Message-ID: <20130724080532.GA9276@verge.net.au> (raw)
In-Reply-To: <cover.1374625203.git.horms+renesas@verge.net.au>
On Wed, Jul 24, 2013 at 09:32:14AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> please consider the following pinmux updates for v3.12.
>
> Difference with v1 of this pull-request:
> * Remove bogus i2c portions of the first patch of the series.
> * Correct addressing mode used in dts of the first patch of the series.
> * Removal of egg from face: wip
This pull request has conflicts with renesas-soc-for-v3.12, which I also
sent a pull request for earlier today. I have a provided an example
resolution as part of the renesas-devel-20130724v2 tag in the renesas tree.
In words: take both sides.
The conflicting files are:
arch/arm/boot/dts/r8a73a4.dtsi
arch/arm/boot/dts/r8a7790.dtsi
>
> The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:
>
> Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.12
>
> for you to fetch changes up to 1469273960de45275f33276c7254456edcba9da2:
>
> ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree (2013-07-22 10:12:41 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM based SoC pinmux updates for v3.12
>
> SH Mobile pinctrl DT support
>
> ----------------------------------------------------------------
> Laurent Pinchart (19):
> ARM: shmobile: r8a73a4: Add pin control device to device tree
> ARM: shmobile: r8a7740: Add pin control device to device tree
> ARM: shmobile: r8a7778: Add pin control device to device tree
> ARM: shmobile: r8a7778: Add GPIO controller devices to device tree
> ARM: shmobile: r8a7779: Add pin control device to device tree
> ARM: shmobile: r8a7779: Add GPIO controller devices to device tree
> ARM: shmobile: r8a7790: Add pin control device to device tree
> ARM: shmobile: r8a7790: Add GPIO controller devices to device tree
> ARM: shmobile: sh7372: Add pin control device to device tree
> ARM: shmobile: sh73a0: Add pin control device to device tree
> ARM: shmobile: armadillo-reference: Move pinctrl mappings to device tree
> ARM: shmobile: armadillo-reference: Add st1232 pin mappings
> ARM: shmobile: armadillo-reference: Move st1232 reset GPIO to DT
> ARM: shmobile: armadillo-reference: Add LED1-LED4 to the device tree
> ARM: shmobile: marzen-reference: Move pinctrl mappings to device tree
> ARM: shmobile: marzen-reference: Add LED2-LED4 to the device tree
> ARM: shmobile: kzm9g-reference: Move pinctrl mappings to device tree
> ARM: shmobile: kzm9g-reference: Move SDHI regulators to DT
> ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree
>
> arch/arm/boot/dts/r8a73a4.dtsi | 7 ++
> .../boot/dts/r8a7740-armadillo800eva-reference.dts | 34 ++++++++
> arch/arm/boot/dts/r8a7740.dtsi | 8 ++
> arch/arm/boot/dts/r8a7778.dtsi | 66 ++++++++++++++++
> arch/arm/boot/dts/r8a7779-marzen-reference.dts | 49 ++++++++++++
> arch/arm/boot/dts/r8a7779.dtsi | 90 ++++++++++++++++++++++
> arch/arm/boot/dts/r8a7790.dtsi | 78 +++++++++++++++++++
> arch/arm/boot/dts/sh7372.dtsi | 8 ++
> arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 90 +++++++++++++++++++++-
> arch/arm/boot/dts/sh73a0.dtsi | 8 ++
> .../board-armadillo800eva-reference.c | 18 +----
> arch/arm/mach-shmobile/board-kzm9g-reference.c | 47 -----------
> arch/arm/mach-shmobile/board-marzen-reference.c | 28 -------
> 13 files changed, 437 insertions(+), 94 deletions(-)
>
next prev parent reply other threads:[~2013-07-24 8:05 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-24 0:32 [GIT 00/19 v2] Renesas ARM based SoC pinmux updates for v3.12 Simon Horman
2013-07-24 0:32 ` [PATCH 01/19] ARM: shmobile: r8a73a4: Add pin control device to device tree Simon Horman
2013-07-24 6:11 ` Guennadi Liakhovetski
2013-07-24 7:23 ` Simon Horman
2013-07-24 0:32 ` [PATCH 02/19] ARM: shmobile: r8a7740: " Simon Horman
2013-07-24 0:32 ` [PATCH 03/19] ARM: shmobile: r8a7778: " Simon Horman
2013-07-24 0:32 ` [PATCH 04/19] ARM: shmobile: r8a7778: Add GPIO controller devices " Simon Horman
2013-07-24 0:32 ` [PATCH 05/19] ARM: shmobile: r8a7779: Add pin control device " Simon Horman
2013-07-24 0:32 ` [PATCH 06/19] ARM: shmobile: r8a7779: Add GPIO controller devices " Simon Horman
2013-07-24 0:32 ` [PATCH 07/19] ARM: shmobile: r8a7790: Add pin control device " Simon Horman
2013-07-24 0:32 ` [PATCH 08/19] ARM: shmobile: r8a7790: Add GPIO controller devices " Simon Horman
2013-07-24 0:32 ` [PATCH 09/19] ARM: shmobile: sh7372: Add pin control device " Simon Horman
2013-07-24 0:32 ` [PATCH 10/19] ARM: shmobile: sh73a0: " Simon Horman
2013-07-24 0:32 ` [PATCH 11/19] ARM: shmobile: armadillo-reference: Move pinctrl mappings " Simon Horman
2013-07-24 0:32 ` [PATCH 12/19] ARM: shmobile: armadillo-reference: Add st1232 pin mappings Simon Horman
2013-07-24 0:32 ` [PATCH 13/19] ARM: shmobile: armadillo-reference: Move st1232 reset GPIO to DT Simon Horman
2013-07-24 0:32 ` [PATCH 14/19] ARM: shmobile: armadillo-reference: Add LED1-LED4 to the device tree Simon Horman
2013-07-24 0:32 ` [PATCH 15/19] ARM: shmobile: marzen-reference: Move pinctrl mappings to " Simon Horman
2013-07-24 0:32 ` [PATCH 16/19] ARM: shmobile: marzen-reference: Add LED2-LED4 to the " Simon Horman
2013-07-24 0:32 ` [PATCH 17/19] ARM: shmobile: kzm9g-reference: Move pinctrl mappings to " Simon Horman
2013-07-24 0:32 ` [PATCH 18/19] ARM: shmobile: kzm9g-reference: Move SDHI regulators to DT Simon Horman
2013-07-24 0:32 ` [PATCH 19/19] ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree Simon Horman
2013-07-24 8:05 ` Simon Horman [this message]
2013-08-14 7:23 ` [GIT 00/19 v2] Renesas ARM based SoC pinmux updates for v3.12 Olof Johansson
2013-08-18 3:55 ` Simon Horman
2013-08-22 5:03 ` Olof Johansson
2013-08-22 5:32 ` Simon Horman
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=20130724080532.GA9276@verge.net.au \
--to=horms@verge.net.au \
--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).