mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Felipe Balbi <balbi@ti.com>
To: Chris Ruehl <chris.ruehl@gtsys.com.hk>
Cc: <balbi@ti.com>, <gregkh@linuxfoundation.org>,
	<linux-usb@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/3] usb: phy-generic: Add GPIO based ChipSelect
Date: Sun, 8 Dec 2013 22:07:05 -0600	[thread overview]
Message-ID: <20131209040705.GB20608@saruman.home> (raw)
In-Reply-To: <52A520BA.1000603@gtsys.com.hk>

[-- Attachment #1: Type: text/plain, Size: 2303 bytes --]

Hi,

On Mon, Dec 09, 2013 at 09:45:30AM +0800, Chris Ruehl wrote:
> On Saturday, December 07, 2013 04:24 AM, Felipe Balbi wrote:
> >Hi,
> >
> >On Mon, Dec 02, 2013 at 03:05:17PM +0800, Chris Ruehl wrote:
> >>@@ -231,27 +249,40 @@ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
> >>  		return -ENOMEM;
> >>
> >>  	nop->reset_active_low = true;	/* default behaviour */
> >>+	nop->cs_active_low = true;
> >>
> >>  	if (dev->of_node) {
> >>  		struct device_node *node = dev->of_node;
> >>  		enum of_gpio_flags flags;
> >>+		enum of_gpio_flags csflags;
> >>
> >>  		if (of_property_read_u32(node, "clock-frequency",&clk_rate))
> >>  			clk_rate = 0;
> >>
> >>  		needs_vcc = of_property_read_bool(node, "vcc-supply");
> >>+
> >>  		nop->gpio_reset = of_get_named_gpio_flags(node, "reset-gpios",
> >>  								0,&flags);
> >>+
> >
> >two unrelated changes
> >
> >>  		if (nop->gpio_reset == -EPROBE_DEFER)
> >>  			return -EPROBE_DEFER;
> >>
> >>  		nop->reset_active_low = flags&  OF_GPIO_ACTIVE_LOW;
> >>
> >>+		nop->gpio_chipselect = of_get_named_gpio_flags(node, "cs-gpios",
> >>+								0,&csflags);
> >>+		if (gpio_is_valid(nop->gpio_chipselect))
> >>+			nop->cs_active_low = csflags&  OF_GPIO_ACTIVE_LOW;
> >>+
> >>  	} else if (pdata) {
> >>  		type = pdata->type;
> >>  		clk_rate = pdata->clk_rate;
> >>  		needs_vcc = pdata->needs_vcc;
> >>  		nop->gpio_reset = pdata->gpio_reset;
> >>+		nop->gpio_chipselect = pdata->gpio_chipselect;
> >>+	} else {
> >>+		nop->gpio_reset = -1;
> >
> >This line is already going upstream, please remove it, i'll handle the
> >conflict later.
> >
> 
> Beause the rest of the patch set is not ready to make it in the
> upstream, I will checkout latest linux-next and send the patch again
> as a single patch.

no, please *never* base any patches off of linux-next. That tree gets
recreated every day and can never be considered stable. Aim at using a
tag from Linus instead (v3.13-rc3, for example). It's a much better
development point than linux-next.

In case patch doesn't apply cleanly, different maintainers will have
their choice of rebasing it themselves or asking author to rebase on a
specific branch.

By default, however, use a tag from Linus.

cheers

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2013-12-09  4:07 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-02  7:05 [PATCH] usb: phy-generic, phy-ulpi patch set Chris Ruehl
2013-12-02  7:05 ` [PATCH 1/3] usb: phy-generic: Add GPIO based ChipSelect Chris Ruehl
2013-12-06 20:24   ` Felipe Balbi
2013-12-09  1:45     ` Chris Ruehl
2013-12-09  4:07       ` Felipe Balbi [this message]
2013-12-09  4:11         ` Chris Ruehl
2013-12-02  7:05 ` [PATCH 2/3] usb: phy-ulpi: Add EXTVBUSIND,CHRGVBUS flag support Chris Ruehl
2013-12-02 18:59   ` Sergei Shtylyov
2013-12-02  7:05 ` [PATCH 3/3] usb: phy-generic: Add ULPI VBUS support Chris Ruehl
2013-12-02 18:22   ` Mark Rutland
2013-12-03  2:46     ` Chris Ruehl
2013-12-03  5:24     ` Chris Ruehl
2013-12-03  8:15   ` Heikki Krogerus
2013-12-04  7:16     ` Chris Ruehl
2013-12-04  9:49       ` Heikki Krogerus
2013-12-05  4:15         ` Chris Ruehl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131209040705.GB20608@saruman.home \
    --to=balbi@ti.com \
    --cc=chris.ruehl@gtsys.com.hk \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®