| Message ID | 1438701646-7876-7-git-send-email-kishon@ti.com |
|---|---|
| State | Under Review, archived |
| Headers | show |
On 04/08/15 18:20, Kishon Vijay Abraham I wrote: > The USB2 PHY2 has a different register map compared to USB2 PHY1 > to power on/off the PHY. In order to handle it, add a new > "compatible" string. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > Documentation/devicetree/bindings/phy/ti-phy.txt | 2 ++ > drivers/phy/phy-omap-usb2.c | 9 +++++++++ > 2 files changed, 11 insertions(+) > > diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt > index 49e5b0c..a061077 100644 > --- a/Documentation/devicetree/bindings/phy/ti-phy.txt > +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt > @@ -31,6 +31,8 @@ OMAP USB2 PHY > > Required properties: > - compatible: Should be "ti,omap-usb2" > + Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY > + in DRA7x > - reg : Address and length of the register set for the device. > - #phy-cells: determine the number of cells that should be given in the > phandle while referencing this phy. > diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c > index b5c266a..2f7220f 100644 > --- a/drivers/phy/phy-omap-usb2.c > +++ b/drivers/phy/phy-omap-usb2.c > @@ -159,6 +159,11 @@ static const struct usb_phy_data dra7x_usb2_data = { > .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, > }; > > +static const struct usb_phy_data dra7x_usb2_phy2_data = { > + .label = "dra7x_usb2_phy2", > + .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, > +}; > + > static const struct usb_phy_data am437x_usb2_data = { > .label = "am437x_usb2", > .flags = 0, > @@ -178,6 +183,10 @@ static const struct of_device_id omap_usb2_id_table[] = { > .data = &dra7x_usb2_data, > }, > { > + .compatible = "ti,dra7x-usb2-phy2", > + .data = &dra7x_usb2_phy2_data, Why is this needed? You can reuse dra7x_usb2_data as is. > + }, > + { > .compatible = "ti,am437x-usb2", > .data = &am437x_usb2_data, > }, > cheers, -roger -- 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
On 05/08/15 11:23, Roger Quadros wrote: > > On 04/08/15 18:20, Kishon Vijay Abraham I wrote: >> The USB2 PHY2 has a different register map compared to USB2 PHY1 >> to power on/off the PHY. In order to handle it, add a new >> "compatible" string. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> Documentation/devicetree/bindings/phy/ti-phy.txt | 2 ++ >> drivers/phy/phy-omap-usb2.c | 9 +++++++++ >> 2 files changed, 11 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt >> index 49e5b0c..a061077 100644 >> --- a/Documentation/devicetree/bindings/phy/ti-phy.txt >> +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt >> @@ -31,6 +31,8 @@ OMAP USB2 PHY >> >> Required properties: >> - compatible: Should be "ti,omap-usb2" >> + Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY >> + in DRA7x >> - reg : Address and length of the register set for the device. >> - #phy-cells: determine the number of cells that should be given in the >> phandle while referencing this phy. >> diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c >> index b5c266a..2f7220f 100644 >> --- a/drivers/phy/phy-omap-usb2.c >> +++ b/drivers/phy/phy-omap-usb2.c >> @@ -159,6 +159,11 @@ static const struct usb_phy_data dra7x_usb2_data = { >> .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, >> }; >> >> +static const struct usb_phy_data dra7x_usb2_phy2_data = { >> + .label = "dra7x_usb2_phy2", >> + .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, >> +}; >> + >> static const struct usb_phy_data am437x_usb2_data = { >> .label = "am437x_usb2", >> .flags = 0, >> @@ -178,6 +183,10 @@ static const struct of_device_id omap_usb2_id_table[] = { >> .data = &dra7x_usb2_data, >> }, >> { >> + .compatible = "ti,dra7x-usb2-phy2", >> + .data = &dra7x_usb2_phy2_data, > > Why is this needed? You can reuse dra7x_usb2_data as is. OK. I see why we need it in the next patch. Probably both patches could be squashed. What does .label indicate? IMO the .label of both usb2 phys should be the same. i.e. "dra7x_usb2" cheers, -roger > >> + }, >> + { >> .compatible = "ti,am437x-usb2", >> .data = &am437x_usb2_data, >> }, >> > > cheers, > -roger > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- 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
Hi Roger, On Wednesday 05 August 2015 01:55 PM, Roger Quadros wrote: > On 05/08/15 11:23, Roger Quadros wrote: >> >> On 04/08/15 18:20, Kishon Vijay Abraham I wrote: >>> The USB2 PHY2 has a different register map compared to USB2 PHY1 >>> to power on/off the PHY. In order to handle it, add a new >>> "compatible" string. >>> >>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >>> --- >>> Documentation/devicetree/bindings/phy/ti-phy.txt | 2 ++ >>> drivers/phy/phy-omap-usb2.c | 9 +++++++++ >>> 2 files changed, 11 insertions(+) >>> >>> diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt >>> index 49e5b0c..a061077 100644 >>> --- a/Documentation/devicetree/bindings/phy/ti-phy.txt >>> +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt >>> @@ -31,6 +31,8 @@ OMAP USB2 PHY >>> >>> Required properties: >>> - compatible: Should be "ti,omap-usb2" >>> + Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY >>> + in DRA7x >>> - reg : Address and length of the register set for the device. >>> - #phy-cells: determine the number of cells that should be given in the >>> phandle while referencing this phy. >>> diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c >>> index b5c266a..2f7220f 100644 >>> --- a/drivers/phy/phy-omap-usb2.c >>> +++ b/drivers/phy/phy-omap-usb2.c >>> @@ -159,6 +159,11 @@ static const struct usb_phy_data dra7x_usb2_data = { >>> .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, >>> }; >>> >>> +static const struct usb_phy_data dra7x_usb2_phy2_data = { >>> + .label = "dra7x_usb2_phy2", >>> + .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, >>> +}; >>> + >>> static const struct usb_phy_data am437x_usb2_data = { >>> .label = "am437x_usb2", >>> .flags = 0, >>> @@ -178,6 +183,10 @@ static const struct of_device_id omap_usb2_id_table[] = { >>> .data = &dra7x_usb2_data, >>> }, >>> { >>> + .compatible = "ti,dra7x-usb2-phy2", >>> + .data = &dra7x_usb2_phy2_data, >> >> Why is this needed? You can reuse dra7x_usb2_data as is. > > OK. I see why we need it in the next patch. > Probably both patches could be squashed. > > What does .label indicate? it's actually used only in usb_add_phy() (drivers/usb/phy/phy.c). I don't think it's actually important unless you strongly feel so. Thanks Kishon -- 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
On 05/08/15 17:18, Kishon Vijay Abraham I wrote: > Hi Roger, > > On Wednesday 05 August 2015 01:55 PM, Roger Quadros wrote: >> On 05/08/15 11:23, Roger Quadros wrote: >>> >>> On 04/08/15 18:20, Kishon Vijay Abraham I wrote: >>>> The USB2 PHY2 has a different register map compared to USB2 PHY1 >>>> to power on/off the PHY. In order to handle it, add a new >>>> "compatible" string. >>>> >>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >>>> --- >>>> Documentation/devicetree/bindings/phy/ti-phy.txt | 2 ++ >>>> drivers/phy/phy-omap-usb2.c | 9 +++++++++ >>>> 2 files changed, 11 insertions(+) >>>> >>>> diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt >>>> index 49e5b0c..a061077 100644 >>>> --- a/Documentation/devicetree/bindings/phy/ti-phy.txt >>>> +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt >>>> @@ -31,6 +31,8 @@ OMAP USB2 PHY >>>> >>>> Required properties: >>>> - compatible: Should be "ti,omap-usb2" >>>> + Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY >>>> + in DRA7x >>>> - reg : Address and length of the register set for the device. >>>> - #phy-cells: determine the number of cells that should be given in the >>>> phandle while referencing this phy. >>>> diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c >>>> index b5c266a..2f7220f 100644 >>>> --- a/drivers/phy/phy-omap-usb2.c >>>> +++ b/drivers/phy/phy-omap-usb2.c >>>> @@ -159,6 +159,11 @@ static const struct usb_phy_data dra7x_usb2_data = { >>>> .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, >>>> }; >>>> >>>> +static const struct usb_phy_data dra7x_usb2_phy2_data = { >>>> + .label = "dra7x_usb2_phy2", >>>> + .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, >>>> +}; >>>> + >>>> static const struct usb_phy_data am437x_usb2_data = { >>>> .label = "am437x_usb2", >>>> .flags = 0, >>>> @@ -178,6 +183,10 @@ static const struct of_device_id omap_usb2_id_table[] = { >>>> .data = &dra7x_usb2_data, >>>> }, >>>> { >>>> + .compatible = "ti,dra7x-usb2-phy2", >>>> + .data = &dra7x_usb2_phy2_data, >>> >>> Why is this needed? You can reuse dra7x_usb2_data as is. >> >> OK. I see why we need it in the next patch. >> Probably both patches could be squashed. >> >> What does .label indicate? > > it's actually used only in usb_add_phy() (drivers/usb/phy/phy.c). I don't think > it's actually important unless you strongly feel so. I leave it to you then :). cheers, -roger -- 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 49e5b0c..a061077 100644 --- a/Documentation/devicetree/bindings/phy/ti-phy.txt +++ b/Documentation/devicetree/bindings/phy/ti-phy.txt @@ -31,6 +31,8 @@ OMAP USB2 PHY Required properties: - compatible: Should be "ti,omap-usb2" + Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY + in DRA7x - reg : Address and length of the register set for the device. - #phy-cells: determine the number of cells that should be given in the phandle while referencing this phy. diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c index b5c266a..2f7220f 100644 --- a/drivers/phy/phy-omap-usb2.c +++ b/drivers/phy/phy-omap-usb2.c @@ -159,6 +159,11 @@ static const struct usb_phy_data dra7x_usb2_data = { .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, }; +static const struct usb_phy_data dra7x_usb2_phy2_data = { + .label = "dra7x_usb2_phy2", + .flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT, +}; + static const struct usb_phy_data am437x_usb2_data = { .label = "am437x_usb2", .flags = 0, @@ -178,6 +183,10 @@ static const struct of_device_id omap_usb2_id_table[] = { .data = &dra7x_usb2_data, }, { + .compatible = "ti,dra7x-usb2-phy2", + .data = &dra7x_usb2_phy2_data, + }, + { .compatible = "ti,am437x-usb2", .data = &am437x_usb2_data, },
The USB2 PHY2 has a different register map compared to USB2 PHY1 to power on/off the PHY. In order to handle it, add a new "compatible" string. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- Documentation/devicetree/bindings/phy/ti-phy.txt | 2 ++ drivers/phy/phy-omap-usb2.c | 9 +++++++++ 2 files changed, 11 insertions(+)