2016-11-21 16:59:33

by Axel Haslam

[permalink] [raw]
Subject: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes

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(+)

--
2.9.3


2016-11-21 16:59:35

by Axel Haslam

[permalink] [raw]
Subject: [PATCH 2/2] ARM: dts: da850-lcdk: Enable ohci for omapl138 lcdk

Enable the usb1 controller (ohci) and phy for the lcdk board

Signed-off-by: Axel Haslam <[email protected]>
---
arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts
index 7b8ab21..a739603 100644
--- a/arch/arm/boot/dts/da850-lcdk.dts
+++ b/arch/arm/boot/dts/da850-lcdk.dts
@@ -86,6 +86,14 @@
};
};

+&usb_phy {
+ status = "okay";
+};
+
+&usb1 {
+ status = "okay";
+};
+
&serial2 {
pinctrl-names = "default";
pinctrl-0 = <&serial2_rxtx_pins>;
--
2.9.3

2016-11-21 17:00:05

by Axel Haslam

[permalink] [raw]
Subject: [PATCH 1/2] ARM: dts: da850: Add usb device node

Add the usb1 device node for the da850 soc.
This will allow boards to use the usb1 port
when booting through DT.

Signed-off-by: Axel Haslam <[email protected]>
---
arch/arm/boot/dts/da850.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 1bb1f6d..fbd50d6 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -406,6 +406,14 @@
>;
status = "disabled";
};
+ usb1: usb@225000 {
+ compatible = "ti,da830-ohci";
+ reg = <0x225000 0x1000>;
+ interrupts = <59>;
+ phys = <&usb_phy 1>;
+ phy-names = "usb-phy";
+ status = "disabled";
+ };
gpio: gpio@226000 {
compatible = "ti,dm6441-gpio";
gpio-controller;
--
2.9.3

2016-11-21 17:04:50

by David Lechner

[permalink] [raw]
Subject: Re: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes

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

2016-11-21 17:30:07

by Axel Haslam

[permalink] [raw]
Subject: Re: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes

On Mon, Nov 21, 2016 at 6:04 PM, David Lechner <[email protected]> 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.

2016-11-21 17:45:18

by David Lechner

[permalink] [raw]
Subject: Re: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes

On 11/21/2016 11:29 AM, Axel Haslam wrote:
> On Mon, Nov 21, 2016 at 6:04 PM, David Lechner <[email protected]> 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. ;-)

2016-11-21 18:55:34

by Axel Haslam

[permalink] [raw]
Subject: Re: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes

On Mon, Nov 21, 2016 at 6:45 PM, David Lechner <[email protected]> wrote:
> On 11/21/2016 11:29 AM, Axel Haslam wrote:
>>
>> On Mon, Nov 21, 2016 at 6:04 PM, David Lechner <[email protected]>
>> 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.

2016-11-22 09:35:06

by Sekhar Nori

[permalink] [raw]
Subject: Re: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes

On Monday 21 November 2016 10:29 PM, 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

Looks like atleast this series is not merged (checking today's linux-next).

>
> 2. [PATCH v3 0/2] regulator: handling of error conditions for usb drivers
> https://lkml.org/lkml/2016/11/4/465

Can you let me know once the dependencies are merged so I can pick these.

Thanks,
Sekhar

2016-11-22 09:38:56

by Axel Haslam

[permalink] [raw]
Subject: Re: [PATCH 0/2] ARM: davinvi: da850 add ohci DT nodes

On Tue, Nov 22, 2016 at 10:33 AM, Sekhar Nori <[email protected]> wrote:
> On Monday 21 November 2016 10:29 PM, 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
>
> Looks like atleast this series is not merged (checking today's linux-next).
>
>>
>> 2. [PATCH v3 0/2] regulator: handling of error conditions for usb drivers
>> https://lkml.org/lkml/2016/11/4/465
>
> Can you let me know once the dependencies are merged so I can pick these.

Right, the driver changes are not yet picked up, ill ping once those get in.

Regards
Axel.

>
> Thanks,
> Sekhar