mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +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>
71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
From 9de3b340d84b75f93081f871b640a065cba4ded0 Mon Sep 17 00:00:00 2001
|
|
From: Peng Ma <peng.ma@nxp.com>
|
|
Date: Tue, 26 Nov 2019 16:02:00 +0800
|
|
Subject: [PATCH] LF-162: i2c: imx: Defer probing if EDMA not available
|
|
|
|
EDMA may be not available or defered due to dependencies on
|
|
other modules, If these scenarios is encountered, we should
|
|
defer probing.
|
|
|
|
Signed-off-by: Peng Ma <peng.ma@nxp.com>
|
|
---
|
|
drivers/i2c/busses/i2c-imx.c | 16 +++++++++++-----
|
|
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-imx.c
|
|
+++ b/drivers/i2c/busses/i2c-imx.c
|
|
@@ -369,8 +369,8 @@ static void i2c_imx_reset_regs(struct im
|
|
}
|
|
|
|
/* Functions for DMA support */
|
|
-static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx,
|
|
- dma_addr_t phy_addr)
|
|
+static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx,
|
|
+ dma_addr_t phy_addr)
|
|
{
|
|
struct imx_i2c_dma *dma;
|
|
struct dma_slave_config dma_sconfig;
|
|
@@ -379,7 +379,7 @@ static void i2c_imx_dma_request(struct i
|
|
|
|
dma = devm_kzalloc(dev, sizeof(*dma), GFP_KERNEL);
|
|
if (!dma)
|
|
- return;
|
|
+ return -ENOMEM;
|
|
|
|
dma->chan_tx = dma_request_chan(dev, "tx");
|
|
if (IS_ERR(dma->chan_tx)) {
|
|
@@ -424,7 +424,7 @@ static void i2c_imx_dma_request(struct i
|
|
dev_info(dev, "using %s (tx) and %s (rx) for DMA transfers\n",
|
|
dma_chan_name(dma->chan_tx), dma_chan_name(dma->chan_rx));
|
|
|
|
- return;
|
|
+ return 0;
|
|
|
|
fail_rx:
|
|
dma_release_channel(dma->chan_rx);
|
|
@@ -432,6 +432,8 @@ fail_tx:
|
|
dma_release_channel(dma->chan_tx);
|
|
fail_al:
|
|
devm_kfree(dev, dma);
|
|
+
|
|
+ return ret;
|
|
}
|
|
|
|
static void i2c_imx_dma_callback(void *arg)
|
|
@@ -1602,10 +1604,14 @@ static int i2c_imx_probe(struct platform
|
|
dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n");
|
|
|
|
/* Init DMA config if supported */
|
|
- i2c_imx_dma_request(i2c_imx, phy_addr);
|
|
+ ret = i2c_imx_dma_request(i2c_imx, phy_addr);
|
|
+ if (ret == -EPROBE_DEFER)
|
|
+ goto i2c_adapter_remove;
|
|
|
|
return 0; /* Return OK */
|
|
|
|
+i2c_adapter_remove:
|
|
+ i2c_del_adapter(&i2c_imx->adapter);
|
|
clk_notifier_unregister:
|
|
clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
|
|
free_irq(irq, i2c_imx);
|