From patchwork Wed May 8 23:39:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2542201 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 61F403FE1F for ; Wed, 8 May 2013 23:39:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753199Ab3EHXjN (ORCPT ); Wed, 8 May 2013 19:39:13 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:52420 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752942Ab3EHXjM (ORCPT ); Wed, 8 May 2013 19:39:12 -0400 Received: by mail-la0-f49.google.com with SMTP id eh20so2259632lab.22 for ; Wed, 08 May 2013 16:39:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:organization:to:subject:date:user-agent:cc :references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id:x-gm-message-state; bh=7bV766B2scVQJxijS4gLVDxMkSYfhS26kYRkb4Oz5zo=; b=BKl7xUmQmULeeJIS/Wmf+cDfSvWGypRNNICw0JSO52kG4NoD2iiL3V3llEDbR6Z9xT P89AMD8zqEcHg/IXivKvhv5rC2VNrVZ0lGnY4AQwOKlhq1ISLlEWVJ/iOo0V3WP4Kkec dbfDUCuspMtBLJqiu+OvTnS7/1ZG2wzp6V+jOsRSRyn2p+bqvj11ttbbRbx6cPju0OZ9 K2pRxEFfmTAI//e5eKdzRdUpGpp6InlHwHirx8jd8bmNrDwuZHvXfl916a2WLQyz03zJ WWxkjO5uayMFSE9+N1npZJdEeQr6o1lnNQYIy7WpQgcTS3/ZHlBE+EB7pixIzSX7XBcn F7+Q== X-Received: by 10.112.167.168 with SMTP id zp8mr4181483lbb.58.1368056348196; Wed, 08 May 2013 16:39:08 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-93-8.pppoe.mtu-net.ru. [91.76.93.8]) by mx.google.com with ESMTPSA id ay3sm219230lab.1.2013.05.08.16.39.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 08 May 2013 16:39:07 -0700 (PDT) From: Sergei Shtylyov Organization: Cogent Embedded To: horms@verge.net.au, linux-sh@vger.kernel.org, magnus.damm@gmail.com Subject: [PATCH v7 3/3] ARM: shmobile: BOCK-W: add USB support Date: Thu, 9 May 2013 03:39:09 +0400 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.i686.PAE; KDE/4.4.5; i686; ; ) Cc: linux-usb@vger.kernel.org, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org References: <201305090333.00333.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201305090333.00333.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Message-Id: <201305090339.10053.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQky9/lvXRs6lCopAEkz5zQx4PfB7AKlr4Tp6iTjhrUwS2O+0pK45J54fb2TH0L4tdFehNIu Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Register the USB PHY device from bockw_init(), passing the platform data to it. Set machine's init_late() method to r8a7778_init_late() in order for [EO]HCI to get registered too... Don't forget to add USB PENC0/1 pins to bockw_pinctrl_map[]. The patch has been tested on the BOCK-W board. Signed-off-by: Sergei Shtylyov --- Changes since version 6: - added USB PENC0/1 pins to bockw_pinctrl_map[]. Changes since version 4: - annotated 'usb_phy_platform_data' as '__initdata' since it's kmemdup()'ed while registering the platform device anyway; - refreshed the patch. Changes since version 3: - removed initializer for 'usb_phy_platform_data' letting it be set to all 0s; - refreshed the patch. Changes since version 2: - refreshed the patch. Changes since the original posting: - removed initializer for no longer existing field in 'usb_phy_platform_data', modified the comment to the 'ferrite_bead' field initializer. arch/arm/mach-shmobile/board-bockw.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: renesas/arch/arm/mach-shmobile/board-bockw.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/board-bockw.c +++ renesas/arch/arm/mach-shmobile/board-bockw.c @@ -63,6 +63,8 @@ static struct sh_mobile_sdhi_info sdhi0_ .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, }; +static struct rcar_phy_platform_data usb_phy_platform_data __initdata; + static const struct pinctrl_map bockw_pinctrl_map[] = { /* SCIF0 */ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778", @@ -78,6 +80,10 @@ static const struct pinctrl_map bockw_pi "sdhi0_data4", "sdhi0"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", "sdhi0_wp", "sdhi0"), + PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778", + "usb0", "usb0"), + PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778", + "usb1", "usb1"), }; #define FPGA 0x18200000 @@ -91,6 +97,7 @@ static void __init bockw_init(void) r8a7778_clock_init(); r8a7778_init_irq_extpin(1); r8a7778_add_standard_devices(); + r8a7778_add_usb_phy_device(&usb_phy_platform_data); pinctrl_register_mappings(bockw_pinctrl_map, ARRAY_SIZE(bockw_pinctrl_map)); @@ -146,4 +153,5 @@ DT_MACHINE_START(BOCKW_DT, "bockw") .init_machine = bockw_init, .init_time = shmobile_timer_init, .dt_compat = bockw_boards_compat_dt, + .init_late = r8a7778_init_late, MACHINE_END