From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753740AbbIGHZO (ORCPT ); Mon, 7 Sep 2015 03:25:14 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:58606 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751224AbbIGHZK (ORCPT ); Mon, 7 Sep 2015 03:25:10 -0400 X-AuditID: cbfec7f4-f79c56d0000012ee-03-55ed3bd45dc3 Subject: Re: [PATCH 4/4] ARM: multi_v7_defconfig: Enable DW USB2 support and rockchip phy To: Sjoerd Simons , linux-rockchip@lists.infradead.org, Arnd Bergmann , Olof Johansson , Kevin Hilman References: <1441570566-14001-1-git-send-email-sjoerd.simons@collabora.co.uk> <1441570566-14001-5-git-send-email-sjoerd.simons@collabora.co.uk> <55ECD40F.8020001@samsung.com> <1441609832.8778.4.camel@collabora.co.uk> Cc: linux-arm-kernel@lists.infradead.org, Heiko Stuebner , Javier Martinez Canillas , Kukjin Kim , Thierry Reding , Geert Uytterhoeven , linux-kernel@vger.kernel.org, Russell King , Alexandre Belloni , Lee Jones , Ray Jui , Stephen Warren , Marek Szyprowski From: Krzysztof Kozlowski X-Enigmail-Draft-Status: N1110 Message-id: <55ED3BC5.8050603@samsung.com> Date: Mon, 07 Sep 2015 16:24:53 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-version: 1.0 In-reply-to: <1441609832.8778.4.camel@collabora.co.uk> Content-type: text/plain; charset=utf-8 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrEIsWRmVeSWpSXmKPExsVy+t/xa7pXrN+GGmz+z2XRcW0xk8XfScfY LebOnsRo8f/Ra1aLN2/XMFm8fmFo0f/4NbPF18MrGC3ufz3KaLHp8TVWi8u75rBZfHrwn9ni 9mVei7VH7rJbnLr+mc3i6czNbBbTj79ltbgxvYXV4vZvPgdhj5bmHjaP378mMXrMun+WzePv 8+ssHk82XWT0mHhW12PTqk42jzvX9rB5bF5S73HlRBOrR2/zOzaPLf132T36tqxi9Nh+bR6z x+dNcgH8UVw2Kak5mWWpRfp2CVwZZ35+ZCu4wV+x4upetgbGKzxdjJwcEgImEk33WlggbDGJ C/fWs3UxcnEICSxllDh9axE7hPOFUeL9ul52kCphgWiJw1eWs4IkRAT2MEqcu/6KBaLqDqNE 49+3YP3MAv0sEr9PPGIFaWETMJbYvHwJG8QSOYne7klgC3kFtCTWTepmBLFZBFQl9h37CbZC VCBC4tTZt2wQNYISPybfA6vnFDCTuL+wiamLkQNogbrElCm5IGFmAXmJzWveMk9gFJyFpGMW QtUsJFULGJlXMYqmliYXFCel5xrqFSfmFpfmpesl5+duYoTE9JcdjIuPWR1iFOBgVOLhNeh9 EyrEmlhWXJl7iFGCg1lJhNdkC1CINyWxsiq1KD++qDQntfgQozQHi5I479xd70OEBNITS1Kz U1MLUotgskwcnFINjKuv+115UvOsJ9K66HCeUatPRoWxcNPKoH75K0pbkg3/FVx65uK+y81b N3rC1VWON5rrU90bp6wvFCqPKFZ+tix5/fWq06dj/x2dcefr6n/Ju00+zXd6dXjyRhb3xYvF j74pWJpk28T0X/LOhHWTL899mLk078YDdlOF7U+Ztidxbiz1ulG3c4USS3FGoqEWc1FxIgD3 NioZ5QIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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)? Best regards, Krzysztof