From: kishon@ti•com (Kishon Vijay Abraham I)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v4 6/7] ARM: mvebu: add PHY support to the dts for the USB controllers on Armada 375
Date: Wed, 26 Nov 2014 10:43:08 +0530 [thread overview]
Message-ID: <54756164.3070206@ti.com> (raw)
In-Reply-To: <20141126035929.GJ22670@titan.lakedaemon.net>
Hi,
On Wednesday 26 November 2014 09:29 AM, Jason Cooper wrote:
> On Sat, Nov 22, 2014 at 10:20:43AM +0100, Gregory CLEMENT wrote:
>> Hi Jason,
>>
>> On 22/11/2014 03:08, Jason Cooper wrote:
>>> On Thu, Nov 13, 2014 at 12:47:48PM +0100, Gregory CLEMENT wrote:
>>>> Now that the USB cluster node has been added, use it as a PHY provider
>>>> for the USB controller linked to it: the first EHCI and the xHCI.
>>>>
>>>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons•com>
Looks like I'm not cc'ed in v4 of this patch series :-(
-Kishon
>>>> ---
>>>> arch/arm/boot/dts/armada-375.dtsi | 5 +++++
>>>> 1 file changed, 5 insertions(+)
>>>>
>>>> diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
>>>> index 8f45cf5d2a50..f344ec420c95 100644
>>>> --- a/arch/arm/boot/dts/armada-375.dtsi
>>>> +++ b/arch/arm/boot/dts/armada-375.dtsi
>>>> @@ -14,6 +14,7 @@
>>>> #include "skeleton.dtsi"
>>>> #include <dt-bindings/interrupt-controller/arm-gic.h>
>>>> #include <dt-bindings/interrupt-controller/irq.h>
>>>> +#include <dt-bindings/phy/phy.h>
>>>
>>> Odd. The previous patch in this series simply adds a line to phy.h,
>>> however, I get the following error during 'make dtbs':
>>>
>>> ########
>>> DTC arch/arm/boot/dts/armada-375-db.dtb
>>> In file included from arch/arm/boot/dts/armada-375-db.dts:17:0:arch/arm/boot/dts/armada-375.dtsi:17:33:
>>> fatal error: dt-bindings/phy/phy.h: No such file or directory
>>> #include <dt-bindings/phy/phy.h>
>>> ^
>>> compilation terminated.
>>> scripts/Makefile.lib:282: recipe for target 'arch/arm/boot/dts/armada-37 5-db.dtb' failed
>>> ########
>>>
>>> mvebu/dt is based on v3.18-rc1. Is there a missing dependency
>>> somewhere? Perhaps we should let Kishon take the whole series and
>>> handle the (hopefully trivial) merge conflict?
>>
>> Actually Kishon asked me to use the dt-bindings/phy/phy.h file which
>> was introduced by the patch "phy: Add PHY header file for DT x Driver
>> defines". So indeed I had to have a dependency on the phy_dt_header
>> branch (which is based on v3.18-rc4 and have only this single commit).
>> The git tree is located at
>> git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git
>>
>>
>> Maybe we could add this branch in mvebu as a dependency as it is done
>> on arm-soc. I suggest this because I would prefer that we continue to
>> be the only ones to merge the device tree files in order to reduce the
>> merge conflict.
>
> Ok, I've applied patches 5 and 6 to mvebu/dt-usb_phy with a dependency
> on tags/phy-dt-header.
>
> Patches 1-4:
>
> Acked-by: Jason Cooper <jason@lakedaemon•net>
>
> thx,
>
> Jason.
>
next prev parent reply other threads:[~2014-11-26 5:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 11:47 [PATCH v4 0/7] Add support for USB cluster(PHY muxer) on the Armada 375 Gregory CLEMENT
2014-11-13 11:47 ` [PATCH v4 1/7] phy: Use PTR_ERR_OR_ZERO to fix warning raised by coccinelle Gregory CLEMENT
2014-11-13 11:47 ` [PATCH v4 2/7] Phy: DT binding documentation for Marvell MVEBU SATA phy Gregory CLEMENT
2014-11-13 11:47 ` [PATCH v4 3/7] Phy: DT binding documentation for the Armada 375 USB cluster binding Gregory CLEMENT
2014-11-13 11:47 ` [PATCH v4 4/7] phy: add support for USB cluster on the Armada 375 SoC Gregory CLEMENT
2014-11-13 13:06 ` Thomas Petazzoni
2014-11-13 11:47 ` [PATCH v4 5/7] ARM: mvebu: add Device Tree description of USB cluster controller on Armada 375 Gregory CLEMENT
2014-11-13 11:47 ` [PATCH v4 6/7] ARM: mvebu: add PHY support to the dts for the USB controllers " Gregory CLEMENT
2014-11-22 2:08 ` Jason Cooper
2014-11-22 9:20 ` Gregory CLEMENT
2014-11-24 5:51 ` Kishon Vijay Abraham I
2014-11-26 3:59 ` Jason Cooper
2014-11-26 5:13 ` Kishon Vijay Abraham I [this message]
2014-11-26 5:17 ` Jason Cooper
2014-11-26 5:23 ` Kishon Vijay Abraham I
2014-11-13 11:47 ` [PATCH v4 7/7] MAINTAINERS: add entry for the Armada 375 USB cluster PHY driver Gregory CLEMENT
2014-11-26 3:53 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54756164.3070206@ti.com \
--to=kishon@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox