mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
cddd459140
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>
58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
From b862ceba838786ac81aa6a295ad91a54aff6909d Mon Sep 17 00:00:00 2001
|
|
From: Gao Pan <b54642@freescale.com>
|
|
Date: Tue, 25 Aug 2015 14:00:32 +0800
|
|
Subject: [PATCH] MLK-11403: I2C: imx: restore pin setting for i2c
|
|
|
|
restore pin setting for i2c in suspend/resume
|
|
|
|
Signed-off-by: Gao Pan <gaopan@freescale.com>
|
|
(Vipul: Fixed merge conflicts)
|
|
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
|
|
(cherry picked from commit 42b5aa1d72c09015d435459c6a59022255e3ef21)
|
|
---
|
|
drivers/i2c/busses/i2c-imx.c | 19 +++++++++++++++++--
|
|
1 file changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-imx.c
|
|
+++ b/drivers/i2c/busses/i2c-imx.c
|
|
@@ -1227,7 +1227,8 @@ static int __maybe_unused i2c_imx_runtim
|
|
{
|
|
struct imx_i2c_struct *i2c_imx = dev_get_drvdata(dev);
|
|
|
|
- clk_disable(i2c_imx->clk);
|
|
+ clk_disable_unprepare(i2c_imx->clk);
|
|
+ pinctrl_pm_select_sleep_state(dev);
|
|
|
|
return 0;
|
|
}
|
|
@@ -1237,14 +1238,28 @@ static int __maybe_unused i2c_imx_runtim
|
|
struct imx_i2c_struct *i2c_imx = dev_get_drvdata(dev);
|
|
int ret;
|
|
|
|
- ret = clk_enable(i2c_imx->clk);
|
|
+ pinctrl_pm_select_default_state(dev);
|
|
+ ret = clk_prepare_enable(i2c_imx->clk);
|
|
if (ret)
|
|
dev_err(dev, "can't enable I2C clock, ret=%d\n", ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
+static int i2c_imx_suspend(struct device *dev)
|
|
+{
|
|
+ pinctrl_pm_select_sleep_state(dev);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int i2c_imx_resume(struct device *dev)
|
|
+{
|
|
+ pinctrl_pm_select_default_state(dev);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static const struct dev_pm_ops i2c_imx_pm_ops = {
|
|
+ SET_SYSTEM_SLEEP_PM_OPS(i2c_imx_suspend, i2c_imx_resume)
|
|
SET_RUNTIME_PM_OPS(i2c_imx_runtime_suspend,
|
|
i2c_imx_runtime_resume, NULL)
|
|
};
|