layerscape: update patches-4.14 to LSDK 19.03

[openwrt/staging/dedeckeh.git] / target / linux / layerscape / patches-4.14 / 803-flextimer-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.14/803-flextimer-support-layerscape.patch b/target/linux/layerscape/patches-4.14/803-flextimer-support-layerscape.patch
index 55ee185111a163bf45500a74487374453669ef52..b3616f040d17fff3b8b66216dd82a96b6368ecc9 100644 (file)
--- a/target/linux/layerscape/patches-4.14/803-flextimer-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/803-flextimer-support-layerscape.patch
@@ -1,18 +1,19 @@
-From d586effc9b71ddf240fb294b1ab1205bbe6fec4b Mon Sep 17 00:00:00 2001
+From 0f31298eb0a9b2cd7990b709ff18229fadfa474b Mon Sep 17 00:00:00 2001
 From: Biwen Li <biwen.li@nxp.com>
-Date: Tue, 30 Oct 2018 18:26:32 +0800
-Subject: [PATCH 20/40] flextimer: support layerscape
+Date: Wed, 17 Apr 2019 18:58:38 +0800
+Subject: [PATCH] flextimer: support layerscape
+
 This is an integrated patch of flextimer for layerscape
 
+Signed-off-by: Biwen Li <biwen.li@nxp.com>
 Signed-off-by: Meng Yi <meng.yi@nxp.com>
 Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
 Signed-off-by: Zhang Ying-22455 <ying.zhang22455@nxp.com>
-Signed-off-by: Biwen Li <biwen.li@nxp.com>
 ---
  .../bindings/soc/fsl/layerscape/ftm-alarm.txt |  32 ++
  drivers/clocksource/fsl_ftm_timer.c           |   8 +-
- drivers/soc/fsl/layerscape/ftm_alarm.c        | 375 ++++++++++++++++++
- 3 files changed, 411 insertions(+), 4 deletions(-)
+ drivers/soc/fsl/layerscape/ftm_alarm.c        | 382 ++++++++++++++++++
+ 3 files changed, 418 insertions(+), 4 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/soc/fsl/layerscape/ftm-alarm.txt
  create mode 100644 drivers/soc/fsl/layerscape/ftm_alarm.c
 
@@ -71,7 +72,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  static inline void ftm_irq_enable(void __iomem *base)
 --- /dev/null
 +++ b/drivers/soc/fsl/layerscape/ftm_alarm.c
-@@ -0,0 +1,375 @@
+@@ -0,0 +1,382 @@
 +/*
 + * Freescale FlexTimer Module (FTM) Alarm driver.
 + *
@@ -159,6 +160,11 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
 +      .flextimer_set_bit = 0x4000,
 +};
 +
++static struct rcpm_cfg lx2160a_rcpm_cfg = {
++      .big_endian = LITTLE_ENDIAN,
++      .flextimer_set_bit = 0x4000,
++};
++
 +static const struct of_device_id ippdexpcr_of_match[] = {
 +      { .compatible = "fsl,ls1012a-ftm-alarm", .data = &ls1012a_rcpm_cfg},
 +      { .compatible = "fsl,ls1021a-ftm-alarm", .data = &ls1021a_rcpm_cfg},
@@ -166,6 +172,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
 +      { .compatible = "fsl,ls1046a-ftm-alarm", .data = &ls1046a_rcpm_cfg},
 +      { .compatible = "fsl,ls1088a-ftm-alarm", .data = &ls1088a_rcpm_cfg},
 +      { .compatible = "fsl,ls208xa-ftm-alarm", .data = &ls208xa_rcpm_cfg},
++      { .compatible = "fsl,lx2160a-ftm-alarm", .data = &lx2160a_rcpm_cfg},
 +      {},
 +};
 +MODULE_DEVICE_TABLE(of, ippdexpcr_of_match);
@@ -429,6 +436,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
 +      { .compatible = "fsl,ls1046a-ftm-alarm", },
 +      { .compatible = "fsl,ls1088a-ftm-alarm", },
 +      { .compatible = "fsl,ls208xa-ftm-alarm", },
++      { .compatible = "fsl,lx2160a-ftm-alarm", },
 +      { .compatible = "fsl,ftm-timer", },
 +      { },
 +};