| Message ID | 1435060743-5511-6-git-send-email-kishon@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 23 Jun 2015 17:28:50 +0530 Kishon Vijay Abraham I <kishon@ti.com> 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 52c7a92..b9101b9 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, Isn't it better to define the register map in usb_phy_data so that you don't need to check for compatible flag everytime? > +}; > + > 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, > }, > -- > 1.7.9.5 > cheers, -roger -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wednesday 24 June 2015 04:33 PM, Roger Quadros wrote: > On Tue, 23 Jun 2015 17:28:50 +0530 > Kishon Vijay Abraham I <kishon@ti.com> 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 52c7a92..b9101b9 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, > > Isn't it better to define the register map in usb_phy_data > so that you don't need to check for compatible flag everytime? > We could may be define it for DRA7x USB2 PHYs but for am437x-usb2, it might not be good. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" 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 52c7a92..b9101b9 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(+)