Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-08-08 12:22:02 +0200
committerMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-08-08 12:22:21 +0200
commitba5d3825d16a2acaad40cf127c1518276123912f (patch)
treedf8cde7b723ca1ddc255c454d0d6a5758f0dcef7
parentc6968cfa357abd9b34af971c371b596ea1213153 (diff)
PM / devfreq: rk3399_dmc: do not print error when get supply
and clk defer (bsc#1144718,bsc#1144813).
-rw-r--r--patches.drivers/0008-PM-devfreq-rk3399_dmc-do-not-print-error-when-get-su.patch48
-rw-r--r--series.conf1
2 files changed, 49 insertions, 0 deletions
diff --git a/patches.drivers/0008-PM-devfreq-rk3399_dmc-do-not-print-error-when-get-su.patch b/patches.drivers/0008-PM-devfreq-rk3399_dmc-do-not-print-error-when-get-su.patch
new file mode 100644
index 0000000000..d7da930186
--- /dev/null
+++ b/patches.drivers/0008-PM-devfreq-rk3399_dmc-do-not-print-error-when-get-su.patch
@@ -0,0 +1,48 @@
+From: Lin Huang <hl@rock-chips.com>
+Date: Wed, 9 May 2018 14:57:47 +0200
+Subject: PM / devfreq: rk3399_dmc: do not print error when get supply and clk
+ defer.
+
+Git-commit: 49edc52312c34c981722833b0d9344c2aa83892d
+Patch-mainline: v4.19-rc1
+References: bsc#1144718,bsc#1144813
+
+We just return -EPROBE_DEFER error code to caller and do not
+print error message when try to get center logic regulator
+and DMC clock defer.
+
+Signed-off-by: Lin Huang <hl@rock-chips.com>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
+Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+---
+ drivers/devfreq/rk3399_dmc.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
+index 44a379657cd5..5bfca028eaaf 100644
+--- a/drivers/devfreq/rk3399_dmc.c
++++ b/drivers/devfreq/rk3399_dmc.c
+@@ -308,12 +308,18 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
+
+ data->vdd_center = devm_regulator_get(dev, "center");
+ if (IS_ERR(data->vdd_center)) {
++ if (PTR_ERR(data->vdd_center) == -EPROBE_DEFER)
++ return -EPROBE_DEFER;
++
+ dev_err(dev, "Cannot get the regulator \"center\"\n");
+ return PTR_ERR(data->vdd_center);
+ }
+
+ data->dmc_clk = devm_clk_get(dev, "dmc_clk");
+ if (IS_ERR(data->dmc_clk)) {
++ if (PTR_ERR(data->dmc_clk) == -EPROBE_DEFER)
++ return -EPROBE_DEFER;
++
+ dev_err(dev, "Cannot get the clk dmc_clk\n");
+ return PTR_ERR(data->dmc_clk);
+ };
+--
+2.11.0
+
diff --git a/series.conf b/series.conf
index 993fdb0e48..db957b28f5 100644
--- a/series.conf
+++ b/series.conf
@@ -18373,6 +18373,7 @@
patches.drivers/ACPI-PM-save-NVS-memory-for-ASUS-1025C-laptop
patches.drivers/dt-bindings-clock-add-rk3399-ddr3-standard-speed-bins.patch
patches.drivers/0007-PM-devfreq-rk3399_dmc-remove-wait-for-dcf-irq-event.patch
+ patches.drivers/0008-PM-devfreq-rk3399_dmc-do-not-print-error-when-get-su.patch
patches.arch/PM-devfreq-rk3399_dmc-Fix-duplicated-opp-table-on-re.patch
patches.drivers/0007-cpufreq-CPPC-Add-cpuinfo_cur_freq-support-for-CPPC.patch
patches.drivers/ACPI-scan-Initialize-status-to-ACPI_STA_DEFAULT.patch