From patchwork Sat Jun 1 22:12:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2649101 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 4B17B40079 for ; Sat, 1 Jun 2013 22:12:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755645Ab3FAWMT (ORCPT ); Sat, 1 Jun 2013 18:12:19 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:49198 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755540Ab3FAWMT (ORCPT ); Sat, 1 Jun 2013 18:12:19 -0400 Received: by mail-lb0-f174.google.com with SMTP id u10so2723813lbi.19 for ; Sat, 01 Jun 2013 15:12:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=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=XuHHesyJ6QT54Sj4FYGLDb1dmNhexh4ubdmAeuLReuj5iPK+LlE1uMF+9E6iCRSYfT Yuy06OHAJt1rxvJ9Yt1DsRbnceBRbGo5MHBNCHC83Y7bDRAIojnG5xanEl+QVkdnZNjZ BVirvjwvrwtddnCHxFw9TbFCTzcRcqbr8TBk14GsAsKh49bLJ+ULjSbayFyxJZmq29Wt kBxQWSKoCP0Rzz9SDttXmq9Hz5I50RS7KXu/P9jJn7hnk6axhpAL8kChG7XUJQ+W3lPG W1fHKwc30nu+W8Nr7msXwXHJ/pSLZDfUpdMOZQUGiTzCPlQ5AwtfWyP9OEvsWcG07IDK FKEQ== X-Received: by 10.112.88.166 with SMTP id bh6mr8381233lbb.47.1370124737355; Sat, 01 Jun 2013 15:12:17 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-145-9.pppoe.mtu-net.ru. [91.76.145.9]) by mx.google.com with ESMTPSA id z9sm798809lae.7.2013.06.01.15.12.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 01 Jun 2013 15:12:16 -0700 (PDT) From: Sergei Shtylyov Organization: Cogent Embedded To: horms@verge.net.au, linux-sh@vger.kernel.org Subject: [PATCH v8 3/3] ARM: shmobile: BOCK-W: add USB support Date: Sun, 2 Jun 2013 02:12:25 +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, magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org References: <201306020206.47199.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201306020206.47199.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Message-Id: <201306020212.25957.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQm7Z99ghOMYLkZ8I3AxYkXmrvkdLH2o3hELSQ1dpLJ74BQTyoYbuZB0P/wm2dDgfJXts3VZ 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