[oe-commits] org.oe.dev tosa_udc_use_gpio_vbus.patch pxa2xx_udc_support_inverse_vbus.patch: fix patch hunk, delete junk.

xjqian commit openembedded-commits at lists.openembedded.org
Sun Dec 9 11:55:13 UTC 2007


tosa_udc_use_gpio_vbus.patch pxa2xx_udc_support_inverse_vbus.patch: fix patch hunk, delete junk.

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: e9723297c42dc2e4470bd4cdc748d71e88ef4148
ViewMTN: http://monotone.openembedded.org/revision/info/e9723297c42dc2e4470bd4cdc748d71e88ef4148
Files:
1
packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch
packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch
Diffs:

#
# mt diff -r40feec3b3de95d57cd906c02ce77e5cdc8d34bc8 -re9723297c42dc2e4470bd4cdc748d71e88ef4148
#
# 
# 
# patch "packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch"
#  from [8cabcadbac22d7913eccbfcc0d92e4e22df5d368]
#    to [243a861ba2189929fbddf28a374ecd70957c0c9d]
# 
# patch "packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch"
#  from [765e90f3b79167c7493c5a9d49c7136a47c7be49]
#    to [88ff48ceba45fa49e3ac7868590f69f7a4dc743c]
# 
============================================================
--- packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch	8cabcadbac22d7913eccbfcc0d92e4e22df5d368
+++ packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch	243a861ba2189929fbddf28a374ecd70957c0c9d
@@ -1,71 +1,3 @@
-From dbaryshkov at gmail.com Fri Dec  7 00:05:32 2007
-Return-Path: <SRS0=7TBh+psr=Q5=lists.arm.linux.org.uk=linux-arm-kernel-bounces+openembedded=haerwu.biz at haerwu.biz>
-X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on 3080.s.tld.pl
-X-Spam-Level: 
-X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_40,SPF_FAIL 
-	autolearn=disabled version=3.1.7
-Delivered-To: haerwu.biz-marcin at haerwu.biz
-Received: (qmail 3062 invoked by uid 813007); 6 Dec 2007 23:44:39 -0000
-Delivered-To: haerwu.biz-openembedded at haerwu.biz
-Received: (qmail 3048 invoked by uid 813007); 6 Dec 2007 23:44:39 -0000
-X-clamdmail: clamdmail 0.18a
-Received: from zeniv.linux.org.uk (195.92.253.2)
-  by smtp.host4.kei.pl with SMTP; 6 Dec 2007 23:44:38 -0000
-Received: from [2002:4e20:1eda:1:201:3dff:fe00:156] (helo=lists.arm.linux.org.uk)
-	by ZenIV.linux.org.uk with esmtpsa (Exim 4.63 #1 (Red Hat Linux))
-	id 1J0Pts-0004dN-KF; Thu, 06 Dec 2007 23:13:03 +0000
-Received: from localhost ([127.0.0.1] helo=lists.arm.linux.org.uk)
-	by lists.arm.linux.org.uk with esmtp (Exim 4.50)
-	id 1J0Pr7-0000cF-OJ; Thu, 06 Dec 2007 23:10:10 +0000
-Received: from mu-out-0910.google.com ([209.85.134.185])
-	by lists.arm.linux.org.uk with esmtp (Exim 4.50) id 1J0Pn3-0000bt-0E
-	for linux-arm-kernel at lists.arm.linux.org.uk;
-	Thu, 06 Dec 2007 23:06:40 +0000
-Received: by mu-out-0910.google.com with SMTP id i2so13552mue
-	for <linux-arm-kernel at lists.arm.linux.org.uk>;
-	Thu, 06 Dec 2007 15:05:40 -0800 (PST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
-	h=domainkey-signature:received:received:date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
-	bh=cfa4MUFsOjAsSKDax5Yk97Hu762FByFSAfUQi5KP2cc=;
-	b=aA5uLmMsFBL6uxIQjxwtR4vD/2zBfGHiN/xepdZSggrNmYu0DJ75Q8JsSqzU/z7Vh9hALIiHjCR3WeqlJqZKCBMSrANzpFN4KVunUajamxn85btZMYysQ3YuZI+DUTYPovoZhuPjmT+SUT7RFpOhwKXbs7z9J8DCgodOVS+YwEY=
-DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
-	h=date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
-	b=oWC1DMK+88t4jXf/5sY2gvSAjKuYypZhUflAHvCNbKYn2iFzpEFoFfjcUgV+lArS06OuT/R4v4Cp87JGK1NLA/uei3fhFZwNsoHcqWkgdsOqp5dSWMZFWCCrO4ODJahoFlnsxoS6OiceJM6EKX8u3RTELEVZEnVl3H2HWM4JJh4=
-Received: by 10.82.107.15 with SMTP id f15mr9802870buc.1196982339522;
-	Thu, 06 Dec 2007 15:05:39 -0800 (PST)
-Received: from doriath.ww600.siemens.net ( [91.122.9.34])
-	by mx.google.com with ESMTPS id 5sm15474nfv.2007.12.06.15.05.37
-	(version=SSLv3 cipher=OTHER); Thu, 06 Dec 2007 15:05:38 -0800 (PST)
-Date: Fri, 7 Dec 2007 02:05:32 +0300
-To: linux-arm-kernel at lists.arm.linux.org.uk
-Message-ID: <20071206230532.GA13332 at doriath.ww600.siemens.net>
-MIME-Version: 1.0
-Content-Type: text/plain;
-  charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.5.17 (2007-11-01)
-From: Dmitry Baryshkov <dbaryshkov at gmail.com>
-Subject: [PATCH 1/2] pxa2xx_udc_support_inverse_vbus.patch
-X-BeenThere: linux-arm-kernel at lists.arm.linux.org.uk
-X-Mailman-Version: 2.1.5
-Precedence: list
-List-Id: ARM Linux kernel discussions <linux-arm-kernel.lists.arm.linux.org.uk>
-List-Unsubscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
-	<mailto:linux-arm-kernel-request at lists.arm.linux.org.uk?subject=unsubscribe>
-List-Archive: <http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel>
-List-Post: <mailto:linux-arm-kernel at lists.arm.linux.org.uk>
-List-Help: <mailto:linux-arm-kernel-request at lists.arm.linux.org.uk?subject=help>
-List-Subscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
-	<mailto:linux-arm-kernel-request at lists.arm.linux.org.uk?subject=subscribe>
-Sender: linux-arm-kernel-bounces at lists.arm.linux.org.uk
-Errors-To: linux-arm-kernel-bounces+openembedded=haerwu.biz+openembedded=haerwu.biz at lists.arm.linux.org.uk
-X-Length: 5827
-Status: R
-X-Status: NC
-X-KMail-EncryptionState:  
-X-KMail-SignatureState:  
-X-KMail-MDN-Sent:  
-
 Some pxa-based boards (like e.g. tosa) have the VBUS-detection gpio pin
 inverted. I.e. it's low when VBUS is connected and high when
 disconnected. Allow specifiing whether gpio_vbus value is inverted.
@@ -113,8 +45,3 @@ Index: linux-test/include/asm-arm/mach/u
  };
  
 
--------------------------------------------------------------------
-List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
-FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
-Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php
-
============================================================
--- packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch	765e90f3b79167c7493c5a9d49c7136a47c7be49
+++ packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch	88ff48ceba45fa49e3ac7868590f69f7a4dc743c
@@ -1,71 +1,3 @@
-From dbaryshkov at gmail.com Fri Dec  7 00:07:07 2007
-Return-Path: <SRS0=x/UTRF0x=Q6=lists.arm.linux.org.uk=linux-arm-kernel-bounces+openembedded=haerwu.biz at haerwu.biz>
-X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on 3073.s.tld.pl
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,SPF_FAIL 
-	autolearn=disabled version=3.1.7
-Delivered-To: haerwu.biz-marcin at haerwu.biz
-Received: (qmail 27813 invoked by uid 813007); 7 Dec 2007 00:02:29 -0000
-Delivered-To: haerwu.biz-openembedded at haerwu.biz
-Received: (qmail 27803 invoked by uid 813007); 7 Dec 2007 00:02:28 -0000
-X-clamdmail: clamdmail 0.18a
-Received: from zeniv.linux.org.uk (195.92.253.2)
-  by smtp.host4.kei.pl with SMTP; 7 Dec 2007 00:02:28 -0000
-Received: from [2002:4e20:1eda:1:201:3dff:fe00:156] (helo=lists.arm.linux.org.uk)
-	by ZenIV.linux.org.uk with esmtpsa (Exim 4.63 #1 (Red Hat Linux))
-	id 1J0Q9g-0005Vf-7a; Thu, 06 Dec 2007 23:29:23 +0000
-Received: from localhost ([127.0.0.1] helo=lists.arm.linux.org.uk)
-	by lists.arm.linux.org.uk with esmtp (Exim 4.50)
-	id 1J0Pvo-0000d6-NY; Thu, 06 Dec 2007 23:15:02 +0000
-Received: from ug-out-1314.google.com ([66.249.92.171])
-	by lists.arm.linux.org.uk with esmtp (Exim 4.50) id 1J0PoR-0000bz-SM
-	for linux-arm-kernel at lists.arm.linux.org.uk;
-	Thu, 06 Dec 2007 23:10:07 +0000
-Received: by ug-out-1314.google.com with SMTP id 29so955850ugc
-	for <linux-arm-kernel at lists.arm.linux.org.uk>;
-	Thu, 06 Dec 2007 15:07:14 -0800 (PST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
-	h=domainkey-signature:received:received:date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
-	bh=kjQKYxTmbZXtFO0UaAnYmPE6Fk1iyXNHPNOw6H2kP6U=;
-	b=vpDrUZqfbWhRrhxvozaHlI9ZC2UwfZvkqIrEeyX5rmqM9rXJTkm1fQQUJvaw43KzvEmxqPXYvpvHQ663HaRRVtN08xB0t2NcDpTm20QUwznzUbze+c4FPTP+86FQbsfhCck86qmrvfBUoDVD1xS2eVR+MxwI63D3rapCtUNpvvo=
-DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
-	h=date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
-	b=D4Cx347bDXn3mf7g77jwn0W3XSXIZh+CiEev1FGhlTeKRZhnM7x1ht4Z+57AiD/dMCrCq8lHqE8Gy0Rv7x7krF2bmUJaiO7HXfxmLWY+msGF2nTymkr1NKsqipQRIVCcEf0ZBKcIrT0dK94QhuP4Ea4Sb/YOfb2YwrJPyNWsISo=
-Received: by 10.78.165.16 with SMTP id n16mr3075565hue.1196982433587;
-	Thu, 06 Dec 2007 15:07:13 -0800 (PST)
-Received: from doriath.ww600.siemens.net ( [91.122.9.34])
-	by mx.google.com with ESMTPS id k5sm5631nfh.2007.12.06.15.07.12
-	(version=SSLv3 cipher=OTHER); Thu, 06 Dec 2007 15:07:12 -0800 (PST)
-Date: Fri, 7 Dec 2007 02:07:07 +0300
-To: linux-arm-kernel at lists.arm.linux.org.uk
-Message-ID: <20071206230707.GA13639 at doriath.ww600.siemens.net>
-MIME-Version: 1.0
-Content-Type: text/plain;
-  charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.5.17 (2007-11-01)
-From: Dmitry Baryshkov <dbaryshkov at gmail.com>
-Subject: [PATCH 2/2] tosa_udc_use_gpio_vbus.patch
-X-BeenThere: linux-arm-kernel at lists.arm.linux.org.uk
-X-Mailman-Version: 2.1.5
-Precedence: list
-List-Id: ARM Linux kernel discussions <linux-arm-kernel.lists.arm.linux.org.uk>
-List-Unsubscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
-	<mailto:linux-arm-kernel-request at lists.arm.linux.org.uk?subject=unsubscribe>
-List-Archive: <http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel>
-List-Post: <mailto:linux-arm-kernel at lists.arm.linux.org.uk>
-List-Help: <mailto:linux-arm-kernel-request at lists.arm.linux.org.uk?subject=help>
-List-Subscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
-	<mailto:linux-arm-kernel-request at lists.arm.linux.org.uk?subject=subscribe>
-Sender: linux-arm-kernel-bounces at lists.arm.linux.org.uk
-Errors-To: linux-arm-kernel-bounces+openembedded=haerwu.biz+openembedded=haerwu.biz at lists.arm.linux.org.uk
-X-Length: 4865
-Status: R
-X-Status: NC
-X-KMail-EncryptionState:  
-X-KMail-SignatureState:  
-X-KMail-MDN-Sent:  
-
 Use gpio_vbus instead of udc_is_connected for udc on tosa.
 
 Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
@@ -74,7 +6,7 @@ Index: linux-test/arch/arm/mach-pxa/tosa
 ===================================================================
 --- linux-test.orig/arch/arm/mach-pxa/tosa.c	2007-12-06 12:43:04.301350179 +0300
 +++ linux-test/arch/arm/mach-pxa/tosa.c	2007-12-06 12:47:50.881381650 +0300
-@@ -165,14 +165,10 @@ static void tosa_udc_command(int cmd)
+@@ -165,15 +165,10 @@ static void tosa_udc_command(int cmd)
  	}
  }
  
@@ -83,6 +15,7 @@ Index: linux-test/arch/arm/mach-pxa/tosa
 -	return ((GPLR(TOSA_GPIO_USB_IN) & GPIO_bit(TOSA_GPIO_USB_IN)) == 0);
 -}
 -
+-
  static struct pxa2xx_udc_mach_info udc_info __initdata = {
  	.udc_command		= tosa_udc_command,
 -	.udc_is_connected	= tosa_udc_is_connected,
@@ -92,8 +25,3 @@ Index: linux-test/arch/arm/mach-pxa/tosa
  
  /*
 
--------------------------------------------------------------------
-List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
-FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
-Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php
-






More information about the Openembedded-commits mailing list