| Message ID | 1393859254-10937-3-git-send-email-rogerq@ti.com |
|---|---|
| State | Accepted |
| Commit | d95faaec4763b94c9eedac9a1f933753015651ed |
| Headers | show |
* Roger Quadros <rogerq@ti.com> [140303 07:10]: > Move omap-control binding information to the right location. > > Signed-off-by: Roger Quadros <rogerq@ti.com> > --- > Documentation/devicetree/bindings/phy/ti-phy.txt | 25 ++++++++++++++++++++++ > Documentation/devicetree/bindings/usb/omap-usb.txt | 24 --------------------- > 2 files changed, 25 insertions(+), 24 deletions(-) > > diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt > index 207e14c..41dc132 100644 > --- a/Documentation/devicetree/bindings/phy/ti-phy.txt > +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt > @@ -1,5 +1,30 @@ > TI PHY: DT DOCUMENTATION FOR PHYs in TI PLATFORMs > > +OMAP CONTROL PHY > + > +Required properties: > + - compatible: Should be one of > + "ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4. > + "ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register > + e.g. USB2_PHY on OMAP5. > + "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control > + e.g. USB3 PHY and SATA PHY on OMAP5. > + "ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on > + DRA7 platform. > + "ti,control-phy-am437usb2" - if it has power down register like USB2 PHY on > + AM437 platform. To me it seems that you can leave out all the above. You can set these falgs flags directly in the driver based on the compatible flag. Then just initialize the .data in the driver based on the compatible flag. > + - reg : Address and length of the register set for the device. It contains > + the address of "otghs_control" for control-phy-otghs or "power" register > + for other types. > + - reg-names: should be "otghs_control" control-phy-otghs and "power" for > + other types. > + > +omap_control_usb: omap-control-usb@4a002300 { > + compatible = "ti,control-phy-otghs"; > + reg = <0x4a00233c 0x4>; > + reg-names = "otghs_control"; > +}; Then you would instead have something like this: compatible = "ti,am347-control-phy-otghs"; That way you can initialize things without a need for custom bindings. Regards, Tony -- 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/
* Roger Quadros <rogerq@ti.com> [140304 01:17]: > Hi Tony, > > On 03/03/2014 09:02 PM, Tony Lindgren wrote: > > * Roger Quadros <rogerq@ti.com> [140303 07:10]: > >> Move omap-control binding information to the right location. > >> > >> Signed-off-by: Roger Quadros <rogerq@ti.com> > >> --- > >> Documentation/devicetree/bindings/phy/ti-phy.txt | 25 ++++++++++++++++++++++ > >> Documentation/devicetree/bindings/usb/omap-usb.txt | 24 --------------------- > >> 2 files changed, 25 insertions(+), 24 deletions(-) > >> > >> diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt > >> index 207e14c..41dc132 100644 > >> --- a/Documentation/devicetree/bindings/phy/ti-phy.txt > >> +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt > >> @@ -1,5 +1,30 @@ > >> TI PHY: DT DOCUMENTATION FOR PHYs in TI PLATFORMs > >> > >> +OMAP CONTROL PHY > >> + > >> +Required properties: > >> + - compatible: Should be one of > >> + "ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4. > >> + "ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register > >> + e.g. USB2_PHY on OMAP5. > >> + "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control > >> + e.g. USB3 PHY and SATA PHY on OMAP5. > >> + "ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on > >> + DRA7 platform. > >> + "ti,control-phy-am437usb2" - if it has power down register like USB2 PHY on > >> + AM437 platform. > > > > To me it seems that you can leave out all the above. You can set these falgs > > flags directly in the driver based on the compatible flag. Then just initialize > > the .data in the driver based on the compatible flag. > > I'm not sure if I got you. A single platform can have different type of phys. > > e.g. OMAP5 has both usb2 and pipe3 PHYs, > DRA7 has both pipe3 and usb2 PHYs, but this usb2 PHY is not compatible with OMAP5 one > so we need a new compatible id for that. > > To add to the woes, the designers were creative enough to make another mutation to > the USB2 PHY for AM437x, :( Oh OK, in that case the compatible flag may not be enough for configuring the various instances. > What do you suggest the compatible ids should look like for these 5 types of PHY control? > OTGHS (OMAP4 & 5) > USB2 (OMAP5) > PIPE3 (OMAP5 & DRA7) > USB2x (DRA7) > USB2y (AM437) I think in that case having the various instances fully configurable from device tree is OK if you prefer that. But if you wanted to use the compatible flag, then you could do something like this: ti,control-phy-omap4-otghs (assuming same on omap4 & 5) ti,control-phy-omap5-usb2 ti,control-phy-omap5-pipe3 (assuming same on omap5 & dra7) ti,control-phy-dra7-usb2x ti,control-phy-am437-usb2y ... Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
+ George Tony, On 03/04/2014 06:28 PM, Tony Lindgren wrote: > * Roger Quadros <rogerq@ti.com> [140304 01:17]: >> Hi Tony, >> >> On 03/03/2014 09:02 PM, Tony Lindgren wrote: >>> * Roger Quadros <rogerq@ti.com> [140303 07:10]: >>>> Move omap-control binding information to the right location. >>>> >>>> Signed-off-by: Roger Quadros <rogerq@ti.com> >>>> --- >>>> Documentation/devicetree/bindings/phy/ti-phy.txt | 25 ++++++++++++++++++++++ >>>> Documentation/devicetree/bindings/usb/omap-usb.txt | 24 --------------------- >>>> 2 files changed, 25 insertions(+), 24 deletions(-) >>>> >>>> diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt >>>> index 207e14c..41dc132 100644 >>>> --- a/Documentation/devicetree/bindings/phy/ti-phy.txt >>>> +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt >>>> @@ -1,5 +1,30 @@ >>>> TI PHY: DT DOCUMENTATION FOR PHYs in TI PLATFORMs >>>> >>>> +OMAP CONTROL PHY >>>> + >>>> +Required properties: >>>> + - compatible: Should be one of >>>> + "ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4. >>>> + "ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register >>>> + e.g. USB2_PHY on OMAP5. >>>> + "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control >>>> + e.g. USB3 PHY and SATA PHY on OMAP5. >>>> + "ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on >>>> + DRA7 platform. >>>> + "ti,control-phy-am437usb2" - if it has power down register like USB2 PHY on >>>> + AM437 platform. >>> >>> To me it seems that you can leave out all the above. You can set these falgs >>> flags directly in the driver based on the compatible flag. Then just initialize >>> the .data in the driver based on the compatible flag. >> >> I'm not sure if I got you. A single platform can have different type of phys. >> >> e.g. OMAP5 has both usb2 and pipe3 PHYs, >> DRA7 has both pipe3 and usb2 PHYs, but this usb2 PHY is not compatible with OMAP5 one >> so we need a new compatible id for that. >> >> To add to the woes, the designers were creative enough to make another mutation to >> the USB2 PHY for AM437x, :( > > Oh OK, in that case the compatible flag may not be enough for configuring the > various instances. > >> What do you suggest the compatible ids should look like for these 5 types of PHY control? >> OTGHS (OMAP4 & 5) >> USB2 (OMAP5) >> PIPE3 (OMAP5 & DRA7) >> USB2x (DRA7) >> USB2y (AM437) > > I think in that case having the various instances fully configurable from > device tree is OK if you prefer that. But if you wanted to use the > compatible flag, then you could do something like this: > > ti,control-phy-omap4-otghs (assuming same on omap4 & 5) > ti,control-phy-omap5-usb2 > ti,control-phy-omap5-pipe3 (assuming same on omap5 & dra7) > ti,control-phy-dra7-usb2x > ti,control-phy-am437-usb2y > ... > Please note that the original bindings were added in v3.13 and I'm just moving the documentation to the right location. So I don't think we should change the bindings now. "ti,control-phy-dra7usb2" and "ti,control-phy-am437usb2" have no users still so we could probably change those to "ti,control-phy-dra7-usb2" and "ti,control-phy-am437-usb2". What do you say? cheers, -roger -- 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/
* Roger Quadros <rogerq@ti.com> [140305 04:26]: > + George > > Tony, > > On 03/04/2014 06:28 PM, Tony Lindgren wrote: > > * Roger Quadros <rogerq@ti.com> [140304 01:17]: > >> Hi Tony, > >> > >> On 03/03/2014 09:02 PM, Tony Lindgren wrote: > >>> * Roger Quadros <rogerq@ti.com> [140303 07:10]: > >>>> Move omap-control binding information to the right location. > >>>> > >>>> Signed-off-by: Roger Quadros <rogerq@ti.com> > >>>> --- > >>>> Documentation/devicetree/bindings/phy/ti-phy.txt | 25 ++++++++++++++++++++++ > >>>> Documentation/devicetree/bindings/usb/omap-usb.txt | 24 --------------------- > >>>> 2 files changed, 25 insertions(+), 24 deletions(-) > >>>> > >>>> diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt > >>>> index 207e14c..41dc132 100644 > >>>> --- a/Documentation/devicetree/bindings/phy/ti-phy.txt > >>>> +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt > >>>> @@ -1,5 +1,30 @@ > >>>> TI PHY: DT DOCUMENTATION FOR PHYs in TI PLATFORMs > >>>> > >>>> +OMAP CONTROL PHY > >>>> + > >>>> +Required properties: > >>>> + - compatible: Should be one of > >>>> + "ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4. > >>>> + "ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register > >>>> + e.g. USB2_PHY on OMAP5. > >>>> + "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control > >>>> + e.g. USB3 PHY and SATA PHY on OMAP5. > >>>> + "ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on > >>>> + DRA7 platform. > >>>> + "ti,control-phy-am437usb2" - if it has power down register like USB2 PHY on > >>>> + AM437 platform. > >>> > >>> To me it seems that you can leave out all the above. You can set these falgs > >>> flags directly in the driver based on the compatible flag. Then just initialize > >>> the .data in the driver based on the compatible flag. > >> > >> I'm not sure if I got you. A single platform can have different type of phys. > >> > >> e.g. OMAP5 has both usb2 and pipe3 PHYs, > >> DRA7 has both pipe3 and usb2 PHYs, but this usb2 PHY is not compatible with OMAP5 one > >> so we need a new compatible id for that. > >> > >> To add to the woes, the designers were creative enough to make another mutation to > >> the USB2 PHY for AM437x, :( > > > > Oh OK, in that case the compatible flag may not be enough for configuring the > > various instances. > > > >> What do you suggest the compatible ids should look like for these 5 types of PHY control? > >> OTGHS (OMAP4 & 5) > >> USB2 (OMAP5) > >> PIPE3 (OMAP5 & DRA7) > >> USB2x (DRA7) > >> USB2y (AM437) > > > > I think in that case having the various instances fully configurable from > > device tree is OK if you prefer that. But if you wanted to use the > > compatible flag, then you could do something like this: > > > > ti,control-phy-omap4-otghs (assuming same on omap4 & 5) > > ti,control-phy-omap5-usb2 > > ti,control-phy-omap5-pipe3 (assuming same on omap5 & dra7) > > ti,control-phy-dra7-usb2x > > ti,control-phy-am437-usb2y > > ... > > > > Please note that the original bindings were added in v3.13 and I'm just moving the documentation > to the right location. So I don't think we should change the bindings now. OK yeah if the bindings are established you should keep them around. > "ti,control-phy-dra7usb2" and "ti,control-phy-am437usb2" have no users still so we could probably > change those to "ti,control-phy-dra7-usb2" and "ti,control-phy-am437-usb2". > > What do you say? Makes sense to me. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt index 207e14c..41dc132 100644 --- a/Documentation/devicetree/bindings/phy/ti-phy.txt +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt @@ -1,5 +1,30 @@ TI PHY: DT DOCUMENTATION FOR PHYs in TI PLATFORMs +OMAP CONTROL PHY + +Required properties: + - compatible: Should be one of + "ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4. + "ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register + e.g. USB2_PHY on OMAP5. + "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control + e.g. USB3 PHY and SATA PHY on OMAP5. + "ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on + DRA7 platform. + "ti,control-phy-am437usb2" - if it has power down register like USB2 PHY on + AM437 platform. + - reg : Address and length of the register set for the device. It contains + the address of "otghs_control" for control-phy-otghs or "power" register + for other types. + - reg-names: should be "otghs_control" control-phy-otghs and "power" for + other types. + +omap_control_usb: omap-control-usb@4a002300 { + compatible = "ti,control-phy-otghs"; + reg = <0x4a00233c 0x4>; + reg-names = "otghs_control"; +}; + OMAP USB2 PHY Required properties: diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt index c495135..38b2fae 100644 --- a/Documentation/devicetree/bindings/usb/omap-usb.txt +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt @@ -76,27 +76,3 @@ omap_dwc3 { ranges; }; -OMAP CONTROL USB - -Required properties: - - compatible: Should be one of - "ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4. - "ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register - e.g. USB2_PHY on OMAP5. - "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control - e.g. USB3 PHY and SATA PHY on OMAP5. - "ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on - DRA7 platform. - "ti,control-phy-am437usb2" - if it has power down register like USB2 PHY on - AM437 platform. - - reg : Address and length of the register set for the device. It contains - the address of "otghs_control" for control-phy-otghs or "power" register - for other types. - - reg-names: should be "otghs_control" control-phy-otghs and "power" for - other types. - -omap_control_usb: omap-control-usb@4a002300 { - compatible = "ti,control-phy-otghs"; - reg = <0x4a00233c 0x4>; - reg-names = "otghs_control"; -};
Move omap-control binding information to the right location. Signed-off-by: Roger Quadros <rogerq@ti.com> --- Documentation/devicetree/bindings/phy/ti-phy.txt | 25 ++++++++++++++++++++++ Documentation/devicetree/bindings/usb/omap-usb.txt | 24 --------------------- 2 files changed, 25 insertions(+), 24 deletions(-)