From patchwork Fri Mar 15 15:16:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 2278791 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E23DBDF24C for ; Fri, 15 Mar 2013 15:21:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932082Ab3COPU6 (ORCPT ); Fri, 15 Mar 2013 11:20:58 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:50669 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755617Ab3COPRR (ORCPT ); Fri, 15 Mar 2013 11:17:17 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2FFHDsV021828; Fri, 15 Mar 2013 10:17:13 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2FFHDdM002155; Fri, 15 Mar 2013 10:17:13 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Fri, 15 Mar 2013 10:17:13 -0500 Received: from localhost.localdomain (h16-152.vpn.ti.com [172.24.16.152]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2FFGjRZ004649; Fri, 15 Mar 2013 10:17:11 -0500 From: Roger Quadros To: CC: , , , , , Subject: [PATCH v2 12/23] ARM: OMAP: devkit8000: Adapt to ehci-omap changes Date: Fri, 15 Mar 2013 17:16:33 +0200 Message-ID: <1363360604-21368-13-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1363360604-21368-1-git-send-email-rogerq@ti.com> References: <1363360604-21368-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Add platform device for 'nop-usb-xceiv'. This will be used as a PHY for HS USB Port 1, so provide binding information for it. Signed-off-by: Roger Quadros Acked-by: Felipe Balbi --- arch/arm/mach-omap2/board-devkit8000.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 53056c3..922ca91 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -33,6 +33,7 @@ #include #include +#include #include "id.h" #include #include @@ -430,22 +431,21 @@ static void __init omap_dm9000_init(void) eth_addr[5] = (odi.id_0 & 0x000000ff); } +/* PHY device on HS USB Port 1 i.e. nop_usb_xceiv.1 */ +static struct platform_device hsusb1_phy_device = { + .name = "nop_usb_xceiv", + .id = 1, +}; + static struct platform_device *devkit8000_devices[] __initdata = { &leds_gpio, &keys_gpio, &omap_dm9000_dev, + &hsusb1_phy_device, }; static struct usbhs_omap_platform_data usbhs_bdata __initdata = { - .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, - - .phy_reset = true, - .reset_gpio_port[0] = -EINVAL, - .reset_gpio_port[1] = -EINVAL, - .reset_gpio_port[2] = -EINVAL }; #ifdef CONFIG_OMAP_MUX @@ -625,6 +625,10 @@ static void __init devkit8000_init(void) usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(NULL); + + /* PHY on HSUSB Port 1 i.e. index 0 */ + usb_bind_phy("ehci-omap.0", 0, "nop_usb_xceiv.1"); + usbhs_init(&usbhs_bdata); board_nand_init(devkit8000_nand_partitions, ARRAY_SIZE(devkit8000_nand_partitions), NAND_CS,