From: k.kozlowski@samsung•com (Krzysztof Kozlowski)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 4/4] ARM: multi_v7_defconfig: Enable DW USB2 support and rockchip phy
Date: Mon, 07 Sep 2015 16:56:42 +0900 [thread overview]
Message-ID: <55ED433A.5000907@samsung.com> (raw)
In-Reply-To: <1447076.WCyUA0P2ql@diego>
On 07.09.2015 16:53, Heiko St?bner wrote:
> Am Montag, 7. September 2015, 16:24:53 schrieb Krzysztof Kozlowski:
>> On 07.09.2015 16:10, Sjoerd Simons wrote:
>>> Hey Krzysztof,
>>>
>>> On Mon, 2015-09-07 at 09:02 +0900, Krzysztof Kozlowski wrote:
>>>> On 07.09.2015 05:16, Sjoerd Simons wrote:
>>>>> The DesignWare HS OTG USB 2.0 is used in various SoC families among
>>>>> wich
>>>>> the various rockchip SoCs, enable the driver and the PHY glue for
>>>>> rockchip
>>>>
>>>> +Cc Marek and Kukjin,
>>>>
>>>> This would conflict with Marek's:
>>>> [PATCH v2] ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB
>>>> ethernet gadget
>>>> http://www.spinics.net/lists/linux-samsung-soc/msg46743.html
>>>>
>>>> Probably your series and Marek's change should go together to the
>>>> same
>>>> tree. How about rebasing your work on top of it?
>>>
>>> Thanks for the pointer! I'm entirely happy to rebase on Mareks patch or
>>> this one dropped for now until Mareks patch lands.
>>>
>>> These patches were based on current linux-next, so i guess Mareks pathc
>>> didn't land just yet? Tbh, i don't really know what tries multi_v7
>>> tends to go through (especially for non-platform specific changes)
>>
>> It was too late for Marek's patch to go for v4.3 merge window, so I
>> applied it but not pushed to my for-next branch. AFAIU, Stephen does not
>> want v4.4 material during merge window because of mangling with statistics.
>>
>>
>> If you want to rebase (or cherry-pick), you can find Marek's patch here:
>> branch: defconfig-for-next
>> repo: git://github.com/krzk/linux.git
>>
>> However this *branch will be rebased on v4.3-rc1* (because this is
>> material for v4.4). After v4.3-rc1 I can prepare a tag for other
>> interested parties.
>>
>>
>> As for multi_v7_defconfig policy, I got impression from the
>> Arnd/Olof/Kevin comments on LKML, that platform specific changes should
>> go through platform tree. However this is multi-platform change so maybe
>> we can push both patches through arm-soc.
>>
>>
>> Arnd, Olof, Kevin (BTW, you missed to CC him),
>>
>> How do you wish to handle this case (USB_DWC2 and two patches: Marek's
>> and Sjoerd's)?
>
> I guess the easiest option would be to just drop the dwc2 from here, only
> keeping the phy enablement and let everything (Marek's and Sjoerd's patch)
> come together in the armsoc defconfig branch? As the rest of both patches don't
> seem to touch common areas, they should be easily mergable from different trees
> as well.
Yes, I agree. The config PHY_ROCKCHIP_USB does not depend on it directly
so this should work fine.
Best regards,
Krzysztof
next prev parent reply other threads:[~2015-09-07 7:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-06 20:16 [PATCH 0/4] ARM: multi_v7_defconfig: Improve rockchip support Sjoerd Simons
2015-09-06 20:16 ` [PATCH 1/4] ARM: multi_v7_defconfig: Enable common Rockchip devices/busses Sjoerd Simons
2015-09-07 9:26 ` Javier Martinez Canillas
2015-09-07 10:24 ` Sjoerd Simons
2015-09-07 10:38 ` Javier Martinez Canillas
2015-09-07 11:27 ` Thierry Reding
2015-09-07 10:55 ` Andy Yan
2015-09-07 11:06 ` Javier Martinez Canillas
2015-09-06 20:16 ` [PATCH 2/4] ARM: multi_v7_defconfig: Enable ACT8865 PMIC driver Sjoerd Simons
2015-09-07 9:30 ` Javier Martinez Canillas
2015-09-07 9:33 ` Heiko Stübner
2015-09-07 10:49 ` Andy Yan
2015-09-07 10:53 ` Heiko Stübner
2015-09-06 20:16 ` [PATCH 3/4] ARM: multi_v7_defconfig: Enable Rockchip display support Sjoerd Simons
2015-09-07 9:31 ` Javier Martinez Canillas
2015-09-06 20:16 ` [PATCH 4/4] ARM: multi_v7_defconfig: Enable DW USB2 support and rockchip phy Sjoerd Simons
2015-09-07 0:02 ` Krzysztof Kozlowski
2015-09-07 7:10 ` Sjoerd Simons
2015-09-07 7:24 ` Krzysztof Kozlowski
2015-09-07 7:53 ` Heiko Stübner
2015-09-07 7:56 ` Krzysztof Kozlowski [this message]
2015-09-07 8:49 ` Sjoerd Simons
2015-09-07 9:33 ` Javier Martinez Canillas
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=55ED433A.5000907@samsung.com \
--to=k.kozlowski@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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