From patchwork Mon Jun 17 03:38:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 251763 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [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 BB20F2C00B1 for ; Mon, 17 Jun 2013 13:38:22 +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 1UoQGm-0003Eh-8c; Mon, 17 Jun 2013 03:38:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoQGi-0003sw-Tk; Mon, 17 Jun 2013 03:38:12 +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 1UoQGe-0003ry-PX for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 03:38:09 +0000 Received: from penelope.isobedori.kobe.vergenet.net (p5212-ipbfp1903kobeminato.hyogo.ocn.ne.jp [114.172.132.212]) by kirsty.vergenet.net (Postfix) with ESMTP id 1A34925BEEF; Mon, 17 Jun 2013 13:37:47 +1000 (EST) Received: by penelope.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 798E07C00E4; Mon, 17 Jun 2013 12:38:50 +0900 (JST) From: Simon Horman To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 0/2 v2] Renesas sh-sci updates for v3.11 Date: Mon, 17 Jun 2013 12:38:45 +0900 Message-Id: <1371440327-30512-1-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130616_233809_114552_1AFC672F X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.7 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.7 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] -1.1 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, linux-sh@vger.kernel.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 Olof, Hi Arnd, As requested the first patch is now includes an ack from Greg Kroah-Hartman. I have included the r8a7790 change in this patch as it depends on the first change in the pull-request but nothing else. This pull request will cause some conflicts though I believe all of them are not difficult to resolve. The renesas-next-20130613 tag in my tree illustrates how I have handled the conflicts with both changes already in arm-soc and changes I intend to send pull requests for in the near future. The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci-for-v3.11 for you to fetch changes up to fe0b1091e41e0acae8ddf2da2a5a36b6867ff012: ARM: shmobile: r8a7790: don't use external clock for SCIFs (2013-06-17 12:17:48 +0900) ---------------------------------------------------------------- Renesas sh-sci updates for v3.11 HSCIF support by Ulrich Hecht. ---------------------------------------------------------------- Ulrich Hecht (2): serial: sh-sci: HSCIF support ARM: shmobile: r8a7790: don't use external clock for SCIFs arch/arm/mach-shmobile/setup-r8a7790.c | 16 ++++- drivers/tty/serial/sh-sci.c | 102 +++++++++++++++++++++++++++++--- include/linux/serial_sci.h | 12 +++- include/uapi/linux/serial_core.h | 3 + 4 files changed, 120 insertions(+), 13 deletions(-)