From patchwork Tue Jul 5 13:08:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 944972 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p65DDD4n019203 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 5 Jul 2011 13:13:34 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qe5Pf-00087y-Lw; Tue, 05 Jul 2011 13:11:40 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qe5Pe-0008By-Tm; Tue, 05 Jul 2011 13:11:38 +0000 Received: from mail-fx0-f43.google.com ([209.85.161.43]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qe5Nk-0007X5-Df for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2011 13:09:41 +0000 Received: by mail-fx0-f43.google.com with SMTP id 17so5321658fxg.16 for ; Tue, 05 Jul 2011 06:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=CspGFaC68qBhhDWJjDuF4Bq6kUsmugWSRDRORqhYYiQ=; b=AsVaqgJ6Gs+RgShMUo0CkixuNkcU1LsGaYwdjBunRkVScfx1WDf6d9tDQfWSxZ7WsP CzocKGoR1ZVz0CZAP661Ox6CSUr6JjSZTL/Y2jcwbVmTrgV+FzsaSLylco88uzjoezI7 +0e+l5BgzmBSuyjFx7ijGR4Pvr5F6qSg4TLGo= Received: by 10.223.86.75 with SMTP id r11mr6351869fal.125.1309871380039; Tue, 05 Jul 2011 06:09:40 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id n20sm1952263fad.16.2011.07.05.06.09.36 (version=SSLv3 cipher=OTHER); Tue, 05 Jul 2011 06:09:39 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org Subject: [PATCH 11/15] h5000: convert to use gpio-pullup Date: Tue, 5 Jul 2011 17:08:37 +0400 Message-Id: <1309871321-11305-12-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1309871321-11305-1-git-send-email-dbaryshkov@gmail.com> References: <1309871321-11305-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110705_090940_708264_6F050763 X-CRM114-Status: GOOD ( 13.58 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.43 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dbaryshkov[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL To: misformatted and free email service Cc: Greg Kroah-Hartman , Eric Miao , Felipe Balbi X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 05 Jul 2011 13:13:35 +0000 (UTC) Convert to use gpio-pullup transceiver instead of relying on UDC driver managing GPIO. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/mach-pxa/h5000.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index 657db46..4b3ca92 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -31,7 +32,6 @@ #include #include -#include #include #include "generic.h" @@ -117,10 +117,18 @@ static struct platform_device h5000_flash[] = { * USB Device Controller */ -static struct pxa2xx_udc_mach_info h5000_udc_mach_info __initdata = { +static struct gpio_vbus_mach_info h5000_udc_mach_info = { .gpio_pullup = H5000_GPIO_USB_PULLUP, }; +static struct platform_device h5000_gpio_pullup = { + .name = "gpio-pullup", + .id = -1, + .dev = { + .platform_data = &h5000_udc_mach_info, + }, +}; + /* * GPIO setup */ @@ -187,6 +195,7 @@ static void fix_msc(void) static struct platform_device *devices[] __initdata = { &h5000_flash[0], &h5000_flash[1], + &h5000_gpio_pullup, }; static void __init h5000_init(void) @@ -197,7 +206,6 @@ static void __init h5000_init(void) pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); - pxa_set_udc_info(&h5000_udc_mach_info); platform_add_devices(ARRAY_AND_SIZE(devices)); }