kernel: bump 4.14 to 4.14.48 for 18.06

[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.14 / 0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch

diff --git a/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
index 2ab46e176e5d54780958fbd20573f21dc90e52cb..abcccb277c98adf8b4bfac60e60ade7d4dbae8be 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
+++ b/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
@@ -27,9 +27,9 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 
 --- a/drivers/base/power/opp/core.c
 +++ b/drivers/base/power/opp/core.c
-@@ -1605,6 +1605,83 @@ unlock:
+@@ -1605,6 +1605,83 @@ put_table:
  }
-
+ 
  /**
 + * dev_pm_opp_adjust_voltage() - helper to change the voltage of an OPP
 + * @dev:              device for which we do this operation
@@ -114,27 +114,27 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 --- a/include/linux/pm_opp.h
 +++ b/include/linux/pm_opp.h
 @@ -25,6 +25,7 @@ struct opp_table;
-
+ 
  enum dev_pm_opp_event {
-       OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE,
+       OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE,
 +      OPP_EVENT_ADJUST_VOLTAGE,
  };
-
+ 
  /**
 @@ -108,6 +109,9 @@ int dev_pm_opp_add(struct device *dev, u
-                  unsigned long u_volt);
+                  unsigned long u_volt);
  void dev_pm_opp_remove(struct device *dev, unsigned long freq);
-
+ 
 +int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
 +                            unsigned long u_volt);
 +
  int dev_pm_opp_enable(struct device *dev, unsigned long freq);
-
+ 
  int dev_pm_opp_disable(struct device *dev, unsigned long freq);
 @@ -208,6 +212,13 @@ static inline void dev_pm_opp_remove(str
  {
  }
-
+ 
 +static inline int
 +dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
 +                        unsigned long u_volt)
@@ -144,4 +144,4 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 +
  static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq)
  {
-       return 0;
+       return 0;