From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753260AbbIGACy (ORCPT <rfc822;w@1wt.eu>);
	Sun, 6 Sep 2015 20:02:54 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:40777 "EHLO
	mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752722AbbIGACq (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 6 Sep 2015 20:02:46 -0400
X-AuditID: cbfec7f5-f794b6d000001495-f0-55ecd423a0ee
Subject: Re: [PATCH 4/4] ARM: multi_v7_defconfig: Enable DW USB2 support and
 rockchip phy
To: Sjoerd Simons <sjoerd.simons@collabora.co.uk>,
        linux-rockchip@lists.infradead.org
References: <1441570566-14001-1-git-send-email-sjoerd.simons@collabora.co.uk>
 <1441570566-14001-5-git-send-email-sjoerd.simons@collabora.co.uk>
Cc: linux-arm-kernel@lists.infradead.org, Heiko Stuebner <heiko@sntech.de>,
        Javier Martinez Canillas <javier@osg.samsung.com>,
        Kukjin Kim <kgene@kernel.org>, Thierry Reding <treding@nvidia.com>,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        linux-kernel@vger.kernel.org, Russell King <linux@arm.linux.org.uk>,
        Alexandre Belloni <alexandre.belloni@free-electrons.com>,
        Arnd Bergmann <arnd@arndb.de>, Lee Jones <lee.jones@linaro.org>,
        Olof Johansson <olof@lixom.net>, Ray Jui <rjui@broadcom.com>,
        Stephen Warren <swarren@nvidia.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        Kukjin Kim <kgene@kernel.org>
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Message-id: <55ECD40F.8020001@samsung.com>
Date: Mon, 07 Sep 2015 09:02:23 +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: <1441570566-14001-5-git-send-email-sjoerd.simons@collabora.co.uk>
Content-type: text/plain; charset=windows-1252
Content-transfer-encoding: 7bit
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsVy+t/xK7rKV96EGvRONbPouLaYyeLvpGPs
	FnNnT2K0+P/oNavFm7drmCxevzC06H/8mtni/tejjBabHl9jtbi8aw6bxacH/5ktbl/mtVh7
	5C67xanrn9ksns7czGYx/fhbVosb01tYLW7/5nMQ8mhp7mHz+P1rEqPHrPtn2Tz+Pr/O4vFk
	00VGj4lndT02repk87hzbQ+bx+Yl9R5XTjSxevQ2v2Pz2NJ/l92jb8sqRo/t1+Yxe3zeJBfA
	H8Vlk5Kak1mWWqRvl8CV8ab7A1vBD66KC5/OsDQw9nF2MXJySAiYSBxf+YUJwhaTuHBvPVsX
	IxeHkMBSRonLE9ewQDhfGCVeTjsMViUsEC1x+MpyVhBbRCBc4nrndUaIoomMEq8+3AVzmAU+
	sEgs+vQQrIpNwFhi8/IlbCA2r4CWxKbf/4HGcnCwCKhKXLpWCRIWFYiQOHX2LVSJoMSPyfdY
	QGxOAT+JWzsOMYGUMwvoSdy/qAUSZhaQl9i85i3zBEaBWUg6ZiFUzUJStYCReRWjaGppckFx
	UnqukV5xYm5xaV66XnJ+7iZGSLR+3cG49JjVIUYBDkYlHt4bXW9ChVgTy4orcw8xSnAwK4nw
	mmwBCvGmJFZWpRblxxeV5qQWH2KU5mBREueduet9iJBAemJJanZqakFqEUyWiYNTqoGx2id6
	yepeEe2El7+yJ/oVvOGrvFD36vh1BifxuwzrFtktCnJf7+J+9Z617sPfqlG6N52nfOlUW990
	n+Wl564zx7ZJnl9/0E0pxNB5q+scbrPrCQGrrjzdlsUrsVftoJXpw3aBxBRRidPXfljvXbfu
	q5/gpqkCTW+6dK+JHrM+ZfuKwf2st6GVEktxRqKhFnNRcSIAhYkXKdICAAA=
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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
> 
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> 
> ---
> 
>  arch/arm/configs/multi_v7_defconfig | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index fb673e2..49c733a 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -514,6 +514,7 @@ CONFIG_USB_STORAGE=y
>  CONFIG_USB_DWC3=y
>  CONFIG_USB_CHIPIDEA=y
>  CONFIG_USB_CHIPIDEA_HOST=y
> +CONFIG_USB_DWC2=y

+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?

Best regards,
Krzysztof

>  CONFIG_AB8500_USB=y
>  CONFIG_KEYSTONE_USB_PHY=y
>  CONFIG_OMAP_USB3=y
> @@ -658,6 +659,7 @@ CONFIG_PHY_HIX5HD2_SATA=y
>  CONFIG_PWM_STI=m
>  CONFIG_OMAP_USB2=y
>  CONFIG_TI_PIPE3=y
> +CONFIG_PHY_ROCKCHIP_USB=y
>  CONFIG_PHY_MIPHY28LP=y
>  CONFIG_PHY_MIPHY365X=y
>  CONFIG_PHY_RCAR_GEN2=m
>