Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933006Ab3DBRVg (ORCPT ); Tue, 2 Apr 2013 13:21:36 -0400 Received: from mho-03-ewr.mailhop.org ([204.13.248.66]:20767 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932975Ab3DBRVd (ORCPT ); Tue, 2 Apr 2013 13:21:33 -0400 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+JW1DFcTsFnHUepacQ0LWQ Date: Tue, 2 Apr 2013 10:21:30 -0700 From: Tony Lindgren To: Felipe Balbi Cc: Roger Quadros , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 01/21] usb: phy: nop: Add some parameters to platform data Message-ID: <20130402172129.GT10155@atomide.com> References: <1363794300-31526-1-git-send-email-rogerq@ti.com> <1363794300-31526-2-git-send-email-rogerq@ti.com> <20130320155555.GG1567@arwen.pp.htv.fi> <20130320161324.GL16413@atomide.com> <20130320161947.GJ1567@arwen.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130320161947.GJ1567@arwen.pp.htv.fi> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1533 Lines: 40 * Felipe Balbi [130320 09:24]: > On Wed, Mar 20, 2013 at 09:13:24AM -0700, Tony Lindgren wrote: > > * Felipe Balbi [130320 09:00]: > > > On Wed, Mar 20, 2013 at 05:44:40PM +0200, Roger Quadros wrote: > > > > Add clk_rate parameter to platform data. If supplied, the > > > > NOP phy driver will program the clock to that rate during probe. > > > > > > > > Also add 2 flags, needs_vcc and needs_reset. > > > > If the flag is set and the regulator couldn't be found > > > > then the driver will bail out with -EPROBE_DEFER. > > > > > > > > Signed-off-by: Roger Quadros > > > > Acked-by: Felipe Balbi > > > > > > Hi Tony, > > > > > > maybe you might prefer to merge commit 1f0972f from my next branch which > > > is exactly this patch. Basically, if you: > > > > > > $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next > > > $ git merge 1f0972f > > > > > > you get $SUBJECT and can apply the others without fear of conflicts > > > later. > > > > OK thanks will use commit 1f0972f, so let's consider that commit immutable. > > yeah, once it hits my 'next' branch, I don't rebase anymore. I've applied the board related patchs into omap-for-v3.10/usb that's based on commit 1f0972f. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/