From patchwork Wed Jun 22 12:20:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 904812 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 p5MCM5d8007614 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 22 Jun 2011 12:22:26 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QZMQp-00063I-38; Wed, 22 Jun 2011 12:21:19 +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 1QZMQo-0007WB-Gl; Wed, 22 Jun 2011 12:21:18 +0000 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QZMQ5-0007Lz-C2 for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2011 12:20:35 +0000 Received: by wyf23 with SMTP id 23so649645wyf.36 for ; Wed, 22 Jun 2011 05:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=8yFiv1WUjGBLisDrTmkMwF1wzZwbgNKeyFIFZ03yLLc=; b=D2Fp/YIlel+ZQhSZj9n3uU09y4TDNWb7wdv+bRT5nm/0/PhQvkRMn+VDhDhYh0G6Bu tZ5y4m9sOfoB+4VNYyCrcbzv3b6kTuwDEI24R8e40jfL2epOrlcuqaVMZz51PQbztoAV 4KSYz70cKSrUojEruxeK5OsEEulLJFGPOLCZA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=qZQ21yIZy8URuEMwamUOZOKSC878URSZ1pvFrxopRkkmiTST/ALW3SENMeukFWBtQn vL6FQtb/RG3bVbQ+7+Cz/JI7Yaa/VsJkab70Ta2SpIl6RkE7gwR9Gw4CoxRRUUcnbm17 QL/zm41hLIv9newrwgDNg9IRsxzOoOvoMVLKg= Received: by 10.227.162.200 with SMTP id w8mr645358wbx.114.1308745232145; Wed, 22 Jun 2011 05:20:32 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id ex2sm401398wbb.14.2011.06.22.05.20.27 (version=SSLv3 cipher=OTHER); Wed, 22 Jun 2011 05:20:30 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org Subject: [PATCH 2/2] mioa701: move gpio-pullup functionality to gpio-vbus Date: Wed, 22 Jun 2011 16:20:17 +0400 Message-Id: <1308745217-10883-2-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1308745217-10883-1-git-send-email-dbaryshkov@gmail.com> References: <1308745217-10883-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110622_082033_637228_0D098F46 X-CRM114-Status: GOOD ( 14.23 ) 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 [74.125.82.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (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 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL Cc: Eric Miao , Robert Jarzmik , Greg Kroah-Hartman , Russell King , 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]); Wed, 22 Jun 2011 12:22:26 +0000 (UTC) gpio-vbus can (and should?) handle D+ pullup gpio for us. Move gpio-pullup handling to gpio-vbus and stop providing udc_info as it's empty now. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/mach-pxa/mioa701.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index bcbd359..e712c9d 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c @@ -402,14 +402,10 @@ static void gsm_exit(void) /* * USB UDC */ -static struct pxa2xx_udc_mach_info mioa701_udc_info = { - .gpio_pullup = GPIO22_USB_ENABLE, -}; - struct gpio_vbus_mach_info gpio_vbus_data = { .gpio_vbus = GPIO13_nUSB_DETECT, .gpio_vbus_inverted = 1, - .gpio_pullup = -1, + .gpio_pullup = GPIO22_USB_ENABLE, }; /* @@ -770,7 +766,6 @@ static void __init mioa701_machine_init(void) pxa_set_fb_info(NULL, &mioa701_pxafb_info); pxa_set_mci_info(&mioa701_mci_info); pxa_set_keypad_info(&mioa701_keypad_info); - pxa_set_udc_info(&mioa701_udc_info); pxa_set_ac97_info(&mioa701_ac97_info); pm_power_off = mioa701_poweroff; arm_pm_restart = mioa701_restart;