diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
| commit | 1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e (patch) | |
| tree | d5a3f3b108f37f1e80ccd64242222b2cc5548607 /include/linux | |
| parent | 8c02f14d1db16068a005b9674da42f14f344ab89 (diff) | |
| parent | a2d10b46f39e36c0e19bfde0737e27d2b0bf43ba (diff) | |
| download | barebox-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.gz barebox-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.xz | |
Merge branch 'for-next/stm32'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/phy/phy.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index 5d96e02df4..8a28b8e068 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -49,7 +49,6 @@ struct phy_attrs { * @dev: phy device * @id: id of the phy device * @ops: function pointers for performing phy operations - * @init_data: list of PHY consumers (non-dt only) * @mutex: mutex to protect phy_ops * @init_count: used to protect when the PHY is used by multiple consumers * @power_count: used to protect when the PHY is used by multiple consumers @@ -59,7 +58,6 @@ struct phy { struct device_d dev; int id; const struct phy_ops *ops; - struct phy_init_data *init_data; int init_count; int power_count; struct phy_attrs attrs; @@ -144,14 +142,14 @@ struct phy *of_phy_get(struct device_node *np, const char *con_id); struct phy *of_phy_simple_xlate(struct device_d *dev, struct of_phandle_args *args); struct phy *phy_create(struct device_d *dev, struct device_node *node, - const struct phy_ops *ops, - struct phy_init_data *init_data); + const struct phy_ops *ops); void phy_destroy(struct phy *phy); struct phy_provider *__of_phy_provider_register(struct device_d *dev, struct phy * (*of_xlate)(struct device_d *dev, struct of_phandle_args *args)); void of_phy_provider_unregister(struct phy_provider *phy_provider); struct usb_phy *phy_to_usbphy(struct phy *phy); +struct phy *phy_get_by_index(struct device_d *dev, int index); #else static inline int phy_init(struct phy *phy) { @@ -225,8 +223,7 @@ static inline struct phy *of_phy_simple_xlate(struct device_d *dev, static inline struct phy *phy_create(struct device_d *dev, struct device_node *node, - const struct phy_ops *ops, - struct phy_init_data *init_data) + const struct phy_ops *ops) { return ERR_PTR(-ENOSYS); } @@ -251,6 +248,11 @@ static inline struct usb_phy *phy_to_usbphy(struct phy *phy) return NULL; } +static struct phy *phy_get_by_index(struct device_d *dev, int index) +{ + return ERR_PTR(-ENODEV); +} + #endif #endif /* __DRIVERS_PHY_H */ |