| Message ID | 1478188752-22447-5-git-send-email-abailon@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/03/2016 10:59 AM, Alexandre Bailon wrote: > This adds the device tree node for the usb otg > controller present in the da850 family of SoC's. > This also enables the otg usb controller for the lcdk board. > > Signed-off-by: Alexandre Bailon <abailon@baylibre.com> > --- > arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ > arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts > index 7b8ab21..9f5040c 100644 > --- a/arch/arm/boot/dts/da850-lcdk.dts > +++ b/arch/arm/boot/dts/da850-lcdk.dts > @@ -158,6 +158,14 @@ > rx-num-evt = <32>; > }; > > +&usb_phy { > + status = "okay"; > + }; > + > +&usb0 { > + status = "okay"; > +}; > + > &aemif { > pinctrl-names = "default"; > pinctrl-0 = <&nand_pins>; > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index f79e1b9..322a31a 100644 > --- a/arch/arm/boot/dts/da850.dtsi > +++ b/arch/arm/boot/dts/da850.dtsi > @@ -372,6 +372,21 @@ > >; > status = "disabled"; > }; > + usb_phy: usb-phy { > + compatible = "ti,da830-usb-phy"; > + #phy-cells = <1>; > + status = "disabled"; > + }; The usb_phy node is already in the device tree as a child of the cfgchip syscon node[1]. It needs to be removed from this patch, otherwise we will end up with duplicate usb_phy nodes. [1]: https://git.kernel.org/cgit/linux/kernel/git/nsekhar/linux-davinci.git/commit/?h=v4.10/dt&id=1b499f255589204466d8f8ab26e6b577d7b5c88f > + usb0: usb@200000 { > + compatible = "ti,da830-musb"; > + reg = <0x200000 0x10000>; > + interrupts = <58>; > + interrupt-names = "mc"; > + dr_mode = "otg"; Isn't this the default value? Could we omit the dr_mode property here? > + phys = <&usb_phy 0>; > + phy-names = "usb-phy"; > + status = "disabled"; > + }; > gpio: gpio@226000 { > compatible = "ti,dm6441-gpio"; > gpio-controller; >
On Thursday 03 November 2016 09:29 PM, Alexandre Bailon wrote: > This adds the device tree node for the usb otg > controller present in the da850 family of SoC's. > This also enables the otg usb controller for the lcdk board. > > Signed-off-by: Alexandre Bailon <abailon@baylibre.com> > --- > arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ > arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts > index 7b8ab21..9f5040c 100644 > --- a/arch/arm/boot/dts/da850-lcdk.dts > +++ b/arch/arm/boot/dts/da850-lcdk.dts > @@ -158,6 +158,14 @@ > rx-num-evt = <32>; > }; > > +&usb_phy { > + status = "okay"; > + }; As mentioned by David already, this node needs to be removed. Please rebase this on top of latest linux-davinci/master when ready for merging (driver changes accepted). > + > +&usb0 { > + status = "okay"; > +}; > + > &aemif { > pinctrl-names = "default"; > pinctrl-0 = <&nand_pins>; > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index f79e1b9..322a31a 100644 > --- a/arch/arm/boot/dts/da850.dtsi > +++ b/arch/arm/boot/dts/da850.dtsi > @@ -372,6 +372,21 @@ > >; > status = "disabled"; > }; > + usb_phy: usb-phy { > + compatible = "ti,da830-usb-phy"; > + #phy-cells = <1>; > + status = "disabled"; > + }; > + usb0: usb@200000 { > + compatible = "ti,da830-musb"; > + reg = <0x200000 0x10000>; > + interrupts = <58>; > + interrupt-names = "mc"; > + dr_mode = "otg"; > + phys = <&usb_phy 0>; > + phy-names = "usb-phy"; > + status = "disabled"; > + }; Can you separate out the soc specific changes from board changes? Please place the usb0 node above the mdio node. I am trying to get to a rough ordering based on reg property. Thanks, Sekhar
On Friday 04 November 2016 09:10 AM, David Lechner wrote: > >> + usb0: usb@200000 { >> + compatible = "ti,da830-musb"; >> + reg = <0x200000 0x10000>; >> + interrupts = <58>; >> + interrupt-names = "mc"; >> + dr_mode = "otg"; > > Isn't this the default value? Could we omit the dr_mode property here? dr_mode is set to otg in quite a few dts files already. Even if its the default, I think it makes it easy to recognize the mode immediately. Thanks, Sekhar
On Tue, Nov 15, 2016 at 04:16:02PM +0530, Sekhar Nori wrote: > On Thursday 03 November 2016 09:29 PM, Alexandre Bailon wrote: > > This adds the device tree node for the usb otg > > controller present in the da850 family of SoC's. > > This also enables the otg usb controller for the lcdk board. > > > > Signed-off-by: Alexandre Bailon <abailon@baylibre.com> > > --- > > arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ > > arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ > > 2 files changed, 23 insertions(+) > > > > diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts > > index 7b8ab21..9f5040c 100644 > > --- a/arch/arm/boot/dts/da850-lcdk.dts > > +++ b/arch/arm/boot/dts/da850-lcdk.dts > > @@ -158,6 +158,14 @@ > > rx-num-evt = <32>; > > }; > > > > +&usb_phy { > > + status = "okay"; > > + }; > > As mentioned by David already, this node needs to be removed. Please > rebase this on top of latest linux-davinci/master when ready for merging > (driver changes accepted). Dropped this patch due to this comment. Regards, -Bin. > > > + > > +&usb0 { > > + status = "okay"; > > +}; > > + > > &aemif { > > pinctrl-names = "default"; > > pinctrl-0 = <&nand_pins>; > > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > > index f79e1b9..322a31a 100644 > > --- a/arch/arm/boot/dts/da850.dtsi > > +++ b/arch/arm/boot/dts/da850.dtsi > > @@ -372,6 +372,21 @@ > > >; > > status = "disabled"; > > }; > > + usb_phy: usb-phy { > > + compatible = "ti,da830-usb-phy"; > > + #phy-cells = <1>; > > + status = "disabled"; > > + }; > > + usb0: usb@200000 { > > + compatible = "ti,da830-musb"; > > + reg = <0x200000 0x10000>; > > + interrupts = <58>; > > + interrupt-names = "mc"; > > + dr_mode = "otg"; > > + phys = <&usb_phy 0>; > > + phy-names = "usb-phy"; > > + status = "disabled"; > > + }; > > Can you separate out the soc specific changes from board changes? Please > place the usb0 node above the mdio node. I am trying to get to a rough > ordering based on reg property. > > Thanks, > Sekhar >
On Wednesday 16 November 2016 02:49 AM, Bin Liu wrote: > On Tue, Nov 15, 2016 at 04:16:02PM +0530, Sekhar Nori wrote: >> On Thursday 03 November 2016 09:29 PM, Alexandre Bailon wrote: >>> This adds the device tree node for the usb otg >>> controller present in the da850 family of SoC's. >>> This also enables the otg usb controller for the lcdk board. >>> >>> Signed-off-by: Alexandre Bailon <abailon@baylibre.com> >>> --- >>> arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ >>> arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ >>> 2 files changed, 23 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts >>> index 7b8ab21..9f5040c 100644 >>> --- a/arch/arm/boot/dts/da850-lcdk.dts >>> +++ b/arch/arm/boot/dts/da850-lcdk.dts >>> @@ -158,6 +158,14 @@ >>> rx-num-evt = <32>; >>> }; >>> >>> +&usb_phy { >>> + status = "okay"; >>> + }; >> >> As mentioned by David already, this node needs to be removed. Please >> rebase this on top of latest linux-davinci/master when ready for merging >> (driver changes accepted). > > Dropped this patch due to this comment. Bin, Please do not apply dts or arch/arm/mach-davinci patches. I have a bunch queued through my tree and more in pipeline and it will cause unnecessary merge conflicts in linux-next or at Linus. For future, I have asked Alexandre to send driver and dts patches as separate series so there is no confusion on who should apply. Thanks, Sekhar
On 11/15/2016 11:46 AM, Sekhar Nori wrote: > On Thursday 03 November 2016 09:29 PM, Alexandre Bailon wrote: >> This adds the device tree node for the usb otg >> controller present in the da850 family of SoC's. >> This also enables the otg usb controller for the lcdk board. >> >> Signed-off-by: Alexandre Bailon <abailon@baylibre.com> >> --- >> arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ >> arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ >> 2 files changed, 23 insertions(+) >> >> diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts >> index 7b8ab21..9f5040c 100644 >> --- a/arch/arm/boot/dts/da850-lcdk.dts >> +++ b/arch/arm/boot/dts/da850-lcdk.dts >> @@ -158,6 +158,14 @@ >> rx-num-evt = <32>; >> }; >> >> +&usb_phy { >> + status = "okay"; >> + }; > > As mentioned by David already, this node needs to be removed. Please I have missed it. But why should I remove it? Without it, usb otg won't work. > rebase this on top of latest linux-davinci/master when ready for merging > (driver changes accepted). > >> + >> +&usb0 { >> + status = "okay"; >> +}; >> + >> &aemif { >> pinctrl-names = "default"; >> pinctrl-0 = <&nand_pins>; >> diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi >> index f79e1b9..322a31a 100644 >> --- a/arch/arm/boot/dts/da850.dtsi >> +++ b/arch/arm/boot/dts/da850.dtsi >> @@ -372,6 +372,21 @@ >> >; >> status = "disabled"; >> }; >> + usb_phy: usb-phy { >> + compatible = "ti,da830-usb-phy"; >> + #phy-cells = <1>; >> + status = "disabled"; >> + }; >> + usb0: usb@200000 { >> + compatible = "ti,da830-musb"; >> + reg = <0x200000 0x10000>; >> + interrupts = <58>; >> + interrupt-names = "mc"; >> + dr_mode = "otg"; >> + phys = <&usb_phy 0>; >> + phy-names = "usb-phy"; >> + status = "disabled"; >> + }; > > Can you separate out the soc specific changes from board changes? Please > place the usb0 node above the mdio node. I am trying to get to a rough > ordering based on reg property. I will do. > > Thanks, > Sekhar > Thanks, Alexandre
On Wednesday 16 November 2016 04:05 PM, Alexandre Bailon wrote: > On 11/15/2016 11:46 AM, Sekhar Nori wrote: >> On Thursday 03 November 2016 09:29 PM, Alexandre Bailon wrote: >>> This adds the device tree node for the usb otg >>> controller present in the da850 family of SoC's. >>> This also enables the otg usb controller for the lcdk board. >>> >>> Signed-off-by: Alexandre Bailon <abailon@baylibre.com> >>> --- >>> arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ >>> arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ >>> 2 files changed, 23 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts >>> index 7b8ab21..9f5040c 100644 >>> --- a/arch/arm/boot/dts/da850-lcdk.dts >>> +++ b/arch/arm/boot/dts/da850-lcdk.dts >>> @@ -158,6 +158,14 @@ >>> rx-num-evt = <32>; >>> }; >>> >>> +&usb_phy { >>> + status = "okay"; >>> + }; >> >> As mentioned by David already, this node needs to be removed. Please > I have missed it. But why should I remove it? > Without it, usb otg won't work. Grr, I replied to the wrong hunk. The part in da850-lcdk.dts needs to be preserved (but please fix the indentation on the closing brace). The part in da850.dtsi needs to be removed as it is already merged. Thanks, Sekhar
On 11/16/2016 11:41 AM, Sekhar Nori wrote: > On Wednesday 16 November 2016 04:05 PM, Alexandre Bailon wrote: >> On 11/15/2016 11:46 AM, Sekhar Nori wrote: >>> On Thursday 03 November 2016 09:29 PM, Alexandre Bailon wrote: >>>> This adds the device tree node for the usb otg >>>> controller present in the da850 family of SoC's. >>>> This also enables the otg usb controller for the lcdk board. >>>> >>>> Signed-off-by: Alexandre Bailon <abailon@baylibre.com> >>>> --- >>>> arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ >>>> arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ >>>> 2 files changed, 23 insertions(+) >>>> >>>> diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts >>>> index 7b8ab21..9f5040c 100644 >>>> --- a/arch/arm/boot/dts/da850-lcdk.dts >>>> +++ b/arch/arm/boot/dts/da850-lcdk.dts >>>> @@ -158,6 +158,14 @@ >>>> rx-num-evt = <32>; >>>> }; >>>> >>>> +&usb_phy { >>>> + status = "okay"; >>>> + }; >>> >>> As mentioned by David already, this node needs to be removed. Please > >> I have missed it. But why should I remove it? >> Without it, usb otg won't work. > > Grr, I replied to the wrong hunk. The part in da850-lcdk.dts needs to be > preserved (but please fix the indentation on the closing brace). OK. Thanks for the confirmation. > > The part in da850.dtsi needs to be removed as it is already merged. > > Thanks, > Sekhar >
On Wed, Nov 16, 2016 at 12:06:51PM +0530, Sekhar Nori wrote: > On Wednesday 16 November 2016 02:49 AM, Bin Liu wrote: > > On Tue, Nov 15, 2016 at 04:16:02PM +0530, Sekhar Nori wrote: > >> On Thursday 03 November 2016 09:29 PM, Alexandre Bailon wrote: > >>> This adds the device tree node for the usb otg > >>> controller present in the da850 family of SoC's. > >>> This also enables the otg usb controller for the lcdk board. > >>> > >>> Signed-off-by: Alexandre Bailon <abailon@baylibre.com> > >>> --- > >>> arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ > >>> arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ > >>> 2 files changed, 23 insertions(+) > >>> > >>> diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts > >>> index 7b8ab21..9f5040c 100644 > >>> --- a/arch/arm/boot/dts/da850-lcdk.dts > >>> +++ b/arch/arm/boot/dts/da850-lcdk.dts > >>> @@ -158,6 +158,14 @@ > >>> rx-num-evt = <32>; > >>> }; > >>> > >>> +&usb_phy { > >>> + status = "okay"; > >>> + }; > >> > >> As mentioned by David already, this node needs to be removed. Please > >> rebase this on top of latest linux-davinci/master when ready for merging > >> (driver changes accepted). > > > > Dropped this patch due to this comment. > > Bin, Please do not apply dts or arch/arm/mach-davinci patches. I have a > bunch queued through my tree and more in pipeline and it will cause > unnecessary merge conflicts in linux-next or at Linus. Sure, I will drop this whole set, and only apply the musb patches in the new v5. > > For future, I have asked Alexandre to send driver and dts patches as > separate series so there is no confusion on who should apply. I will keep in mind to ping other domain maintainers before applying non-musb patches in future. > > Thanks, > Sekhar Regards, -Bin.
diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts index 7b8ab21..9f5040c 100644 --- a/arch/arm/boot/dts/da850-lcdk.dts +++ b/arch/arm/boot/dts/da850-lcdk.dts @@ -158,6 +158,14 @@ rx-num-evt = <32>; }; +&usb_phy { + status = "okay"; + }; + +&usb0 { + status = "okay"; +}; + &aemif { pinctrl-names = "default"; pinctrl-0 = <&nand_pins>; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index f79e1b9..322a31a 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -372,6 +372,21 @@ >; status = "disabled"; }; + usb_phy: usb-phy { + compatible = "ti,da830-usb-phy"; + #phy-cells = <1>; + status = "disabled"; + }; + usb0: usb@200000 { + compatible = "ti,da830-musb"; + reg = <0x200000 0x10000>; + interrupts = <58>; + interrupt-names = "mc"; + dr_mode = "otg"; + phys = <&usb_phy 0>; + phy-names = "usb-phy"; + status = "disabled"; + }; gpio: gpio@226000 { compatible = "ti,dm6441-gpio"; gpio-controller;
This adds the device tree node for the usb otg controller present in the da850 family of SoC's. This also enables the otg usb controller for the lcdk board. Signed-off-by: Alexandre Bailon <abailon@baylibre.com> --- arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ arch/arm/boot/dts/da850.dtsi | 15 +++++++++++++++ 2 files changed, 23 insertions(+)