mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
a47279154e
Manually rebased patches:
bcm27xx:
patches-5.4/950-0267-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
bcm53xx:
patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
layerscape:
patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
patches-5.4/808-i2c-0002-MLK-10893-i2c-imx-add-irqf_no_suspend.patch
patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch
Removed since could be reverse-applied by quilt:
mediatek:
patches-5.4/0700-arm-dts-mt7623-add-missing-pause-for-switchport.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, x86_64
Run-tested: ipq806x/R7800, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Curtis Deptuck <curtdept@me.com> [x86_64]
Rebase of 802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
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
|
|
@@ -1229,7 +1229,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;
|
|
}
|
|
@@ -1239,14 +1240,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)
|
|
};
|