From: Olof Johansson <olof@lixom.net>
To: Simon Horman <horms+renesas@verge.net.au>
Cc: arm@kernel.org, linux-renesas-soc@vger.kernel.org,
Kevin Hilman <khilman@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Magnus Damm <magnus.damm@gmail.com>
Subject: Re: [GIT PULL] Renesas ARM Based SoC DT Updates for v4.12
Date: Tue, 21 Mar 2017 17:35:25 -0700 [thread overview]
Message-ID: <20170322003525.GH5129@localhost> (raw)
In-Reply-To: <cover.1489999062.git.horms+renesas@verge.net.au>
On Mon, Mar 20, 2017 at 09:58:08AM +0100, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC DT updates for v4.12.
>
> * Conflicts
>
> "Add watchdog timer to r7s72100 SoC", which is part of this patch-set,
> has a minor conflict with "ARM: 8661/1: dts: r7s72100: add l2 cache",
> which I believe Russell King has in his tree.
>
> The resolution is to take both.
>
>
> The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:
>
> Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)
>
> are available in the git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v4.12
>
> for you to fetch changes up to d01ff18992218f3a13f45f45a886b3bf8f250f14:
>
> ARM: dts: silk: Drop superfluous status update for frequency override (2017-03-13 10:19:35 +0100)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC DT Updates for v4.12
>
> Cleanup:
> * Drop superfluous status update for frequency override on various boards
> * Always use status "okay" to enable devices on porger board
> * Add INTC-SYS clock to device tree of various SoCs
> * Tidyup Audio-DMAC channel for DVC on r8a779[013] SoCs
> * Remove unit-address and reg from integrated cache on various SoCs
> * Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS
> * Fix SCIFB0 dmas indentation on r8a774[35] SoCs
>
> Enhancements:
> * Add watchdog timer to r7s72100 SoC
> * Update sdhi clock bindings on r7s72100 SoC
>
Merged, thanks.
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Renesas ARM Based SoC DT Updates for v4.12
Date: Tue, 21 Mar 2017 17:35:25 -0700 [thread overview]
Message-ID: <20170322003525.GH5129@localhost> (raw)
In-Reply-To: <cover.1489999062.git.horms+renesas@verge.net.au>
On Mon, Mar 20, 2017 at 09:58:08AM +0100, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC DT updates for v4.12.
>
> * Conflicts
>
> "Add watchdog timer to r7s72100 SoC", which is part of this patch-set,
> has a minor conflict with "ARM: 8661/1: dts: r7s72100: add l2 cache",
> which I believe Russell King has in his tree.
>
> The resolution is to take both.
>
>
> The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:
>
> Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)
>
> are available in the git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v4.12
>
> for you to fetch changes up to d01ff18992218f3a13f45f45a886b3bf8f250f14:
>
> ARM: dts: silk: Drop superfluous status update for frequency override (2017-03-13 10:19:35 +0100)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC DT Updates for v4.12
>
> Cleanup:
> * Drop superfluous status update for frequency override on various boards
> * Always use status "okay" to enable devices on porger board
> * Add INTC-SYS clock to device tree of various SoCs
> * Tidyup Audio-DMAC channel for DVC on r8a779[013] SoCs
> * Remove unit-address and reg from integrated cache on various SoCs
> * Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS
> * Fix SCIFB0 dmas indentation on r8a774[35] SoCs
>
> Enhancements:
> * Add watchdog timer to r7s72100 SoC
> * Update sdhi clock bindings on r7s72100 SoC
>
Merged, thanks.
-Olof
next prev parent reply other threads:[~2017-03-22 0:40 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-20 8:58 [GIT PULL] Renesas ARM Based SoC DT Updates for v4.12 Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:57 ` [PATCH 01/31] ARM: dts: r7s72100: update sdhi clock bindings Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 02/31] ARM: dts: r8a7743: Fix SCIFB0 dmas indentation Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 03/31] ARM: dts: r8a7745: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 04/31] ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 05/31] ARM: dts: r8a73a4: Remove unit-addresses and regs from integrated caches Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 06/31] ARM: dts: r8a7743: Remove unit-address and reg from integrated cache Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 07/31] ARM: dts: r8a7745: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 08/31] ARM: dts: r8a7790: Remove unit-addresses and regs from integrated caches Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 09/31] ARM: dts: r8a7791: Remove unit-address and reg from integrated cache Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 10/31] ARM: dts: r8a7792: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 11/31] ARM: dts: r8a7793: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 12/31] ARM: dts: r8a7794: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 13/31] ARM: dts: r8a7790: Tidyup Audio-DMAC channel for DVC Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 14/31] ARM: dts: r7s72100: Add watchdog timer Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 15/31] ARM: dts: r8a73a4: Add INTC-SYS clock to device tree Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 16/31] ARM: dts: r8a7790: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 17/31] ARM: dts: r8a7791: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 18/31] ARM: dts: r8a7792: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 19/31] ARM: dts: r8a7794: " Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:57 ` [PATCH 20/31] ARM: dts: r8a7791: Tidyup Audio-DMAC channel for DVC Simon Horman
2017-03-20 8:57 ` Simon Horman
2017-03-20 8:58 ` [PATCH 21/31] ARM: dts: r8a7793: " Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 22/31] ARM: dts: r8a7793: Add INTC-SYS clock to device tree Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 23/31] ARM: dts: porter: Always use status "okay" to enable devices Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 24/31] ARM: dts: bockw: Drop superfluous status update for frequency override Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 25/31] ARM: dts: marzen: " Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 26/31] ARM: dts: lager: " Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 27/31] ARM: dts: koelsch: Drop superfluous status updates for frequency overrides Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 28/31] ARM: dts: porter: Drop superfluous status update for frequency override Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 29/31] ARM: dts: gose: " Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 30/31] ARM: dts: alt: " Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-20 8:58 ` [PATCH 31/31] ARM: dts: silk: " Simon Horman
2017-03-20 8:58 ` Simon Horman
2017-03-22 0:35 ` Olof Johansson [this message]
2017-03-22 0:35 ` [GIT PULL] Renesas ARM Based SoC DT Updates for v4.12 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=20170322003525.GH5129@localhost \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=horms+renesas@verge.net.au \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.