From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753944AbbIGH46 (ORCPT ); Mon, 7 Sep 2015 03:56:58 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:60024 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753814AbbIGH4w (ORCPT ); Mon, 7 Sep 2015 03:56:52 -0400 MIME-version: 1.0 Content-type: text/plain; charset=windows-1252 X-AuditID: cbfec7f5-f794b6d000001495-0b-55ed434289ad Content-transfer-encoding: 8BIT Subject: Re: [PATCH 4/4] ARM: multi_v7_defconfig: Enable DW USB2 support and rockchip phy To: =?UTF-8?Q?Heiko_St=c3=bcbner?= References: <1441570566-14001-1-git-send-email-sjoerd.simons@collabora.co.uk> <1441609832.8778.4.camel@collabora.co.uk> <55ED3BC5.8050603@samsung.com> <1447076.WCyUA0P2ql@diego> Cc: Sjoerd Simons , linux-rockchip@lists.infradead.org, Arnd Bergmann , Olof Johansson , Kevin Hilman , linux-arm-kernel@lists.infradead.org, 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 Message-id: <55ED433A.5000907@samsung.com> Date: Mon, 07 Sep 2015 16:56:42 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 In-reply-to: <1447076.WCyUA0P2ql@diego> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsVy+t/xq7pOzm9DDU6ekrPouLaYyeLvpGPs FnNnT2K0+P/oNavFm7drmCxevzC06H/8mtni6+EVjBb3vx5ltNj0+BqrxeVdc9gsPj34z2xx +zKvxdojd9ktTl3/zGbxdOZmNovpx9+yWtyY3sJqcfs3n4OwR0tzD5vH71+TGD1m3T/L5vH3 +XUWjyebLjJ6TDyr67FpVSebx51re9g8Ni+p97hyoonVo7f5HZvHlv677B59W1Yxemy/No/Z 4/MmuQD+KC6blNSczLLUIn27BK6MT/evMBU0i1bc+PeHqYHxr0AXIyeHhICJxMxnExkhbDGJ C/fWs3UxcnEICSxllOh9dZMFJMErICjxY/I9IJuDg1lAXuLIpWwIU0/i/kUtiPIvjBJftrxl AykXFoiWOHxlOSuILQI0v7HjCTNE0VZGiR9fT4ItYBZYySrR/ms+WBWbgLHE5uVL2CCWaUl0 /tzMBGKzCKhKzGm8B2aLCkRInDoLsoGDg1NAXWLaf94JjAKzkJw3C+G8WQjnLWBkXsUomlqa XFCclJ5rpFecmFtcmpeul5yfu4kRErNfdzAuPWZ1iFGAg1GJh/dG15tQIdbEsuLK3EOMEhzM SiK8JluAQrwpiZVVqUX58UWlOanFhxilOViUxHln7nofIiSQnliSmp2aWpBaBJNl4uCUamDk +OBXZbBnHsuqqXduG3advviBw6+4XE/L1WQux+Sp/ObcBZyP1F99vTCl+0dkxqxHS4TFToty ijdJLJy0xS20fnJY/mOL9zpR/htnPq3x3ameV/X3os0trtf7WrgPSP+Zyzev71XmvMfe565q Fk3slvvQrOCwviU4vDdcMMeo+UJL/pTM/jQlluKMREMt5qLiRADcZGqo1QIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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