From patchwork Wed Aug 28 01:37:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 270309 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 525442C009C for ; Wed, 28 Aug 2013 11:38:59 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEUiL-0001cn-9V; Wed, 28 Aug 2013 01:38:29 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEUiD-0003ay-BE; Wed, 28 Aug 2013 01:38:21 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEUi1-0003Zd-Nc for linux-arm-kernel@lists.infradead.org; Wed, 28 Aug 2013 01:38:11 +0000 Received: from ayumi.isobedori.kobe.vergenet.net (p6221-ipbfp1004kobeminato.hyogo.ocn.ne.jp [118.10.144.221]) by kirsty.vergenet.net (Postfix) with ESMTP id 21CE725B714; Wed, 28 Aug 2013 11:37:45 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id C3293EDE11D; Wed, 28 Aug 2013 10:37:43 +0900 (JST) From: Simon Horman To: Arnd Bergmann , Olof Johansson , Kevin Hilman , linux-sh@vger.kernel.org Subject: [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Date: Wed, 28 Aug 2013 10:37:40 +0900 Message-Id: X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130827_213810_350668_C2103F44 X-CRM114-Status: UNSURE ( 9.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.1 (-----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-5.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [202.4.237.240 listed in list.dnswl.org] -2.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Simon Horman , arm@kernel.org, Magnus Damm , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Kevin, Hi Olof, Hi Arnd, please consider this third round of Renesas ARM based SoC board updates for v3.12. It is based on a merge of: * renesas-boards2-for-v3.12 ("Second Round of ARM based SoC board updates for v3.12") which you have previously pulled. * renesas-boards-cleanup-for-v3.12 ("ARM based SoC board cleanups updates for v3.12") which you have previously pulled. * git://people.freedesktop.Org/~airlied/linux drm-rcar-for-v3.12 Which is in turn based on v3.11-rc3. This was provided by Dave Airlie to provide dependencies for the Display Unit changes in this series. I encountered a minor merge conflict when I merged this branch into my own next branch. My resolution is available in the renesas-next-20130823 tag of my renesas tree. I apologise that this and other pull requests that I will send today are rather later in the cycle than I would like. This is primarily due to a combination of my summer vacation and wanting to let the patches sit in next for a while. The following changes since commit 3ddace5bccc5094a1d135fe4a9e555ef1d40006c: Merge branch 'drm-rcar-for-v3.12' of git://people.freedesktop.Org/~airlied/linux into boards3 (2013-08-22 11:11:55 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards3-for-v3.12 for you to fetch changes up to 8034dc4a1d615c84932c74633b7399603f7cc2a4: ARM: shmobile: lager: Fix Display Unit platform data (2013-08-23 09:14:16 +0900) ---------------------------------------------------------------- Third round of Renesas ARM-based SoC board updates for v3.12 * Add Display Unit support to lager and marzen boards * Constify platform data and resources of lager board * Correct regulators of MMC0, SDHI0 and SDHI1 on ape6evm board ---------------------------------------------------------------- Guennadi Liakhovetski (1): ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators Laurent Pinchart (4): ARM: shmobile: marzen: Add Display Unit support ARM: shmobile: lager: Constify platform data and resources ARM: shmobile: lager: Add Display Unit support ARM: shmobile: lager: Fix Display Unit platform data arch/arm/mach-shmobile/board-ape6evm.c | 54 +++++++++++++++++++---- arch/arm/mach-shmobile/board-lager.c | 80 +++++++++++++++++++++++++++++++--- arch/arm/mach-shmobile/board-marzen.c | 72 ++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 15 deletions(-)