| Message ID | 1514978930-31341-15-git-send-email-mgautam@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
Hi, On Wednesday 03 January 2018 04:58 PM, Manu Gautam wrote: > Add following USB speed related PHY modes: > LS (Low Speed), FS (Full Speed), HS (High Speed), SS (Super Speed) > > Speed related information is required by some QCOM PHY drivers > to program PHY monitor resume/remote-wakeup events in suspended > state. Speed is needed in order to set correct polarity of wakeup > events for detection. E.g. QUSB2 PHY monitors DP/DM line state > depending on whether speed is LS or FS/HS to detect resume. > Similarly QMP USB3 PHY in SS mode should monitor RX terminations > attach/detach and LFPS events depending on SSPHY is active or not. > > Signed-off-by: Manu Gautam <mgautam@codeaurora.org> > --- > drivers/phy/phy-core.c | 15 +++++++++++++++ > include/linux/phy/phy.h | 32 ++++++++++++++++++++++++-------- > 2 files changed, 39 insertions(+), 8 deletions(-) > > diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c > index b4964b0..e4f0525 100644 > --- a/drivers/phy/phy-core.c > +++ b/drivers/phy/phy-core.c > @@ -357,6 +357,21 @@ int phy_set_mode(struct phy *phy, enum phy_mode mode) > } > EXPORT_SYMBOL_GPL(phy_set_mode); > > +enum phy_mode phy_get_mode(struct phy *phy) > +{ > + enum phy_mode ret; > + > + if (!phy || !phy->ops->get_mode) > + return PHY_MODE_INVALID; > + > + mutex_lock(&phy->mutex); > + ret = phy->ops->get_mode(phy); Since get_mode only has to return the phy mode, there is no need for an ops here. Just add phy_mode in phy_attrs in set_mode and return it here. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 1/5/2018 4:31 PM, Kishon Vijay Abraham I wrote: >> +enum phy_mode phy_get_mode(struct phy *phy) >> +{ >> + enum phy_mode ret; >> + >> + if (!phy || !phy->ops->get_mode) >> + return PHY_MODE_INVALID; >> + >> + mutex_lock(&phy->mutex); >> + ret = phy->ops->get_mode(phy); > Since get_mode only has to return the phy mode, there is no need for an ops > here. Just add phy_mode in phy_attrs in set_mode and return it here. Sure, will re-send patch set with this change.
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index b4964b0..e4f0525 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -357,6 +357,21 @@ int phy_set_mode(struct phy *phy, enum phy_mode mode) } EXPORT_SYMBOL_GPL(phy_set_mode); +enum phy_mode phy_get_mode(struct phy *phy) +{ + enum phy_mode ret; + + if (!phy || !phy->ops->get_mode) + return PHY_MODE_INVALID; + + mutex_lock(&phy->mutex); + ret = phy->ops->get_mode(phy); + mutex_unlock(&phy->mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(phy_get_mode); + int phy_reset(struct phy *phy) { int ret; diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index d8da3e5..4a5cbd0 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -25,7 +25,15 @@ enum phy_mode { PHY_MODE_INVALID, PHY_MODE_USB_HOST, + PHY_MODE_USB_HOST_LS, + PHY_MODE_USB_HOST_FS, + PHY_MODE_USB_HOST_HS, + PHY_MODE_USB_HOST_SS, PHY_MODE_USB_DEVICE, + PHY_MODE_USB_DEVICE_LS, + PHY_MODE_USB_DEVICE_FS, + PHY_MODE_USB_DEVICE_HS, + PHY_MODE_USB_DEVICE_SS, PHY_MODE_USB_OTG, PHY_MODE_SGMII, PHY_MODE_10GKR, @@ -40,19 +48,21 @@ enum phy_mode { * @power_on: powering on the phy * @power_off: powering off the phy * @set_mode: set the mode of the phy + * @get_mode: get current mode of PHY * @reset: resetting the phy * @calibrate: calibrate the phy * @owner: the module owner containing the ops */ struct phy_ops { - int (*init)(struct phy *phy); - int (*exit)(struct phy *phy); - int (*power_on)(struct phy *phy); - int (*power_off)(struct phy *phy); - int (*set_mode)(struct phy *phy, enum phy_mode mode); - int (*reset)(struct phy *phy); - int (*calibrate)(struct phy *phy); - struct module *owner; + int (*init)(struct phy *phy); + int (*exit)(struct phy *phy); + int (*power_on)(struct phy *phy); + int (*power_off)(struct phy *phy); + int (*set_mode)(struct phy *phy, enum phy_mode mode); + enum phy_mode (*get_mode)(struct phy *phy); + int (*reset)(struct phy *phy); + int (*calibrate)(struct phy *phy); + struct module *owner; }; /** @@ -144,6 +154,7 @@ static inline void *phy_get_drvdata(struct phy *phy) int phy_power_on(struct phy *phy); int phy_power_off(struct phy *phy); int phy_set_mode(struct phy *phy, enum phy_mode mode); +enum phy_mode phy_get_mode(struct phy *phy); int phy_reset(struct phy *phy); int phy_calibrate(struct phy *phy); static inline int phy_get_bus_width(struct phy *phy) @@ -260,6 +271,11 @@ static inline int phy_set_mode(struct phy *phy, enum phy_mode mode) return -ENOSYS; } +static inline enum phy_mode phy_get_mode(struct phy *phy) +{ + return PHY_MODE_INVALID; +} + static inline int phy_reset(struct phy *phy) { if (!phy)
Add following USB speed related PHY modes: LS (Low Speed), FS (Full Speed), HS (High Speed), SS (Super Speed) Speed related information is required by some QCOM PHY drivers to program PHY monitor resume/remote-wakeup events in suspended state. Speed is needed in order to set correct polarity of wakeup events for detection. E.g. QUSB2 PHY monitors DP/DM line state depending on whether speed is LS or FS/HS to detect resume. Similarly QMP USB3 PHY in SS mode should monitor RX terminations attach/detach and LFPS events depending on SSPHY is active or not. Signed-off-by: Manu Gautam <mgautam@codeaurora.org> --- drivers/phy/phy-core.c | 15 +++++++++++++++ include/linux/phy/phy.h | 32 ++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 8 deletions(-)