From patchwork Thu Jun 13 07:00:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 251029 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 8203C2C0079 for ; Thu, 13 Jun 2013 20:06:26 +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 1Un1bz-0002dQ-KQ; Thu, 13 Jun 2013 07:06:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Un1aN-0003Px-5C; Thu, 13 Jun 2013 07:04:43 +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 1Un1Wt-0002z8-69 for linux-arm-kernel@lists.infradead.org; Thu, 13 Jun 2013 07:01:23 +0000 Received: from ayumi.isobedori.kobe.vergenet.net (p5212-ipbfp1903kobeminato.hyogo.ocn.ne.jp [114.172.132.212]) by kirsty.vergenet.net (Postfix) with ESMTP id A90A42671A5; Thu, 13 Jun 2013 17:00:46 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 599766CE066; Thu, 13 Jun 2013 16:00:38 +0900 (JST) From: Simon Horman To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 00/12] Renesas USB updates for v3.11 Date: Thu, 13 Jun 2013 16:00:24 +0900 Message-Id: <1371106836-25388-1-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.8.2.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130613_030107_592347_7EDBF027 X-CRM114-Status: GOOD ( 13.48 ) X-Spam-Score: -2.8 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.8 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] -0.2 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, This pull request is based on a merge of renesas-soc-for-v3.11 and renesas-pinmux-for-v3.11 in order to provide pre-requisites. You have previously pulled both of those tags. I have put all of these patches into a single pull-request as R8A7779/Marzen clean-up portion are tightly related and don't seem to be easily broken out into e.g. board and soc components without introducing bisection breakage. This pull request will cause various 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 ae8b378faea7f04d4517b22f5d70d824adcbc4dc: Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base (2013-06-11 14:58:57 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-phy-rcar-usb-for-v3.11 for you to fetch changes up to 1a87b01d3b18709ae240ec90ae612354dd44d9a9: ARM: shmobile: BOCK-W: add USB support (2013-06-11 16:12:53 +0900) ---------------------------------------------------------------- Renesas USB updates for v3.11 These updates are by Sergei Shtylyov to clean-up USB support present for R8A7779/Marzen and then extend USB support coverage to R8A7778/BOCK-W. ---------------------------------------------------------------- Sergei Shtylyov (12): ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code ehci-platform: add pre_setup() method to platform data ARM: shmobile: r8a7779: setup EHCI internal buffer phy-rcar-usb: remove EHCI internal buffer setup ARM: shmobile: r8a7779: remove USB PHY 2nd memory resource phy-rcar-usb: correct base address phy-rcar-usb: add platform data ARM: shmobile: Marzen: pass platform data to USB PHY device phy-rcar-usb: handle platform data phy-rcar-usb: add R8A7778 support ARM: shmobile: r8a7778: add USB support ARM: shmobile: BOCK-W: add USB support arch/arm/mach-shmobile/Kconfig | 2 + arch/arm/mach-shmobile/board-bockw.c | 8 ++ arch/arm/mach-shmobile/board-marzen.c | 181 +----------------------- arch/arm/mach-shmobile/clock-r8a7778.c | 4 + arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 + arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 + arch/arm/mach-shmobile/setup-r8a7778.c | 108 ++++++++++++++ arch/arm/mach-shmobile/setup-r8a7779.c | 196 +++++++++++++++++++++++++- drivers/usb/host/ehci-platform.c | 6 + drivers/usb/phy/Kconfig | 10 +- drivers/usb/phy/phy-rcar-usb.c | 128 +++++++++++------ include/linux/platform_data/usb-rcar-phy.h | 28 ++++ include/linux/usb/ehci_pdriver.h | 4 + 13 files changed, 450 insertions(+), 231 deletions(-) create mode 100644 include/linux/platform_data/usb-rcar-phy.h