mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
667f6c7f49
Manually rebased patches:
bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch
layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch
mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
Removed:
layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
lantiq/Easybox 904 xDSL, x86_64
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
96 lines
2.7 KiB
Diff
96 lines
2.7 KiB
Diff
From e8730a6bd02cf4f6a3e2d11585d91c0417ed92e5 Mon Sep 17 00:00:00 2001
|
|
From: Fugang Duan <fugang.duan@nxp.com>
|
|
Date: Wed, 10 Jul 2019 14:20:45 +0800
|
|
Subject: [PATCH] tty: serial: lpuart: add power domain support
|
|
|
|
lpuart dma mode depends on dma channel's power domain like:
|
|
power-domains = <&pd IMX_SC_R_UART_1>,
|
|
<&pd IMX_SC_R_DMA_2_CH10>,
|
|
<&pd IMX_SC_R_DMA_2_CH11>;
|
|
power-domain-names = "uart", "rxdma", "txdma";
|
|
|
|
So define the multiple power domain for lpuart.
|
|
|
|
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
|
|
---
|
|
drivers/tty/serial/fsl_lpuart.c | 54 +++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 54 insertions(+)
|
|
|
|
--- a/drivers/tty/serial/fsl_lpuart.c
|
|
+++ b/drivers/tty/serial/fsl_lpuart.c
|
|
@@ -20,6 +20,8 @@
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_dma.h>
|
|
+#include <linux/pm_domain.h>
|
|
+#include <linux/pm_runtime.h>
|
|
#include <linux/serial_core.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/tty_flip.h>
|
|
@@ -2391,6 +2393,54 @@ static struct uart_driver lpuart_reg = {
|
|
.cons = LPUART_CONSOLE,
|
|
};
|
|
|
|
+static int lpuart_attach_pd(struct device *dev)
|
|
+{
|
|
+ struct device *pd_uart;
|
|
+ struct device *pd_txdma, *pd_rxdma;
|
|
+ struct device_link *link;
|
|
+
|
|
+ if (dev->pm_domain)
|
|
+ return 0;
|
|
+
|
|
+ pd_uart = dev_pm_domain_attach_by_name(dev, "uart");
|
|
+ if (IS_ERR(pd_uart))
|
|
+ return PTR_ERR(pd_uart);
|
|
+ link = device_link_add(dev, pd_uart, DL_FLAG_STATELESS |
|
|
+ DL_FLAG_PM_RUNTIME |
|
|
+ DL_FLAG_RPM_ACTIVE);
|
|
+ if (IS_ERR(link)) {
|
|
+ dev_err(dev, "Failed to add device_link to uart pd: %ld\n",
|
|
+ PTR_ERR(link));
|
|
+ return PTR_ERR(link);
|
|
+ }
|
|
+
|
|
+ pd_txdma = dev_pm_domain_attach_by_name(dev, "txdma");
|
|
+ if (IS_ERR(pd_txdma))
|
|
+ return PTR_ERR(pd_txdma);
|
|
+ link = device_link_add(dev, pd_txdma, DL_FLAG_STATELESS |
|
|
+ DL_FLAG_PM_RUNTIME |
|
|
+ DL_FLAG_RPM_ACTIVE);
|
|
+ if (IS_ERR(link)) {
|
|
+ dev_err(dev, "Failed to add device_link to uart pd: %ld\n",
|
|
+ PTR_ERR(link));
|
|
+ return PTR_ERR(link);
|
|
+ }
|
|
+
|
|
+ pd_rxdma = dev_pm_domain_attach_by_name(dev, "rxdma");
|
|
+ if (IS_ERR(pd_rxdma))
|
|
+ return PTR_ERR(pd_rxdma);
|
|
+ link = device_link_add(dev, pd_rxdma, DL_FLAG_STATELESS |
|
|
+ DL_FLAG_PM_RUNTIME |
|
|
+ DL_FLAG_RPM_ACTIVE);
|
|
+ if (IS_ERR(link)) {
|
|
+ dev_err(dev, "Failed to add device_link to uart pd: %ld\n",
|
|
+ PTR_ERR(link));
|
|
+ return PTR_ERR(link);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int lpuart_probe(struct platform_device *pdev)
|
|
{
|
|
const struct of_device_id *of_id = of_match_device(lpuart_dt_ids,
|
|
@@ -2428,6 +2478,10 @@ static int lpuart_probe(struct platform_
|
|
|
|
sport->port.rs485_config = lpuart_config_rs485;
|
|
|
|
+ ret = lpuart_attach_pd(&pdev->dev);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
sport->ipg_clk = devm_clk_get(&pdev->dev, "ipg");
|
|
if (IS_ERR(sport->ipg_clk)) {
|
|
ret = PTR_ERR(sport->ipg_clk);
|