Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754568AbcKUSze (ORCPT ); Mon, 21 Nov 2016 13:55:34 -0500 Received: from mail-qt0-f178.google.com ([209.85.216.178]:33388 "EHLO mail-qt0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753191AbcKUSzc (ORCPT ); Mon, 21 Nov 2016 13:55:32 -0500 MIME-Version: 1.0 In-Reply-To: <4095b7bc-a6dd-144b-4a65-40d86c710087@lechnology.com> References: <20161121165920.29809-1-ahaslam@baylibre.com> <4d414c4d-3d08-f3d9-2bc5-aa90c8a631ce@lechnology.com> <4095b7bc-a6dd-144b-4a65-40d86c710087@lechnology.com> From: Axel Haslam Date: Mon, 21 Nov 2016 19:54:51 +0100 Message-ID: Subject: Re: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes To: David Lechner Cc: Sekhar Nori , Kevin Hilman , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1592 Lines: 52 On Mon, Nov 21, 2016 at 6:45 PM, David Lechner wrote: > On 11/21/2016 11:29 AM, Axel Haslam wrote: >> >> On Mon, Nov 21, 2016 at 6:04 PM, David Lechner >> wrote: >>> >>> On 11/21/2016 10:59 AM, Axel Haslam wrote: >>>> >>>> >>>> This adds the DT node for the ohci controller and >>>> enables it for the omapl138-lckd platform. >>>> >>>> DEPENDENCIES: >>>> >>>> 1. [PATCH v6 0/5] USB: ohci-da8xx: Add device tree support >>>> https://lkml.org/lkml/2016/11/21/558 >>>> >>>> 2. [PATCH v3 0/2] regulator: handling of error conditions for usb >>>> drivers >>>> https://lkml.org/lkml/2016/11/4/465 >>>> >>>> Axel Haslam (2): >>>> ARM: dts: da850: Add usb device node >>>> ARM: dts: da850-lcdk: Enable ohci for omapl138 lcdk >>>> >>>> arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ >>>> arch/arm/boot/dts/da850.dtsi | 8 ++++++++ >>>> 2 files changed, 16 insertions(+) >>>> >>> >>> It does not look like you rebased these patches. Sekhar pushed the musb >>> counterpart to v4.10/dt yesterday, which will cause conflicts with this >>> series. >>> >>> >>> https://git.kernel.org/cgit/linux/kernel/git/nsekhar/linux-davinci.git/log/?h=v4.10/dt >> >> >> Hi David, >> >> i verified that they apply to the current linux-davinci/master. >> Anyways, i can rebase >> and resend once the dependencies are met, and we are ready to merge it. >> >> Regards >> Axel. >> > > OK. I think the first patch is fine, but you will have two &usb_phy { > status = "okay"; }; in da850-lcdk.dts now even if applies cleanly. ;-) mmm, right! ill remove it when i resend.