aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
diff options
context:
space:
mode:
authorBiwen Li <biwen.li@nxp.com>2018-11-02 11:21:57 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-18 20:17:23 +0100
commit0a827ebd2fa3c7dc210aff0a30d0dc1d536ed89c (patch)
treeb80223fffb0814b6db33f48dd3aaa047cd3e0299 /target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
parent7bd6969acce763a7117b33a6647b8c5dbbf2b0aa (diff)
downloadupstream-0a827ebd2fa3c7dc210aff0a30d0dc1d536ed89c.tar.gz
upstream-0a827ebd2fa3c7dc210aff0a30d0dc1d536ed89c.tar.bz2
upstream-0a827ebd2fa3c7dc210aff0a30d0dc1d536ed89c.zip
layerscape: upgrade kernel to 4.14
This patch is to upgrade kernel to 4.14 for layerscape. patches-4.14 for layerscape included two categories. - NXP Layerscape SDK kernel-4.14 patches All patches on tag LSDK-18.09-V4.14 were ported to OpenWrt kernel. Since there were hundreds patches, we had to make an all-in-one patch for each IP/feature. See below links for LSDK kernel. https://lsdk.github.io/components.html https://source.codeaurora.org/external/qoriq/qoriq-components/linux - Non-LSDK kernel patches Other patches which were not in LSDK were just put in patches-4.14. Kept below patches from patches-4.9. 303-dts-layerscape-add-traverse-ls1043.patch 821-add-esdhc-vsel-to-ls1043.patch 822-rgmii-fixed-link.patch Renamed and rebase them as below in patches-4.14, 303-add-DTS-for-Traverse-LS1043-Boards.patch 712-sdk-dpaa-rgmii-fixed-link.patch 824-mmc-sdhci-of-esdhc-add-voltage-switch-support-for-ls.patch Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Signed-off-by: Biwen Li <biwen.li@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch')
-rw-r--r--target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch b/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
new file mode 100644
index 0000000000..fa6779caa3
--- /dev/null
+++ b/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
@@ -0,0 +1,52 @@
+From 558ca1294aa2bf7f29d55361d2f18c6dc534e1d6 Mon Sep 17 00:00:00 2001
+From: Biwen Li <biwen.li@nxp.com>
+Date: Tue, 30 Oct 2018 18:28:33 +0800
+Subject: [PATCH 39/40] uart: support layerscape
+This is an integrated patch of uart for layerscape
+
+Signed-off-by: Sriram Dash <Sriram.dash@nxp.com>
+Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
+Signed-off-by: Biwen Li <biwen.li@nxp.com>
+---
+ drivers/tty/serial/fsl_lpuart.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- a/drivers/tty/serial/fsl_lpuart.c
++++ b/drivers/tty/serial/fsl_lpuart.c
+@@ -236,6 +236,8 @@
+ /* IMX lpuart has four extra unused regs located at the beginning */
+ #define IMX_REG_OFF 0x10
+
++static DECLARE_BITMAP(linemap, UART_NR);
++
+ struct lpuart_port {
+ struct uart_port port;
+ struct clk *clk;
+@@ -2149,13 +2151,13 @@ static int lpuart_probe(struct platform_
+
+ ret = of_alias_get_id(np, "serial");
+ if (ret < 0) {
+- dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
+- return ret;
+- }
+- if (ret >= ARRAY_SIZE(lpuart_ports)) {
+- dev_err(&pdev->dev, "serial%d out of range\n", ret);
+- return -EINVAL;
++ ret = find_first_zero_bit(linemap, UART_NR);
++ if (ret >= UART_NR) {
++ dev_err(&pdev->dev, "port line is full, add device failed\n");
++ return ret;
++ }
+ }
++ set_bit(ret, linemap);
+ sport->port.line = ret;
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ sport->port.membase = devm_ioremap_resource(&pdev->dev, res);
+@@ -2246,6 +2248,7 @@ static int lpuart_remove(struct platform
+ struct lpuart_port *sport = platform_get_drvdata(pdev);
+
+ uart_remove_one_port(&lpuart_reg, &sport->port);
++ clear_bit(sport->port.line, linemap);
+
+ clk_disable_unprepare(sport->clk);
+