From patchwork Tue Aug 18 22:23:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 31604 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id D6EB9B7BB2 for ; Wed, 19 Aug 2009 08:23:57 +1000 (EST) Received: by ozlabs.org (Postfix) id C59BCDDD1B; Wed, 19 Aug 2009 08:23:57 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (bilbo.ozlabs.org [203.10.76.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "bilbo.ozlabs.org", Issuer "CAcert Class 3 Root" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id C12D0DDD04 for ; Wed, 19 Aug 2009 08:23:57 +1000 (EST) Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by bilbo.ozlabs.org (Postfix) with ESMTP id F1085B7E9A for ; Wed, 19 Aug 2009 08:23:43 +1000 (EST) Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 46CC9B7B60 for ; Wed, 19 Aug 2009 08:23:37 +1000 (EST) Received: by ozlabs.org (Postfix) id 3642BDDD1B; Wed, 19 Aug 2009 08:23:37 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from buildserver.ru.mvista.com (unknown [213.79.90.228]) by ozlabs.org (Postfix) with ESMTP id CDEB9DDD01 for ; Wed, 19 Aug 2009 08:23:36 +1000 (EST) Received: from localhost (unknown [10.150.0.9]) by buildserver.ru.mvista.com (Postfix) with ESMTP id 487D28814; Wed, 19 Aug 2009 03:23:35 +0500 (SAMST) Date: Wed, 19 Aug 2009 02:23:35 +0400 From: Anton Vorontsov To: Greg Kroah-Hartman , David Brownell Subject: [PATCH] USB: fsl_qe_udc: Add fsl,mpc8323-qe-usb compatible entry Message-ID: <20090818222335.GA28135@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Scott Wood , linuxppc-dev@ozlabs.org, linux-usb@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Current bindings specify that "fsl,mpc8323-qe-usb" compatible entry should be used as a base match for QE UDCs, so update the driver to comply with the bindings. Signed-off-by: Anton Vorontsov Acked-by: Li Yang --- On Thu, Apr 02, 2009 at 02:17:11PM -0500, Scott Wood wrote: > Anton Vorontsov wrote: > >On Thu, Apr 02, 2009 at 01:42:37PM -0500, Timur Tabi wrote: > >>Anton Vorontsov wrote: > >> > >>>Oh, I was wrong. fsl_qe_udc driver uses mpc8360 compatible for > >>>matching, so you can't remove it. :-/ > >>Ugh, that's a bug in the driver then. > > > >Yes, but that depends on what chip was the first one? MPC8323 or > >MPC8360? > > Actually, it depends on which one we picked in the devtree binding > (assuming they're compatible both ways), which appears to be > mpc8323. A bit delayed, but here is a patch to fix the issue. drivers/usb/gadget/fsl_qe_udc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c index d701bf4..7881f12 100644 --- a/drivers/usb/gadget/fsl_qe_udc.c +++ b/drivers/usb/gadget/fsl_qe_udc.c @@ -2751,6 +2751,10 @@ static int __devexit qe_udc_remove(struct of_device *ofdev) /*-------------------------------------------------------------------------*/ static struct of_device_id __devinitdata qe_udc_match[] = { { + .compatible = "fsl,mpc8323-qe-usb", + .data = (void *)PORT_QE, + }, + { .compatible = "fsl,mpc8360-qe-usb", .data = (void *)PORT_QE, },