Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751141AbaKFQSZ (ORCPT ); Thu, 6 Nov 2014 11:18:25 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:36405 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751115AbaKFQSX (ORCPT ); Thu, 6 Nov 2014 11:18:23 -0500 Message-ID: <545B9F15.5070404@st.com> Date: Thu, 6 Nov 2014 17:17:25 +0100 From: Maxime Coquelin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Lee Jones Cc: Kishon Vijay Abraham I , Gabriel FERNANDEZ , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Srinivas Kandagatla , Patrice Chotard , Russell King , Grant Likely , , , , , Gabriel Fernandez Subject: Re: [PATCH v5 2/8] phy: miphy28lp: Add PHY header file for DT x Driver defines References: <1415098284-11182-1-git-send-email-gabriel.fernandez@linaro.org> <1415098284-11182-3-git-send-email-gabriel.fernandez@linaro.org> <545B1C53.9010406@ti.com> <545B3FA4.8040109@st.com> <20141106112825.GC26543@x1> <545B6144.2020503@st.com> <20141106153659.GD26543@x1> In-Reply-To: <20141106153659.GD26543@x1> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.201.23.80] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.12.52,1.0.28,0.0.0000 definitions=2014-11-06_06:2014-11-06,2014-11-06,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/06/2014 04:36 PM, Lee Jones wrote: > On Thu, 06 Nov 2014, Maxime Coquelin wrote: >> On 11/06/2014 12:28 PM, Lee Jones wrote: >>> On Thu, 06 Nov 2014, Maxime Coquelin wrote: >>> >>>> Hi Kishon, >>>> On 11/06/2014 07:59 AM, Kishon Vijay Abraham I wrote: >>>>> Hi, >>>>> >>>>> On Tuesday 04 November 2014 04:21 PM, Gabriel FERNANDEZ wrote: >>>>>> This provides the shared header file which will be reference from both >>>>>> PHY driver and its associated Device Tree node(s). >>>>>> >>>>>> Signed-off-by: Gabriel Fernandez >>>>>> --- >>>>>> include/dt-bindings/phy/phy.h | 18 ++++++++++++++++++ >>>>> I don't see this being used in device tree file. Are you planning to add this >>>>> after -rc1 is tagged. Or else I have to create a separate branch for this file >>>>> which will be merged by both me and the dt maintainer. Let me know. >>>> I think we don't need to create a branch we will merged by both of us. >>>> >>>> What we can do that both of us apply this patch in our trees. >>>> It will avoid dependencies on each others. >>>> >>>> What do you think? >>> This makes no sense to me. Can you find another way to explain this >>> please? >> I apply the patch on my STi tree. >> Kishon applies the patch on his phy tree. >> >> At the end, both STi and phy branches will be merged in Linus tree, >> with no conflicts. >> >> This is what we are doing for the STiH407 reset DT bindings with Philipp Z. > If you do that, you will almost certainly get conflicts. The commits > have to share the same SHA1 for Git to know for sure that they are the > same patch. One of you needs to create a branch and tag it. The > other can then merge the tag _then_ you won't get conflicts. Just made the test on my side, and I don't get any conflict. In my test, the two SHA-1 were different. >>>>> Thanks >>>>> Kishon >>>>>> 1 file changed, 18 insertions(+) >>>>>> create mode 100644 include/dt-bindings/phy/phy.h >>>>>> >>>>>> diff --git a/include/dt-bindings/phy/phy.h b/include/dt-bindings/phy/phy.h >>>>>> new file mode 100644 >>>>>> index 0000000..e8c6a3f >>>>>> --- /dev/null >>>>>> +++ b/include/dt-bindings/phy/phy.h >>>>>> @@ -0,0 +1,18 @@ >>>>>> +/* >>>>>> + * >>>>>> + * This header provides constants for the phy framework >>>>>> + * >>>>>> + * Copyright (C) 2014 STMicroelectronics >>>>>> + * Author: Gabriel Fernandez >>>>>> + * License terms: GNU General Public License (GPL), version 2 >>>>>> + */ >>>>>> + >>>>>> +#ifndef _DT_BINDINGS_PHY >>>>>> +#define _DT_BINDINGS_PHY >>>>>> + >>>>>> +#define PHY_TYPE_SATA 1 >>>>>> +#define PHY_TYPE_PCIE 2 >>>>>> +#define PHY_TYPE_USB2 3 >>>>>> +#define PHY_TYPE_USB3 4 >>>>>> + >>>>>> +#endif /* _DT_BINDINGS_PHY */ >>>>>> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/