diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/808-i2c-0004-MLK-16203-enable-runtime-pm-of-i2c-temporary-when-do.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/808-i2c-0004-MLK-16203-enable-runtime-pm-of-i2c-temporary-when-do.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/808-i2c-0004-MLK-16203-enable-runtime-pm-of-i2c-temporary-when-do.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/808-i2c-0004-MLK-16203-enable-runtime-pm-of-i2c-temporary-when-do.patch b/target/linux/layerscape/patches-5.4/808-i2c-0004-MLK-16203-enable-runtime-pm-of-i2c-temporary-when-do.patch new file mode 100644 index 0000000000..3157750f3f --- /dev/null +++ b/target/linux/layerscape/patches-5.4/808-i2c-0004-MLK-16203-enable-runtime-pm-of-i2c-temporary-when-do.patch @@ -0,0 +1,58 @@ +From 4a76bb8458cbe93309314c58f276087569b2fc48 Mon Sep 17 00:00:00 2001 +From: Gao Pan <pandy.gao@nxp.com> +Date: Fri, 18 Aug 2017 18:35:11 +0800 +Subject: [PATCH] MLK-16203 enable runtime pm of i2c temporary when do system + suspend + +When we do system suspend, the runtime pm will be disabled, but we need +to control the PMIC to power on/off the regulator, if the runtime pm is +disabled, if will failed to request runtime wakeup. So data transfer will +failed. + +Signed-off-by: Bai Ping <ping.bai@nxp.com> +Signed-off-by: Gao Pan <pandy.gao@nxp.com> +Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com> +(cherry picked from commit 93adab71408f1f162015e77715dd04ce2301d673) +--- + drivers/i2c/busses/i2c-imx.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +--- a/drivers/i2c/busses/i2c-imx.c ++++ b/drivers/i2c/busses/i2c-imx.c +@@ -896,10 +896,17 @@ static int i2c_imx_xfer(struct i2c_adapt + unsigned int i, temp; + int result; + bool is_lastmsg = false; ++ bool enable_runtime_pm = false; + struct imx_i2c_struct *i2c_imx = i2c_get_adapdata(adapter); + + dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__); + ++ ++ if (!pm_runtime_enabled(i2c_imx->adapter.dev.parent)) { ++ pm_runtime_enable(i2c_imx->adapter.dev.parent); ++ enable_runtime_pm = true; ++ } ++ + result = pm_runtime_get_sync(i2c_imx->adapter.dev.parent); + if (result < 0) + goto out; +@@ -971,6 +978,9 @@ fail0: + pm_runtime_put_autosuspend(i2c_imx->adapter.dev.parent); + + out: ++ if (enable_runtime_pm) ++ pm_runtime_disable(i2c_imx->adapter.dev.parent); ++ + dev_dbg(&i2c_imx->adapter.dev, "<%s> exit with: %s: %d\n", __func__, + (result < 0) ? "error" : "success msg", + (result < 0) ? result : num); +@@ -1259,7 +1269,7 @@ static int i2c_imx_resume(struct device + } + + static const struct dev_pm_ops i2c_imx_pm_ops = { +- SET_SYSTEM_SLEEP_PM_OPS(i2c_imx_suspend, i2c_imx_resume) ++ SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(i2c_imx_suspend, i2c_imx_resume) + SET_RUNTIME_PM_OPS(i2c_imx_runtime_suspend, + i2c_imx_runtime_resume, NULL) + }; |