From patchwork Tue Jul 5 13:08:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 945152 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 p65DRt8j010008 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 5 Jul 2011 13:28:16 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qe5b5-000808-DO; Tue, 05 Jul 2011 13:23:29 +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 1Qe5PM-00086c-MD; Tue, 05 Jul 2011 13:11:20 +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 1Qe5Ng-0007X5-0u for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2011 13:09:36 +0000 Received: by mail-fx0-f43.google.com with SMTP id 17so5321658fxg.16 for ; Tue, 05 Jul 2011 06:09:35 -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=LVh9G4wMoKegq9RAjyAPlqVTGnrI4cs+0kFI3DHYy5c=; b=ti7PHsmOz2HwbEGn4/6BAajhpm6nNlPwavS+7Bx+a/EMCd6nhB+o4st0z4A4i78gOO a5mgV5k4SY0ky8ttIC2jfH0XEcodtgQzcAhJkitDJWy+L2NGDOYU1n14Iyy5vjH4aQdZ UN1VGoipK8bY6Yil+VNLOLr0CDa9VW4vOlK9w= Received: by 10.223.145.144 with SMTP id d16mr11374166fav.100.1309871375631; Tue, 05 Jul 2011 06:09:35 -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.31 (version=SSLv3 cipher=OTHER); Tue, 05 Jul 2011 06:09:34 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org Subject: [PATCH 10/15] poodle: convert to use gpio-pullup Date: Tue, 5 Jul 2011 17:08:36 +0400 Message-Id: <1309871321-11305-11-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_090936_244948_10ABB0F3 X-CRM114-Status: GOOD ( 13.38 ) 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:28:16 +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/poodle.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 16d14fd..01aed35 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,6 @@ #include #include -#include #include #include #include @@ -297,11 +297,18 @@ static struct pxaficp_platform_data poodle_ficp_platform_data = { /* * USB Device Controller */ -static struct pxa2xx_udc_mach_info udc_info __initdata = { +static struct gpio_vbus_mach_info udc_info = { /* no connect GPIO; poodle can't tell connection status */ .gpio_pullup = POODLE_GPIO_USB_PULLUP, }; +static struct platform_device poodle_gpio_pullup = { + .name = "gpio-pullup", + .id = -1, + .dev = { + .platform_data = &udc_info, + }, +}; /* PXAFB device */ static struct pxafb_mode_info poodle_fb_mode = { @@ -408,6 +415,7 @@ static struct platform_device *devices[] __initdata = { &poodle_scoop_device, &sharpsl_nand_device, &sharpsl_rom_device, + &poodle_gpio_pullup, }; static struct i2c_board_info __initdata poodle_i2c_devices[] = { @@ -446,7 +454,6 @@ static void __init poodle_init(void) pr_warning("poodle: Unable to register LoCoMo device\n"); pxa_set_fb_info(&poodle_locomo_device.dev, &poodle_fb_info); - pxa_set_udc_info(&udc_info); pxa_set_mci_info(&poodle_mci_platform_data); pxa_set_ficp_info(&poodle_ficp_platform_data); pxa_set_i2c_info(NULL);