1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index 698a92c3c17b..1813f5ad5fa2 100644
--- a/drivers/opp/of.c
+++ b/drivers/opp/of.c
@@ -617,9 +617,12 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
         /* OPP to select on device suspend */
         if (of_property_read_bool(np, "opp-suspend")) {
                 if (opp_table->suspend_opp) {
-                        dev_warn(dev, "%s: Multiple suspend OPPs found (%lu %lu)\n",
-                                 __func__, opp_table->suspend_opp->rate,
-                                 new_opp->rate);
+                        /* Pick the OPP with higher rate as suspend OPP */
+                        if (new_opp->rate > opp_table->suspend_opp->rate) {
+                                opp_table->suspend_opp->suspend = false;
+                                new_opp->suspend = true;
+                                opp_table->suspend_opp = new_opp;
+                        }
                 } else {
                         new_opp->suspend = true;
                         opp_table->suspend_opp = new_opp;