From: Chris Ruehl <chris.ruehl-CR359r9tUDPXPF5Rlphj1Q@public.gmane.org>
To: balbi-l0cyMroinI0@public.gmane.org
Cc: gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH 1/3] usb: phy-generic: Add GPIO based ChipSelect
Date: Mon, 09 Dec 2013 12:11:54 +0800 [thread overview]
Message-ID: <52A5430A.5010308@gtsys.com.hk> (raw)
In-Reply-To: <20131209040705.GB20608-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
On Monday, December 09, 2013 12:07 PM, Felipe Balbi wrote:
> 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
>
Thanks for the advice, I will follow :-)
Chris
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-12-09 4:11 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
[not found] ` <1385967919-13258-1-git-send-email-chris.ruehl-CR359r9tUDPXPF5Rlphj1Q@public.gmane.org>
2013-12-02 7:05 ` [PATCH 1/3] usb: phy-generic: Add GPIO based ChipSelect Chris Ruehl
[not found] ` <1385967919-13258-2-git-send-email-chris.ruehl-CR359r9tUDPXPF5Rlphj1Q@public.gmane.org>
2013-12-06 20:24 ` Felipe Balbi
[not found] ` <20131206202453.GF21086-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-12-09 1:45 ` Chris Ruehl
2013-12-09 4:07 ` Felipe Balbi
[not found] ` <20131209040705.GB20608-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-12-09 4:11 ` Chris Ruehl [this message]
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
[not found] ` <1385967919-13258-4-git-send-email-chris.ruehl-CR359r9tUDPXPF5Rlphj1Q@public.gmane.org>
2013-12-02 18:22 ` Mark Rutland
[not found] ` <20131202182204.GQ12952-NuALmloUBlrZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
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
[not found] ` <529ED6C5.3000608-CR359r9tUDPXPF5Rlphj1Q@public.gmane.org>
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=52A5430A.5010308@gtsys.com.hk \
--to=chris.ruehl-cr359r9tudpxpf5rlphj1q@public.gmane.org \
--cc=balbi-l0cyMroinI0@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.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;
as well as URLs for NNTP newsgroup(s).