phy: Add configuration interface

The phy framework is only allowing to configure the power state of the PHY
using the init and power_on hooks, and their power_off and exit
counterparts.

While it works for most, simple, PHYs supported so far, some more advanced
PHYs need some configuration depending on runtime parameters. These PHYs
have been supported by a number of means already, often by using ad-hoc
drivers in their consumer drivers.

That doesn't work too well however, when a consumer device needs to deal
with multiple PHYs, or when multiple consumers need to deal with the same
PHY (a DSI driver and a CSI driver for example).

So we'll add a new interface, through two funtions, phy_validate and
phy_configure. The first one will allow to check that a current
configuration, for a given mode, is applicable. It will also allow the PHY
driver to tune the settings given as parameters as it sees fit.

phy_configure will actually apply that configuration in the phy itself.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index df3d4ba516abc211f82c40083543150a44948c5c..19b05e824ee49f556d285617cbd6724156754507 100644 (file)
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -407,6 +407,70 @@ int phy_calibrate(struct phy *phy)
 }
 EXPORT_SYMBOL_GPL(phy_calibrate);
 
+/**
+ * phy_configure() - Changes the phy parameters
+ * @phy: the phy returned by phy_get()
+ * @opts: New configuration to apply
+ *
+ * Used to change the PHY parameters. phy_init() must have been called
+ * on the phy. The configuration will be applied on the current phy
+ * mode, that can be changed using phy_set_mode().
+ *
+ * Returns: 0 if successful, an negative error code otherwise
+ */
+int phy_configure(struct phy *phy, union phy_configure_opts *opts)
+{
+       int ret;
+
+       if (!phy)
+               return -EINVAL;
+
+       if (!phy->ops->configure)
+               return -EOPNOTSUPP;
+
+       mutex_lock(&phy->mutex);
+       ret = phy->ops->configure(phy, opts);
+       mutex_unlock(&phy->mutex);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(phy_configure);
+
+/**
+ * phy_validate() - Checks the phy parameters
+ * @phy: the phy returned by phy_get()
+ * @mode: phy_mode the configuration is applicable to.
+ * @submode: PHY submode the configuration is applicable to.
+ * @opts: Configuration to check
+ *
+ * Used to check that the current set of parameters can be handled by
+ * the phy. Implementations are free to tune the parameters passed as
+ * arguments if needed by some implementation detail or
+ * constraints. It will not change any actual configuration of the
+ * PHY, so calling it as many times as deemed fit will have no side
+ * effect.
+ *
+ * Returns: 0 if successful, an negative error code otherwise
+ */
+int phy_validate(struct phy *phy, enum phy_mode mode, int submode,
+                union phy_configure_opts *opts)
+{
+       int ret;
+
+       if (!phy)
+               return -EINVAL;
+
+       if (!phy->ops->validate)
+               return -EOPNOTSUPP;
+
+       mutex_lock(&phy->mutex);
+       ret = phy->ops->validate(phy, mode, submode, opts);
+       mutex_unlock(&phy->mutex);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(phy_validate);
+
 /**
  * _of_phy_get() - lookup and obtain a reference to a phy by phandle
  * @np: device_node for which to get the phy

diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index 453f21834685cdbe778691f523543a58a5badf82..04476c026b5ac15817d90a499c2413da51645ba1 100644 (file)
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -42,6 +42,12 @@ enum phy_mode {
        PHY_MODE_MIPI_DPHY,
 };
 
+/**
+ * union phy_configure_opts - Opaque generic phy configuration
+ */
+union phy_configure_opts {
+};
+
 /**
  * struct phy_ops - set of function pointers for performing phy operations
  * @init: operation to be performed for initializing phy
@@ -59,6 +65,37 @@ struct phy_ops {
        int     (*power_on)(struct phy *phy);
        int     (*power_off)(struct phy *phy);
        int     (*set_mode)(struct phy *phy, enum phy_mode mode, int submode);
+
+       /**
+        * @configure:
+        *
+        * Optional.
+        *
+        * Used to change the PHY parameters. phy_init() must have
+        * been called on the phy.
+        *
+        * Returns: 0 if successful, an negative error code otherwise
+        */
+       int     (*configure)(struct phy *phy, union phy_configure_opts *opts);
+
+       /**
+        * @validate:
+        *
+        * Optional.
+        *
+        * Used to check that the current set of parameters can be
+        * handled by the phy. Implementations are free to tune the
+        * parameters passed as arguments if needed by some
+        * implementation detail or constraints. It must not change
+        * any actual configuration of the PHY, so calling it as many
+        * times as deemed fit by the consumer must have no side
+        * effect.
+        *
+        * Returns: 0 if the configuration can be applied, an negative
+        * error code otherwise
+        */
+       int     (*validate)(struct phy *phy, enum phy_mode mode, int submode,
+                           union phy_configure_opts *opts);
        int     (*reset)(struct phy *phy);
        int     (*calibrate)(struct phy *phy);
        struct module *owner;
@@ -165,6 +202,9 @@ int phy_power_off(struct phy *phy);
 int phy_set_mode_ext(struct phy *phy, enum phy_mode mode, int submode);
 #define phy_set_mode(phy, mode) \
        phy_set_mode_ext(phy, mode, 0)
+int phy_configure(struct phy *phy, union phy_configure_opts *opts);
+int phy_validate(struct phy *phy, enum phy_mode mode, int submode,
+                union phy_configure_opts *opts);
 
 static inline enum phy_mode phy_get_mode(struct phy *phy)
 {
@@ -309,6 +349,24 @@ static inline int phy_calibrate(struct phy *phy)
        return -ENOSYS;
 }
 
+static inline int phy_configure(struct phy *phy,
+                               union phy_configure_opts *opts)
+{
+       if (!phy)
+               return 0;
+
+       return -ENOSYS;
+}
+
+static inline int phy_validate(struct phy *phy, enum phy_mode mode, int submode,
+                              union phy_configure_opts *opts)
+{
+       if (!phy)
+               return 0;
+
+       return -ENOSYS;
+}
+
 static inline int phy_get_bus_width(struct phy *phy)
 {
        return -ENOSYS;