projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.9 to 4.9.117 for 18.06
[oweals/openwrt.git]
/
target
/
linux
/
layerscape
/
patches-4.9
/
806-flextimer-support-layerscape.patch
diff --git
a/target/linux/layerscape/patches-4.9/806-flextimer-support-layerscape.patch
b/target/linux/layerscape/patches-4.9/806-flextimer-support-layerscape.patch
index 4f7fe70a8db3da33c8d03a68b9042a7c2b48b3a9..9826d822e9375c3ccdcb2b46f5c8fdf84fabffe3 100644
(file)
--- a/
target/linux/layerscape/patches-4.9/806-flextimer-support-layerscape.patch
+++ b/
target/linux/layerscape/patches-4.9/806-flextimer-support-layerscape.patch
@@
-1,9
+1,9
@@
-From
76cd2ef6b69b67c09480a3248f7b910897f0bb2f
Mon Sep 17 00:00:00 2001
+From
b92e223750a07b28f175eae97d5ce3978df41be8
Mon Sep 17 00:00:00 2001
From: Yangbo Lu <yangbo.lu@nxp.com>
From: Yangbo Lu <yangbo.lu@nxp.com>
-Date:
Mon, 25 Sep 2017 12:13:12
+0800
-Subject: [PATCH] flextimer: support layerscape
+Date:
Wed, 17 Jan 2018 15:32:05
+0800
+Subject: [PATCH
18/30
] flextimer: support layerscape
-This is a integrated patch for layerscape flextimer support.
+This is a
n
integrated patch for layerscape flextimer support.
Signed-off-by: Wang Dongsheng <dongsheng.wang@nxp.com>
Signed-off-by: Meng Yi <meng.yi@nxp.com>
Signed-off-by: Wang Dongsheng <dongsheng.wang@nxp.com>
Signed-off-by: Meng Yi <meng.yi@nxp.com>
@@
-14,11
+14,9
@@
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
2 files changed, 371 insertions(+), 4 deletions(-)
create mode 100644 drivers/soc/fsl/layerscape/ftm_alarm.c
2 files changed, 371 insertions(+), 4 deletions(-)
create mode 100644 drivers/soc/fsl/layerscape/ftm_alarm.c
-diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c
-index 738515b8..770bbbca 100644
--- a/drivers/clocksource/fsl_ftm_timer.c
+++ b/drivers/clocksource/fsl_ftm_timer.c
--- a/drivers/clocksource/fsl_ftm_timer.c
+++ b/drivers/clocksource/fsl_ftm_timer.c
-@@ -83,11 +83,11 @@ static inline void ftm_counter_disable(v
oid __iomem *base)
+@@ -83,11 +83,11 @@ static inline void ftm_counter_disable(v
static inline void ftm_irq_acknowledge(void __iomem *base)
{
static inline void ftm_irq_acknowledge(void __iomem *base)
{
@@
-34,9
+32,6
@@
index 738515b8..770bbbca 100644
}
static inline void ftm_irq_enable(void __iomem *base)
}
static inline void ftm_irq_enable(void __iomem *base)
-diff --git a/drivers/soc/fsl/layerscape/ftm_alarm.c b/drivers/soc/fsl/layerscape/ftm_alarm.c
-new file mode 100644
-index 00000000..49865b0b
--- /dev/null
+++ b/drivers/soc/fsl/layerscape/ftm_alarm.c
@@ -0,0 +1,367 @@
--- /dev/null
+++ b/drivers/soc/fsl/layerscape/ftm_alarm.c
@@ -0,0 +1,367 @@
@@
-407,6
+402,3
@@
index 00000000..49865b0b
+ return platform_driver_register(&ftm_alarm_driver);
+}
+device_initcall(ftm_alarm_init);
+ return platform_driver_register(&ftm_alarm_driver);
+}
+device_initcall(ftm_alarm_init);
---
-2.14.1
-