* [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap
@ 2018-01-02 10:09 Keerthy
2018-01-02 10:09 ` [PATCH v6 01/10] clocksource: dmtimer: Remove all the exports Keerthy
` (10 more replies)
0 siblings, 11 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
The series moves dmtimer out of plat-omap to drivers/clocksource.
The series also does a bunch of changes to pwm-omap-dmtimer code
to adapt to the driver migration and clean up plat specific
pdata-quirks and use the dmtimer platform data.
Boot tested on DRA7-EVM and AM437X-GP-EVM.
Compile tested omap1_defconfig.
This is based on top of linux-next branch.
This is tested on on IGEPv2 (OMAP3430 based) by Ladis.
Changes from V5:
* Added couple of fixes from Ladis for pwm-dmtimer.
Changes from v4:
* Made OMAP_DM_TIMER config option silent.
* Changed the driver name to timer-dm.c
Changes from v3:
* Reverted to v2 approach of using dev_get_platdata to fetch dmtimer ops.
Changes from V2:
* Wrapped the inline functions in header file under OMAP2PLUS
* Added a new of helper function to fetch plat_data from of node.
Keerthy (8):
clocksource: dmtimer: Remove all the exports
arm: omap: timer: Wrap the inline functions under OMAP2PLUS define
arm: omap: Move dmtimer.h out of plat-omap
arm: OMAP: Move dmtimer driver out of plat-omap to drivers under
clocksource
dmtimer: Add timer ops to the platform data structure
clocksource: dmtimer: Populate the timer ops to the pdata
pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
arm: omap: pdata-quirks: Remove unused timer pdata
Ladislav Michl (2):
clocksource: timer-dm: Hook device platform data if not already
assigned
clocksource: timer-dm: Check prescaler value
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap1/timer.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +-
arch/arm/mach-omap2/pdata-quirks.c | 32 -----------
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/plat-omap/Kconfig | 6 --
arch/arm/plat-omap/Makefile | 1 -
drivers/clocksource/Kconfig | 3 +
drivers/clocksource/Makefile | 1 +
.../dmtimer.c => drivers/clocksource/timer-dm.c | 67 +++++++++++-----------
drivers/pwm/pwm-omap-dmtimer.c | 39 +++++++------
.../include/plat => include/clocksource}/dmtimer.h | 8 ++-
include/linux/platform_data/dmtimer-omap.h | 38 ++++++++++++
20 files changed, 117 insertions(+), 100 deletions(-)
rename arch/arm/plat-omap/dmtimer.c => drivers/clocksource/timer-dm.c (94%)
rename {arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h (97%)
--
1.9.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v6 01/10] clocksource: dmtimer: Remove all the exports
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 02/10] arm: omap: timer: Wrap the inline functions under OMAP2PLUS define Keerthy
` (9 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
Remove all the unwanted exports from the driver
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
arch/arm/plat-omap/dmtimer.c | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index d443e48..72565fc 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -302,7 +302,6 @@ struct omap_dm_timer *omap_dm_timer_request(void)
{
return _omap_dm_timer_request(REQUEST_ANY, NULL);
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_request);
struct omap_dm_timer *omap_dm_timer_request_specific(int id)
{
@@ -315,7 +314,6 @@ struct omap_dm_timer *omap_dm_timer_request_specific(int id)
return _omap_dm_timer_request(REQUEST_BY_ID, &id);
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_request_specific);
/**
* omap_dm_timer_request_by_cap - Request a timer by capability
@@ -330,7 +328,6 @@ struct omap_dm_timer *omap_dm_timer_request_by_cap(u32 cap)
{
return _omap_dm_timer_request(REQUEST_BY_CAP, &cap);
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_request_by_cap);
/**
* omap_dm_timer_request_by_node - Request a timer by device-tree node
@@ -346,7 +343,6 @@ struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np)
return _omap_dm_timer_request(REQUEST_BY_NODE, np);
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_request_by_node);
int omap_dm_timer_free(struct omap_dm_timer *timer)
{
@@ -359,7 +355,6 @@ int omap_dm_timer_free(struct omap_dm_timer *timer)
timer->reserved = 0;
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_free);
void omap_dm_timer_enable(struct omap_dm_timer *timer)
{
@@ -379,13 +374,11 @@ void omap_dm_timer_enable(struct omap_dm_timer *timer)
}
}
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_enable);
void omap_dm_timer_disable(struct omap_dm_timer *timer)
{
pm_runtime_put_sync(&timer->pdev->dev);
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_disable);
int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
{
@@ -393,7 +386,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
return timer->irq;
return -EINVAL;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_get_irq);
#if defined(CONFIG_ARCH_OMAP1)
#include <mach/hardware.h>
@@ -429,7 +421,6 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
return inputmask;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);
#else
@@ -439,7 +430,6 @@ struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
return timer->fclk;
return NULL;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_get_fclk);
__u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
{
@@ -447,7 +437,6 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);
#endif
@@ -461,7 +450,6 @@ int omap_dm_timer_trigger(struct omap_dm_timer *timer)
omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_trigger);
int omap_dm_timer_start(struct omap_dm_timer *timer)
{
@@ -482,7 +470,6 @@ int omap_dm_timer_start(struct omap_dm_timer *timer)
timer->context.tclr = l;
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_start);
int omap_dm_timer_stop(struct omap_dm_timer *timer)
{
@@ -506,7 +493,6 @@ int omap_dm_timer_stop(struct omap_dm_timer *timer)
omap_dm_timer_disable(timer);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_stop);
int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
{
@@ -569,7 +555,6 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
return ret;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_source);
int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
unsigned int load)
@@ -595,7 +580,6 @@ int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
omap_dm_timer_disable(timer);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_load);
/* Optimized set_load which removes costly spin wait in timer_start */
int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
@@ -625,7 +609,6 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
timer->context.tcrr = load;
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_load_start);
int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,
unsigned int match)
@@ -650,7 +633,6 @@ int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,
omap_dm_timer_disable(timer);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_match);
int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,
int toggle, int trigger)
@@ -676,7 +658,6 @@ int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,
omap_dm_timer_disable(timer);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_pwm);
int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
{
@@ -699,7 +680,6 @@ int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
omap_dm_timer_disable(timer);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_prescaler);
int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
unsigned int value)
@@ -716,7 +696,6 @@ int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
omap_dm_timer_disable(timer);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_int_enable);
/**
* omap_dm_timer_set_int_disable - disable timer interrupts
@@ -747,7 +726,6 @@ int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask)
omap_dm_timer_disable(timer);
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_set_int_disable);
unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
{
@@ -762,7 +740,6 @@ unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
return l;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_read_status);
int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)
{
@@ -773,7 +750,6 @@ int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_write_status);
unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)
{
@@ -784,7 +760,6 @@ unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)
return __omap_dm_timer_read_counter(timer, timer->posted);
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_read_counter);
int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)
{
@@ -799,7 +774,6 @@ int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)
timer->context.tcrr = value;
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timer_write_counter);
int omap_dm_timers_active(void)
{
@@ -816,7 +790,6 @@ int omap_dm_timers_active(void)
}
return 0;
}
-EXPORT_SYMBOL_GPL(omap_dm_timers_active);
static const struct of_device_id omap_timer_match[];
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 02/10] arm: omap: timer: Wrap the inline functions under OMAP2PLUS define
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
2018-01-02 10:09 ` [PATCH v6 01/10] clocksource: dmtimer: Remove all the exports Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 03/10] arm: omap: Move dmtimer.h out of plat-omap Keerthy
` (8 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
Wrap the inline functions under OMAP2PLUS/OMAP1 defines.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
arch/arm/plat-omap/include/plat/dmtimer.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h
index dd79f30..862ad62 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -276,6 +276,12 @@ struct omap_dm_timer {
#define OMAP_TIMER_TICK_INT_MASK_COUNT_REG \
(_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT))
+/*
+ * The below are inlined to optimize code size for system timers. Other code
+ * should not need these at all, see
+ * include/linux/platform_data/pwm_omap_dmtimer.h
+ */
+#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2PLUS)
static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg,
int posted)
{
@@ -414,5 +420,5 @@ static inline void __omap_dm_timer_write_status(struct omap_dm_timer *timer,
{
writel_relaxed(value, timer->irq_stat);
}
-
+#endif /* CONFIG_ARCH_OMAP1 || CONFIG_ARCH_OMAP2PLUS */
#endif /* __ASM_ARCH_DMTIMER_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 03/10] arm: omap: Move dmtimer.h out of plat-omap
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
2018-01-02 10:09 ` [PATCH v6 01/10] clocksource: dmtimer: Remove all the exports Keerthy
2018-01-02 10:09 ` [PATCH v6 02/10] arm: omap: timer: Wrap the inline functions under OMAP2PLUS define Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 04/10] arm: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource Keerthy
` (7 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
The header file is currently under plat-omap directory
under arch/omap. Move this out to an accessible place.
No Code changes done to the header file.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap1/timer.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +-
arch/arm/mach-omap2/pdata-quirks.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/plat-omap/dmtimer.c | 2 +-
{arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h | 0
14 files changed, 13 insertions(+), 13 deletions(-)
rename {arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h (100%)
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index f1135bf..a07d47cf 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -55,7 +55,7 @@
#include <mach/tc.h>
#include <mach/mux.h>
#include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include <mach/irqs.h>
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index 8fb1ec6..7c057ab 100644
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -27,7 +27,7 @@
#include <linux/platform_device.h>
#include <linux/platform_data/dmtimer-omap.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "soc.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 1a15a34..45c1043 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -16,7 +16,7 @@
#include <linux/i2c-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "omap_hwmod.h"
#include "l3_2xxx.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 3801850..892ca58 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -18,7 +18,7 @@
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "omap_hwmod.h"
#include "l3_2xxx.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index beec4cd..82b51c0 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -11,7 +11,7 @@
#include <linux/platform_data/gpio-omap.h>
#include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "omap_hwmod.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 52c9d58..310aef5 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -25,7 +25,7 @@
#include "l4_3xxx.h"
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "soc.h"
#include "omap_hwmod.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index c477096..22e0e38 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -30,7 +30,7 @@
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "omap_hwmod.h"
#include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 988e7ea..530334e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -26,7 +26,7 @@
#include <linux/omap-dma.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "omap_hwmod.h"
#include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index d05e553d..adabdef 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -26,7 +26,7 @@
#include <linux/omap-dma.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "omap_hwmod.h"
#include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 84f1182..94f3bb1 100644
--- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@ -18,7 +18,7 @@
#include <linux/platform_data/gpio-omap.h>
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "omap_hwmod_common_data.h"
#include "cm81xx.h"
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 6b433fc..ad9df86 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -27,7 +27,7 @@
#include <linux/platform_data/pwm_omap_dmtimer.h>
#include <linux/platform_data/media/ir-rx51.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
#include "common.h"
#include "common-board-devices.h"
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index ece09c9..31c1b01 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -26,6 +26,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
+#include <clocksource/dmtimer.h>
#include <linux/init.h>
#include <linux/time.h>
#include <linux/interrupt.h>
@@ -49,7 +50,6 @@
#include "omap_hwmod.h"
#include "omap_device.h"
#include <plat/counter-32k.h>
-#include <plat/dmtimer.h>
#include "omap-pm.h"
#include "soc.h"
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 72565fc..afe1dc9 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -47,7 +47,7 @@
#include <linux/platform_device.h>
#include <linux/platform_data/dmtimer-omap.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
static u32 omap_reserved_systimers;
static LIST_HEAD(omap_timer_list);
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/include/clocksource/dmtimer.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/dmtimer.h
rename to include/clocksource/dmtimer.h
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 04/10] arm: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (2 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 03/10] arm: omap: Move dmtimer.h out of plat-omap Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 05/10] dmtimer: Add timer ops to the platform data structure Keerthy
` (6 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
Move the dmtimer driver out of plat-omap to clocksource.
So that non-omap devices also could use this.
No Code changes done to the driver file only renamed to timer-dm.c.
Also removed the config dependencies for OMAP_DM_TIMER.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
arch/arm/plat-omap/Kconfig | 6 ------
arch/arm/plat-omap/Makefile | 1 -
drivers/clocksource/Kconfig | 3 +++
drivers/clocksource/Makefile | 1 +
arch/arm/plat-omap/dmtimer.c => drivers/clocksource/timer-dm.c | 0
5 files changed, 4 insertions(+), 7 deletions(-)
rename arch/arm/plat-omap/dmtimer.c => drivers/clocksource/timer-dm.c (100%)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 7276afe..afc1a1d 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -106,12 +106,6 @@ config OMAP3_L2_AUX_SECURE_SERVICE_SET_ID
help
PPA routine service ID for setting L2 auxiliary control register.
-config OMAP_DM_TIMER
- bool "Use dual-mode timer"
- depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
- help
- Select this option if you want to use OMAP Dual-Mode timers.
-
config OMAP_SERIAL_WAKE
bool "Enable wake-up events for serial ports"
depends on ARCH_OMAP1 && OMAP_MUX
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 47e1867..7215ada 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -9,5 +9,4 @@ obj-y := sram.o dma.o counter_32k.o
# omap_device support (OMAP2+ only at the moment)
-obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index c729a88..3f799b2 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -21,6 +21,9 @@ config CLKEVT_I8253
config I8253_LOCK
bool
+config OMAP_DM_TIMER
+ bool
+
config CLKBLD_I8253
def_bool y if CLKSRC_I8253 || CLKEVT_I8253 || I8253_LOCK
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 72711f1..27b5497 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_EM_TIMER_STI) += em_sti.o
obj-$(CONFIG_CLKBLD_I8253) += i8253.o
obj-$(CONFIG_CLKSRC_MMIO) += mmio.o
obj-$(CONFIG_DIGICOLOR_TIMER) += timer-digicolor.o
+obj-$(CONFIG_OMAP_DM_TIMER) += timer-dm.o
obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o
obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o
obj-$(CONFIG_FTTMR010_TIMER) += timer-fttmr010.o
diff --git a/arch/arm/plat-omap/dmtimer.c b/drivers/clocksource/timer-dm.c
similarity index 100%
rename from arch/arm/plat-omap/dmtimer.c
rename to drivers/clocksource/timer-dm.c
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 05/10] dmtimer: Add timer ops to the platform data structure
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (3 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 04/10] arm: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 06/10] clocksource: dmtimer: Populate the timer ops to the pdata Keerthy
` (5 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
Add timer ops to the platform data structure
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
include/linux/platform_data/dmtimer-omap.h | 38 ++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/include/linux/platform_data/dmtimer-omap.h b/include/linux/platform_data/dmtimer-omap.h
index a19b78d..a3e1794 100644
--- a/include/linux/platform_data/dmtimer-omap.h
+++ b/include/linux/platform_data/dmtimer-omap.h
@@ -20,12 +20,50 @@
#ifndef __PLATFORM_DATA_DMTIMER_OMAP_H__
#define __PLATFORM_DATA_DMTIMER_OMAP_H__
+struct omap_dm_timer_ops {
+ struct omap_dm_timer *(*request_by_node)(struct device_node *np);
+ struct omap_dm_timer *(*request_specific)(int timer_id);
+ struct omap_dm_timer *(*request)(void);
+
+ int (*free)(struct omap_dm_timer *timer);
+
+ void (*enable)(struct omap_dm_timer *timer);
+ void (*disable)(struct omap_dm_timer *timer);
+
+ int (*get_irq)(struct omap_dm_timer *timer);
+ int (*set_int_enable)(struct omap_dm_timer *timer,
+ unsigned int value);
+ int (*set_int_disable)(struct omap_dm_timer *timer, u32 mask);
+
+ struct clk *(*get_fclk)(struct omap_dm_timer *timer);
+
+ int (*start)(struct omap_dm_timer *timer);
+ int (*stop)(struct omap_dm_timer *timer);
+ int (*set_source)(struct omap_dm_timer *timer, int source);
+
+ int (*set_load)(struct omap_dm_timer *timer, int autoreload,
+ unsigned int value);
+ int (*set_match)(struct omap_dm_timer *timer, int enable,
+ unsigned int match);
+ int (*set_pwm)(struct omap_dm_timer *timer, int def_on,
+ int toggle, int trigger);
+ int (*set_prescaler)(struct omap_dm_timer *timer, int prescaler);
+
+ unsigned int (*read_counter)(struct omap_dm_timer *timer);
+ int (*write_counter)(struct omap_dm_timer *timer,
+ unsigned int value);
+ unsigned int (*read_status)(struct omap_dm_timer *timer);
+ int (*write_status)(struct omap_dm_timer *timer,
+ unsigned int value);
+};
+
struct dmtimer_platform_data {
/* set_timer_src - Only used for OMAP1 devices */
int (*set_timer_src)(struct platform_device *pdev, int source);
u32 timer_capability;
u32 timer_errata;
int (*get_context_loss_count)(struct device *);
+ struct omap_dm_timer_ops *timer_ops;
};
#endif /* __PLATFORM_DATA_DMTIMER_OMAP_H__ */
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 06/10] clocksource: dmtimer: Populate the timer ops to the pdata
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (4 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 05/10] dmtimer: Add timer ops to the platform data structure Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 07/10] clocksource: timer-dm: Hook device platform data if not already assigned Keerthy
` (4 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
Add the timer ops to the platform data
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
drivers/clocksource/timer-dm.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
index afe1dc9..1cbd954 100644
--- a/drivers/clocksource/timer-dm.c
+++ b/drivers/clocksource/timer-dm.c
@@ -922,8 +922,33 @@ static int omap_dm_timer_remove(struct platform_device *pdev)
return ret;
}
+static struct omap_dm_timer_ops dmtimer_ops = {
+ .request_by_node = omap_dm_timer_request_by_node,
+ .request_specific = omap_dm_timer_request_specific,
+ .request = omap_dm_timer_request,
+ .set_source = omap_dm_timer_set_source,
+ .get_irq = omap_dm_timer_get_irq,
+ .set_int_enable = omap_dm_timer_set_int_enable,
+ .set_int_disable = omap_dm_timer_set_int_disable,
+ .free = omap_dm_timer_free,
+ .enable = omap_dm_timer_enable,
+ .disable = omap_dm_timer_disable,
+ .get_fclk = omap_dm_timer_get_fclk,
+ .start = omap_dm_timer_start,
+ .stop = omap_dm_timer_stop,
+ .set_load = omap_dm_timer_set_load,
+ .set_match = omap_dm_timer_set_match,
+ .set_pwm = omap_dm_timer_set_pwm,
+ .set_prescaler = omap_dm_timer_set_prescaler,
+ .read_counter = omap_dm_timer_read_counter,
+ .write_counter = omap_dm_timer_write_counter,
+ .read_status = omap_dm_timer_read_status,
+ .write_status = omap_dm_timer_write_status,
+};
+
static const struct dmtimer_platform_data omap3plus_pdata = {
.timer_errata = OMAP_TIMER_ERRATA_I103_I767,
+ .timer_ops = &dmtimer_ops,
};
static const struct of_device_id omap_timer_match[] = {
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 07/10] clocksource: timer-dm: Hook device platform data if not already assigned
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (5 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 06/10] clocksource: dmtimer: Populate the timer ops to the pdata Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops Keerthy
` (3 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
From: Ladislav Michl <ladis@linux-mips.org>
In the case of device tree boot the device platform data is usually
NULL so hook the platform data obtained from the match.
As part of un-constify the platform_data pointer.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Keerthy <j-keerthy@ti.com>
---
drivers/clocksource/timer-dm.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
index 1cbd954..60db173 100644
--- a/drivers/clocksource/timer-dm.c
+++ b/drivers/clocksource/timer-dm.c
@@ -806,14 +806,16 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
struct omap_dm_timer *timer;
struct resource *mem, *irq;
struct device *dev = &pdev->dev;
- const struct of_device_id *match;
const struct dmtimer_platform_data *pdata;
int ret;
- match = of_match_device(of_match_ptr(omap_timer_match), dev);
- pdata = match ? match->data : dev->platform_data;
+ pdata = of_device_get_match_data(dev);
+ if (!pdata)
+ pdata = dev_get_platdata(dev);
+ else
+ dev->platform_data = (void *)pdata;
- if (!pdata && !dev->of_node) {
+ if (!pdata) {
dev_err(dev, "%s: no platform data.\n", __func__);
return -ENODEV;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (6 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 07/10] clocksource: timer-dm: Hook device platform data if not already assigned Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-08 8:44 ` Claudiu Beznea
2018-01-02 10:09 ` [PATCH v6 09/10] arm: omap: pdata-quirks: Remove unused timer pdata Keerthy
` (2 subsequent siblings)
10 siblings, 1 reply; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
index 5ad42f3..3b27aff 100644
--- a/drivers/pwm/pwm-omap-dmtimer.c
+++ b/drivers/pwm/pwm-omap-dmtimer.c
@@ -23,6 +23,7 @@
#include <linux/mutex.h>
#include <linux/of.h>
#include <linux/of_platform.h>
+#include <linux/platform_data/dmtimer-omap.h>
#include <linux/platform_data/pwm_omap_dmtimer.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
@@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip {
struct pwm_chip chip;
struct mutex mutex;
pwm_omap_dmtimer *dm_timer;
- struct pwm_omap_dmtimer_pdata *pdata;
+ struct omap_dm_timer_ops *pdata;
struct platform_device *dm_timer_pdev;
};
@@ -242,19 +243,33 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct device_node *timer;
+ struct platform_device *timer_pdev;
struct pwm_omap_dmtimer_chip *omap;
- struct pwm_omap_dmtimer_pdata *pdata;
+ struct dmtimer_platform_data *timer_pdata;
+ struct omap_dm_timer_ops *pdata;
pwm_omap_dmtimer *dm_timer;
u32 v;
int status;
- pdata = dev_get_platdata(&pdev->dev);
- if (!pdata) {
- dev_err(&pdev->dev, "Missing dmtimer platform data\n");
+ timer = of_parse_phandle(np, "ti,timers", 0);
+ if (!timer)
+ return -ENODEV;
+
+ timer_pdev = of_find_device_by_node(timer);
+ if (!timer_pdev) {
+ dev_err(&pdev->dev, "Unable to find Timer pdev\n");
+ return -ENODEV;
+ }
+
+ timer_pdata = dev_get_platdata(&timer_pdev->dev);
+ if (!timer_pdata) {
+ dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
return -EINVAL;
}
- if (!pdata->request_by_node ||
+ pdata = timer_pdata->timer_ops;
+
+ if (!pdata || !pdata->request_by_node ||
!pdata->free ||
!pdata->enable ||
!pdata->disable ||
@@ -270,10 +285,6 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
return -EINVAL;
}
- timer = of_parse_phandle(np, "ti,timers", 0);
- if (!timer)
- return -ENODEV;
-
if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
return -ENODEV;
@@ -291,13 +302,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
omap->pdata = pdata;
omap->dm_timer = dm_timer;
-
- omap->dm_timer_pdev = of_find_device_by_node(timer);
- if (!omap->dm_timer_pdev) {
- dev_err(&pdev->dev, "Unable to find timer pdev\n");
- omap->pdata->free(dm_timer);
- return -EINVAL;
- }
+ omap->dm_timer_pdev = timer_pdev;
/*
* Ensure that the timer is stopped before we allow PWM core to call
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 09/10] arm: omap: pdata-quirks: Remove unused timer pdata
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (7 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value Keerthy
2018-01-07 15:59 ` [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
Remove unused timer pdata.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Tested-by: Ladislav Michl <ladis@linux-mips.org>
---
arch/arm/mach-omap2/pdata-quirks.c | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index ad9df86..e7d7fc7 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -24,10 +24,8 @@
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/platform_data/iommu-omap.h>
#include <linux/platform_data/wkup_m3.h>
-#include <linux/platform_data/pwm_omap_dmtimer.h>
#include <linux/platform_data/media/ir-rx51.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <clocksource/dmtimer.h>
#include "common.h"
#include "common-board-devices.h"
@@ -477,33 +475,6 @@ void omap_auxdata_legacy_init(struct device *dev)
dev->platform_data = &twl_gpio_auxdata;
}
-/* Dual mode timer PWM callbacks platdata */
-#if IS_ENABLED(CONFIG_OMAP_DM_TIMER)
-static struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {
- .request_by_node = omap_dm_timer_request_by_node,
- .request_specific = omap_dm_timer_request_specific,
- .request = omap_dm_timer_request,
- .set_source = omap_dm_timer_set_source,
- .get_irq = omap_dm_timer_get_irq,
- .set_int_enable = omap_dm_timer_set_int_enable,
- .set_int_disable = omap_dm_timer_set_int_disable,
- .free = omap_dm_timer_free,
- .enable = omap_dm_timer_enable,
- .disable = omap_dm_timer_disable,
- .get_fclk = omap_dm_timer_get_fclk,
- .start = omap_dm_timer_start,
- .stop = omap_dm_timer_stop,
- .set_load = omap_dm_timer_set_load,
- .set_match = omap_dm_timer_set_match,
- .set_pwm = omap_dm_timer_set_pwm,
- .set_prescaler = omap_dm_timer_set_prescaler,
- .read_counter = omap_dm_timer_read_counter,
- .write_counter = omap_dm_timer_write_counter,
- .read_status = omap_dm_timer_read_status,
- .write_status = omap_dm_timer_write_status,
-};
-#endif
-
static struct ir_rx51_platform_data __maybe_unused rx51_ir_data = {
.set_max_mpu_wakeup_lat = omap_pm_set_max_mpu_wakeup_lat,
};
@@ -572,9 +543,6 @@ static void __init omap3_mcbsp_init(void) {}
OF_DEV_AUXDATA("ti,am4372-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
&wkup_m3_data),
#endif
-#if IS_ENABLED(CONFIG_OMAP_DM_TIMER)
- OF_DEV_AUXDATA("ti,omap-dmtimer-pwm", 0, NULL, &pwm_dmtimer_pdata),
-#endif
#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
OF_DEV_AUXDATA("ti,omap4-iommu", 0x4a066000, "4a066000.mmu",
&omap4_iommu_pdata),
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (8 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 09/10] arm: omap: pdata-quirks: Remove unused timer pdata Keerthy
@ 2018-01-02 10:09 ` Keerthy
2018-01-04 22:47 ` Ladislav Michl
2018-01-07 15:59 ` [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
10 siblings, 1 reply; 20+ messages in thread
From: Keerthy @ 2018-01-02 10:09 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo, j-keerthy
From: Ladislav Michl <ladis@linux-mips.org>
Invalid prescaler value is silently ignored. Fix that
by returning -EINVAL in such case. As invalid value
disabled use of the prescaler, use -1 explicitely for
that purpose.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
drivers/clocksource/timer-dm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
index 60db173..01a9cb0 100644
--- a/drivers/clocksource/timer-dm.c
+++ b/drivers/clocksource/timer-dm.c
@@ -672,6 +672,9 @@ int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
if (prescaler >= 0x00 && prescaler <= 0x07) {
l |= OMAP_TIMER_CTRL_PRE;
l |= prescaler << 2;
+ } else {
+ if (prescaler != -1)
+ return -EINVAL;
}
omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value
2018-01-02 10:09 ` [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value Keerthy
@ 2018-01-04 22:47 ` Ladislav Michl
2018-01-07 15:56 ` Keerthy
0 siblings, 1 reply; 20+ messages in thread
From: Ladislav Michl @ 2018-01-04 22:47 UTC (permalink / raw)
To: Keerthy
Cc: daniel.lezcano, tony, aaro.koskinen, thierry.reding,
grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo
On Tue, Jan 02, 2018 at 03:39:59PM +0530, Keerthy wrote:
> From: Ladislav Michl <ladis@linux-mips.org>
>
> Invalid prescaler value is silently ignored. Fix that
> by returning -EINVAL in such case. As invalid value
> disabled use of the prescaler, use -1 explicitely for
> that purpose.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> drivers/clocksource/timer-dm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
> index 60db173..01a9cb0 100644
> --- a/drivers/clocksource/timer-dm.c
> +++ b/drivers/clocksource/timer-dm.c
> @@ -672,6 +672,9 @@ int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
> if (prescaler >= 0x00 && prescaler <= 0x07) {
> l |= OMAP_TIMER_CTRL_PRE;
> l |= prescaler << 2;
> + } else {
> + if (prescaler != -1)
> + return -EINVAL;
Argh... This is actually wrong, as it leaves timer enabled.
I suggest simply dropping this patch and I'll rethink whole
approach a bit later (and better).
> }
> omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
>
Sorry for the noise,
ladis
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value
2018-01-04 22:47 ` Ladislav Michl
@ 2018-01-07 15:56 ` Keerthy
2018-01-07 19:26 ` Ladislav Michl
0 siblings, 1 reply; 20+ messages in thread
From: Keerthy @ 2018-01-07 15:56 UTC (permalink / raw)
To: Ladislav Michl, daniel.lezcano
Cc: tony, aaro.koskinen, thierry.reding, grygorii.strashko,
linux-omap, robh+dt, linux-arm-kernel, linux-pwm,
sebastian.reichel, linux-kernel, t-kristo
On 1/5/2018 4:17 AM, Ladislav Michl wrote:
> On Tue, Jan 02, 2018 at 03:39:59PM +0530, Keerthy wrote:
>> From: Ladislav Michl <ladis@linux-mips.org>
>>
>> Invalid prescaler value is silently ignored. Fix that
>> by returning -EINVAL in such case. As invalid value
>> disabled use of the prescaler, use -1 explicitely for
>> that purpose.
>>
>> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
>> ---
>> drivers/clocksource/timer-dm.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
>> index 60db173..01a9cb0 100644
>> --- a/drivers/clocksource/timer-dm.c
>> +++ b/drivers/clocksource/timer-dm.c
>> @@ -672,6 +672,9 @@ int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
>> if (prescaler >= 0x00 && prescaler <= 0x07) {
>> l |= OMAP_TIMER_CTRL_PRE;
>> l |= prescaler << 2;
>> + } else {
>> + if (prescaler != -1)
>> + return -EINVAL;
>
> Argh... This is actually wrong, as it leaves timer enabled.
> I suggest simply dropping this patch and I'll rethink whole
> approach a bit later (and better).
Okay. I hope the rest 9 patches work well for you.
>
>> }
>> omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
>>
>
> Sorry for the noise,
> ladis
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
` (9 preceding siblings ...)
2018-01-02 10:09 ` [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value Keerthy
@ 2018-01-07 15:59 ` Keerthy
10 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-07 15:59 UTC (permalink / raw)
To: daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: ladis, grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo
On 1/2/2018 3:39 PM, Keerthy wrote:
> The series moves dmtimer out of plat-omap to drivers/clocksource.
> The series also does a bunch of changes to pwm-omap-dmtimer code
> to adapt to the driver migration and clean up plat specific
> pdata-quirks and use the dmtimer platform data.
>
> Boot tested on DRA7-EVM and AM437X-GP-EVM.
> Compile tested omap1_defconfig.
>
> This is based on top of linux-next branch.
>
> This is tested on on IGEPv2 (OMAP3430 based) by Ladis.
Daniel/Theirry,
Let me know if you have any comments on this migration series.
Patch 10/10 from Ladis can be dropped as he plans to rework on that.
Regards,
Keerthy
>
> Changes from V5:
>
> * Added couple of fixes from Ladis for pwm-dmtimer.
>
> Changes from v4:
>
> * Made OMAP_DM_TIMER config option silent.
> * Changed the driver name to timer-dm.c
>
> Changes from v3:
>
> * Reverted to v2 approach of using dev_get_platdata to fetch dmtimer ops.
>
> Changes from V2:
>
> * Wrapped the inline functions in header file under OMAP2PLUS
> * Added a new of helper function to fetch plat_data from of node.
>
> Keerthy (8):
> clocksource: dmtimer: Remove all the exports
> arm: omap: timer: Wrap the inline functions under OMAP2PLUS define
> arm: omap: Move dmtimer.h out of plat-omap
> arm: OMAP: Move dmtimer driver out of plat-omap to drivers under
> clocksource
> dmtimer: Add timer ops to the platform data structure
> clocksource: dmtimer: Populate the timer ops to the pdata
> pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
> arm: omap: pdata-quirks: Remove unused timer pdata
>
> Ladislav Michl (2):
> clocksource: timer-dm: Hook device platform data if not already
> assigned
> clocksource: timer-dm: Check prescaler value
>
> arch/arm/mach-omap1/pm.c | 2 +-
> arch/arm/mach-omap1/timer.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +-
> arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +-
> arch/arm/mach-omap2/pdata-quirks.c | 32 -----------
> arch/arm/mach-omap2/timer.c | 2 +-
> arch/arm/plat-omap/Kconfig | 6 --
> arch/arm/plat-omap/Makefile | 1 -
> drivers/clocksource/Kconfig | 3 +
> drivers/clocksource/Makefile | 1 +
> .../dmtimer.c => drivers/clocksource/timer-dm.c | 67 +++++++++++-----------
> drivers/pwm/pwm-omap-dmtimer.c | 39 +++++++------
> .../include/plat => include/clocksource}/dmtimer.h | 8 ++-
> include/linux/platform_data/dmtimer-omap.h | 38 ++++++++++++
> 20 files changed, 117 insertions(+), 100 deletions(-)
> rename arch/arm/plat-omap/dmtimer.c => drivers/clocksource/timer-dm.c (94%)
> rename {arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h (97%)
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value
2018-01-07 15:56 ` Keerthy
@ 2018-01-07 19:26 ` Ladislav Michl
0 siblings, 0 replies; 20+ messages in thread
From: Ladislav Michl @ 2018-01-07 19:26 UTC (permalink / raw)
To: Keerthy
Cc: daniel.lezcano, tony, aaro.koskinen, thierry.reding,
grygorii.strashko, linux-omap, robh+dt, linux-arm-kernel,
linux-pwm, sebastian.reichel, linux-kernel, t-kristo
On Sun, Jan 07, 2018 at 09:26:44PM +0530, Keerthy wrote:
> On 1/5/2018 4:17 AM, Ladislav Michl wrote:
> > On Tue, Jan 02, 2018 at 03:39:59PM +0530, Keerthy wrote:
> > > From: Ladislav Michl <ladis@linux-mips.org>
> > >
> > > Invalid prescaler value is silently ignored. Fix that
> > > by returning -EINVAL in such case. As invalid value
> > > disabled use of the prescaler, use -1 explicitely for
> > > that purpose.
> > >
> > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > > ---
> > > drivers/clocksource/timer-dm.c | 3 +++
> > > 1 file changed, 3 insertions(+)
> > >
> > > diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
> > > index 60db173..01a9cb0 100644
> > > --- a/drivers/clocksource/timer-dm.c
> > > +++ b/drivers/clocksource/timer-dm.c
> > > @@ -672,6 +672,9 @@ int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
> > > if (prescaler >= 0x00 && prescaler <= 0x07) {
> > > l |= OMAP_TIMER_CTRL_PRE;
> > > l |= prescaler << 2;
> > > + } else {
> > > + if (prescaler != -1)
> > > + return -EINVAL;
> >
> > Argh... This is actually wrong, as it leaves timer enabled.
> > I suggest simply dropping this patch and I'll rethink whole
> > approach a bit later (and better).
>
> Okay. I hope the rest 9 patches work well for you.
Yes. I rebased event capture patches on top of this serie (based on
linux-next) and will post them during next week for review. Fixed
patch will be included (note, it is not really needed for your serie
as noone is calling this function).
> >
> > > }
> > > omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
> >
> > Sorry for the noise,
> > ladis
> >
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
2018-01-02 10:09 ` [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops Keerthy
@ 2018-01-08 8:44 ` Claudiu Beznea
2018-01-08 14:33 ` Keerthy
0 siblings, 1 reply; 20+ messages in thread
From: Claudiu Beznea @ 2018-01-08 8:44 UTC (permalink / raw)
To: Keerthy, daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: linux-pwm, grygorii.strashko, linux-kernel, robh+dt, t-kristo,
ladis, sebastian.reichel, linux-omap, linux-arm-kernel
On 02.01.2018 12:09, Keerthy wrote:
> Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.
>
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> Tested-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
> 1 file changed, 22 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
> index 5ad42f3..3b27aff 100644
> --- a/drivers/pwm/pwm-omap-dmtimer.c
> +++ b/drivers/pwm/pwm-omap-dmtimer.c
> @@ -23,6 +23,7 @@
> #include <linux/mutex.h>
> #include <linux/of.h>
> #include <linux/of_platform.h>
> +#include <linux/platform_data/dmtimer-omap.h>
> #include <linux/platform_data/pwm_omap_dmtimer.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> @@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip {
> struct pwm_chip chip;
> struct mutex mutex;
> pwm_omap_dmtimer *dm_timer;
> - struct pwm_omap_dmtimer_pdata *pdata;
> + struct omap_dm_timer_ops *pdata;
> struct platform_device *dm_timer_pdev;
> };
>
> @@ -242,19 +243,33 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
> {
> struct device_node *np = pdev->dev.of_node;
> struct device_node *timer;
> + struct platform_device *timer_pdev;
> struct pwm_omap_dmtimer_chip *omap;
> - struct pwm_omap_dmtimer_pdata *pdata;
> + struct dmtimer_platform_data *timer_pdata;
> + struct omap_dm_timer_ops *pdata;
> pwm_omap_dmtimer *dm_timer;
> u32 v;
> int status;
>
> - pdata = dev_get_platdata(&pdev->dev);
> - if (!pdata) {
> - dev_err(&pdev->dev, "Missing dmtimer platform data\n");
> + timer = of_parse_phandle(np, "ti,timers", 0);
of_node_put() should be called when done with device_node pointer returned
by of_parse_phandle() (you may want to check the return ERROR cases below
regarding this statement):
> + if (!timer)
> + return -ENODEV;
> +
> + timer_pdev = of_find_device_by_node(timer);
> + if (!timer_pdev) {
> + dev_err(&pdev->dev, "Unable to find Timer pdev\n");
here
> + return -ENODEV;
> + }
> +
> + timer_pdata = dev_get_platdata(&timer_pdev->dev);
> + if (!timer_pdata) {
> + dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
here
> return -EINVAL;
> }
>
> - if (!pdata->request_by_node ||
> + pdata = timer_pdata->timer_ops;
> +
> + if (!pdata || !pdata->request_by_node ||
> !pdata->free ||
> !pdata->enable ||
> !pdata->disable ||
> @@ -270,10 +285,6 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
> return -EINVAL;
> }
>
> - timer = of_parse_phandle(np, "ti,timers", 0);
> - if (!timer)
> - return -ENODEV;
> -
> if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
here
> dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
> return -ENODEV;
> @@ -291,13 +302,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>
> omap->pdata = pdata;
> omap->dm_timer = dm_timer;
> -
> - omap->dm_timer_pdev = of_find_device_by_node(timer);
> - if (!omap->dm_timer_pdev) {
> - dev_err(&pdev->dev, "Unable to find timer pdev\n");
> - omap->pdata->free(dm_timer);
> - return -EINVAL;
> - }
> + omap->dm_timer_pdev = timer_pdev;
>
> /*
> * Ensure that the timer is stopped before we allow PWM core to call
>
And all the other return instructions from probe function not listed by git diff
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
2018-01-08 8:44 ` Claudiu Beznea
@ 2018-01-08 14:33 ` Keerthy
2018-01-08 14:44 ` Neil Armstrong
0 siblings, 1 reply; 20+ messages in thread
From: Keerthy @ 2018-01-08 14:33 UTC (permalink / raw)
To: Claudiu Beznea, daniel.lezcano, tony, aaro.koskinen, thierry.reding
Cc: linux-pwm, grygorii.strashko, linux-kernel, robh+dt, t-kristo,
ladis, sebastian.reichel, linux-omap, linux-arm-kernel
On Monday 08 January 2018 02:14 PM, Claudiu Beznea wrote:
>
>
> On 02.01.2018 12:09, Keerthy wrote:
>> Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.
>>
>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>> Tested-by: Ladislav Michl <ladis@linux-mips.org>
>> ---
>> drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
>> 1 file changed, 22 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
>> index 5ad42f3..3b27aff 100644
>> --- a/drivers/pwm/pwm-omap-dmtimer.c
>> +++ b/drivers/pwm/pwm-omap-dmtimer.c
>> @@ -23,6 +23,7 @@
>> #include <linux/mutex.h>
>> #include <linux/of.h>
>> #include <linux/of_platform.h>
>> +#include <linux/platform_data/dmtimer-omap.h>
>> #include <linux/platform_data/pwm_omap_dmtimer.h>
>> #include <linux/platform_device.h>
>> #include <linux/pm_runtime.h>
>> @@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip {
>> struct pwm_chip chip;
>> struct mutex mutex;
>> pwm_omap_dmtimer *dm_timer;
>> - struct pwm_omap_dmtimer_pdata *pdata;
>> + struct omap_dm_timer_ops *pdata;
>> struct platform_device *dm_timer_pdev;
>> };
>>
>> @@ -242,19 +243,33 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>> {
>> struct device_node *np = pdev->dev.of_node;
>> struct device_node *timer;
>> + struct platform_device *timer_pdev;
>> struct pwm_omap_dmtimer_chip *omap;
>> - struct pwm_omap_dmtimer_pdata *pdata;
>> + struct dmtimer_platform_data *timer_pdata;
>> + struct omap_dm_timer_ops *pdata;
>> pwm_omap_dmtimer *dm_timer;
>> u32 v;
>> int status;
>>
>> - pdata = dev_get_platdata(&pdev->dev);
>> - if (!pdata) {
>> - dev_err(&pdev->dev, "Missing dmtimer platform data\n");
>> + timer = of_parse_phandle(np, "ti,timers", 0);
> of_node_put() should be called when done with device_node pointer returned
> by of_parse_phandle() (you may want to check the return ERROR cases below
> regarding this statement):
>> + if (!timer)
>> + return -ENODEV;
>> +
>> + timer_pdev = of_find_device_by_node(timer);
>> + if (!timer_pdev) {
>> + dev_err(&pdev->dev, "Unable to find Timer pdev\n");
> here
>> + return -ENODEV;
>> + }
>> +
>> + timer_pdata = dev_get_platdata(&timer_pdev->dev);
>> + if (!timer_pdata) {
>> + dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
> here
>> return -EINVAL;
>> }
>>
>> - if (!pdata->request_by_node ||
>> + pdata = timer_pdata->timer_ops;
>> +
>> + if (!pdata || !pdata->request_by_node ||
>> !pdata->free ||
>> !pdata->enable ||
>> !pdata->disable ||
>> @@ -270,10 +285,6 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>> return -EINVAL;
>> }
>>
>> - timer = of_parse_phandle(np, "ti,timers", 0);
>> - if (!timer)
>> - return -ENODEV;
>> -
>> if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
> here
>> dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
>> return -ENODEV;
>> @@ -291,13 +302,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>
>> omap->pdata = pdata;
>> omap->dm_timer = dm_timer;
>> -
>> - omap->dm_timer_pdev = of_find_device_by_node(timer);
>> - if (!omap->dm_timer_pdev) {
>> - dev_err(&pdev->dev, "Unable to find timer pdev\n");
>> - omap->pdata->free(dm_timer);
>> - return -EINVAL;
>> - }
>> + omap->dm_timer_pdev = timer_pdev;
>>
>> /*
>> * Ensure that the timer is stopped before we allow PWM core to call
>>
> And all the other return instructions from probe function not listed by git diff
Thanks for reviewing. I will add the of_node_put call for all the error
paths.
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
2018-01-08 14:33 ` Keerthy
@ 2018-01-08 14:44 ` Neil Armstrong
2018-01-08 14:47 ` Claudiu Beznea
0 siblings, 1 reply; 20+ messages in thread
From: Neil Armstrong @ 2018-01-08 14:44 UTC (permalink / raw)
To: Keerthy, Claudiu Beznea, daniel.lezcano, tony, aaro.koskinen,
thierry.reding
Cc: linux-pwm, ladis, linux-kernel, robh+dt, t-kristo,
grygorii.strashko, sebastian.reichel, linux-omap,
linux-arm-kernel
On 08/01/2018 15:33, Keerthy wrote:
>
>
> On Monday 08 January 2018 02:14 PM, Claudiu Beznea wrote:
>>
>>
>> On 02.01.2018 12:09, Keerthy wrote:
>>> Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.
>>>
>>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>>> Tested-by: Ladislav Michl <ladis@linux-mips.org>
>>> ---
>>> drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
>>> 1 file changed, 22 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
>>> index 5ad42f3..3b27aff 100644
>>> --- a/drivers/pwm/pwm-omap-dmtimer.c
>>> +++ b/drivers/pwm/pwm-omap-dmtimer.c
>>> @@ -23,6 +23,7 @@
>>> #include <linux/mutex.h>
>>> #include <linux/of.h>
>>> #include <linux/of_platform.h>
>>> +#include <linux/platform_data/dmtimer-omap.h>
>>> #include <linux/platform_data/pwm_omap_dmtimer.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/pm_runtime.h>
>>> @@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip {
>>> struct pwm_chip chip;
>>> struct mutex mutex;
>>> pwm_omap_dmtimer *dm_timer;
>>> - struct pwm_omap_dmtimer_pdata *pdata;
>>> + struct omap_dm_timer_ops *pdata;
>>> struct platform_device *dm_timer_pdev;
>>> };
>>>
>>> @@ -242,19 +243,33 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>> {
>>> struct device_node *np = pdev->dev.of_node;
>>> struct device_node *timer;
>>> + struct platform_device *timer_pdev;
>>> struct pwm_omap_dmtimer_chip *omap;
>>> - struct pwm_omap_dmtimer_pdata *pdata;
>>> + struct dmtimer_platform_data *timer_pdata;
>>> + struct omap_dm_timer_ops *pdata;
>>> pwm_omap_dmtimer *dm_timer;
>>> u32 v;
>>> int status;
>>>
>>> - pdata = dev_get_platdata(&pdev->dev);
>>> - if (!pdata) {
>>> - dev_err(&pdev->dev, "Missing dmtimer platform data\n");
>>> + timer = of_parse_phandle(np, "ti,timers", 0);
>> of_node_put() should be called when done with device_node pointer returned
>> by of_parse_phandle() (you may want to check the return ERROR cases below
>> regarding this statement):
>>> + if (!timer)
>>> + return -ENODEV;
>>> +
>>> + timer_pdev = of_find_device_by_node(timer);
>>> + if (!timer_pdev) {
>>> + dev_err(&pdev->dev, "Unable to find Timer pdev\n");
>> here
>>> + return -ENODEV;
>>> + }
>>> +
>>> + timer_pdata = dev_get_platdata(&timer_pdev->dev);
>>> + if (!timer_pdata) {
>>> + dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
>> here
>>> return -EINVAL;
>>> }
>>>
>>> - if (!pdata->request_by_node ||
>>> + pdata = timer_pdata->timer_ops;
>>> +
>>> + if (!pdata || !pdata->request_by_node ||
>>> !pdata->free ||
>>> !pdata->enable ||
>>> !pdata->disable ||
>>> @@ -270,10 +285,6 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>> return -EINVAL;
>>> }
>>>
>>> - timer = of_parse_phandle(np, "ti,timers", 0);
>>> - if (!timer)
>>> - return -ENODEV;
>>> -
>>> if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
>> here
>>> dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
>>> return -ENODEV;
>>> @@ -291,13 +302,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>>
>>> omap->pdata = pdata;
>>> omap->dm_timer = dm_timer;
>>> -
>>> - omap->dm_timer_pdev = of_find_device_by_node(timer);
>>> - if (!omap->dm_timer_pdev) {
>>> - dev_err(&pdev->dev, "Unable to find timer pdev\n");
>>> - omap->pdata->free(dm_timer);
>>> - return -EINVAL;
>>> - }
>>> + omap->dm_timer_pdev = timer_pdev;
>>>
>>> /*
>>> * Ensure that the timer is stopped before we allow PWM core to call
>>>
>> And all the other return instructions from probe function not listed by git diff
>
> Thanks for reviewing. I will add the of_node_put call for all the error
> paths.
>
>>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Apart the missing of_node_put() :
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
2018-01-08 14:44 ` Neil Armstrong
@ 2018-01-08 14:47 ` Claudiu Beznea
2018-01-08 16:24 ` Keerthy
0 siblings, 1 reply; 20+ messages in thread
From: Claudiu Beznea @ 2018-01-08 14:47 UTC (permalink / raw)
To: Neil Armstrong, Keerthy, daniel.lezcano, tony, aaro.koskinen,
thierry.reding
Cc: linux-pwm, ladis, linux-kernel, robh+dt, t-kristo,
grygorii.strashko, sebastian.reichel, linux-omap,
linux-arm-kernel
On 08.01.2018 16:44, Neil Armstrong wrote:
> On 08/01/2018 15:33, Keerthy wrote:
>>
>>
>> On Monday 08 January 2018 02:14 PM, Claudiu Beznea wrote:
>>>
>>>
>>> On 02.01.2018 12:09, Keerthy wrote:
>>>> Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.
>>>>
>>>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>>>> Tested-by: Ladislav Michl <ladis@linux-mips.org>
>>>> ---
>>>> drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
>>>> 1 file changed, 22 insertions(+), 17 deletions(-)
>>>>
>>>> diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
>>>> index 5ad42f3..3b27aff 100644
>>>> --- a/drivers/pwm/pwm-omap-dmtimer.c
>>>> +++ b/drivers/pwm/pwm-omap-dmtimer.c
>>>> @@ -23,6 +23,7 @@
>>>> #include <linux/mutex.h>
>>>> #include <linux/of.h>
>>>> #include <linux/of_platform.h>
>>>> +#include <linux/platform_data/dmtimer-omap.h>
>>>> #include <linux/platform_data/pwm_omap_dmtimer.h>
>>>> #include <linux/platform_device.h>
>>>> #include <linux/pm_runtime.h>
>>>> @@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip {
>>>> struct pwm_chip chip;
>>>> struct mutex mutex;
>>>> pwm_omap_dmtimer *dm_timer;
>>>> - struct pwm_omap_dmtimer_pdata *pdata;
>>>> + struct omap_dm_timer_ops *pdata;
>>>> struct platform_device *dm_timer_pdev;
>>>> };
>>>>
>>>> @@ -242,19 +243,33 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>>> {
>>>> struct device_node *np = pdev->dev.of_node;
>>>> struct device_node *timer;
>>>> + struct platform_device *timer_pdev;
>>>> struct pwm_omap_dmtimer_chip *omap;
>>>> - struct pwm_omap_dmtimer_pdata *pdata;
>>>> + struct dmtimer_platform_data *timer_pdata;
>>>> + struct omap_dm_timer_ops *pdata;
>>>> pwm_omap_dmtimer *dm_timer;
>>>> u32 v;
>>>> int status;
>>>>
>>>> - pdata = dev_get_platdata(&pdev->dev);
>>>> - if (!pdata) {
>>>> - dev_err(&pdev->dev, "Missing dmtimer platform data\n");
>>>> + timer = of_parse_phandle(np, "ti,timers", 0);
>>> of_node_put() should be called when done with device_node pointer returned
>>> by of_parse_phandle() (you may want to check the return ERROR cases below
>>> regarding this statement):
>>>> + if (!timer)
>>>> + return -ENODEV;
>>>> +
>>>> + timer_pdev = of_find_device_by_node(timer);
>>>> + if (!timer_pdev) {
>>>> + dev_err(&pdev->dev, "Unable to find Timer pdev\n");
>>> here
>>>> + return -ENODEV;
>>>> + }
>>>> +
>>>> + timer_pdata = dev_get_platdata(&timer_pdev->dev);
>>>> + if (!timer_pdata) {
>>>> + dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
>>> here
>>>> return -EINVAL;
>>>> }
>>>>
>>>> - if (!pdata->request_by_node ||
>>>> + pdata = timer_pdata->timer_ops;
>>>> +
>>>> + if (!pdata || !pdata->request_by_node ||
>>>> !pdata->free ||
>>>> !pdata->enable ||
>>>> !pdata->disable ||
>>>> @@ -270,10 +285,6 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>>> return -EINVAL;
>>>> }
>>>>
>>>> - timer = of_parse_phandle(np, "ti,timers", 0);
>>>> - if (!timer)
>>>> - return -ENODEV;
>>>> -
>>>> if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
>>> here
>>>> dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
>>>> return -ENODEV;
>>>> @@ -291,13 +302,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>>>
>>>> omap->pdata = pdata;
>>>> omap->dm_timer = dm_timer;
>>>> -
>>>> - omap->dm_timer_pdev = of_find_device_by_node(timer);
>>>> - if (!omap->dm_timer_pdev) {
>>>> - dev_err(&pdev->dev, "Unable to find timer pdev\n");
>>>> - omap->pdata->free(dm_timer);
>>>> - return -EINVAL;
>>>> - }
>>>> + omap->dm_timer_pdev = timer_pdev;
>>>>
>>>> /*
>>>> * Ensure that the timer is stopped before we allow PWM core to call
>>>>
>>> And all the other return instructions from probe function not listed by git diff
>>
>> Thanks for reviewing. I will add the of_node_put call for all the error
>> paths.
After that you can add: Reviwed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
>>
>>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>
> Apart the missing of_node_put() :
>
> Acked-by: Neil Armstrong <narmstrong@baylibre.com>
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
2018-01-08 14:47 ` Claudiu Beznea
@ 2018-01-08 16:24 ` Keerthy
0 siblings, 0 replies; 20+ messages in thread
From: Keerthy @ 2018-01-08 16:24 UTC (permalink / raw)
To: Claudiu Beznea, Neil Armstrong, daniel.lezcano, tony,
aaro.koskinen, thierry.reding
Cc: linux-pwm, ladis, linux-kernel, robh+dt, t-kristo,
grygorii.strashko, sebastian.reichel, linux-omap,
linux-arm-kernel
On 1/8/2018 8:17 PM, Claudiu Beznea wrote:
>
>
> On 08.01.2018 16:44, Neil Armstrong wrote:
>> On 08/01/2018 15:33, Keerthy wrote:
>>>
>>>
>>> On Monday 08 January 2018 02:14 PM, Claudiu Beznea wrote:
>>>>
>>>>
>>>> On 02.01.2018 12:09, Keerthy wrote:
>>>>> Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.
>>>>>
>>>>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>>>>> Tested-by: Ladislav Michl <ladis@linux-mips.org>
>>>>> ---
>>>>> drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
>>>>> 1 file changed, 22 insertions(+), 17 deletions(-)
>>>>>
>>>>> diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
>>>>> index 5ad42f3..3b27aff 100644
>>>>> --- a/drivers/pwm/pwm-omap-dmtimer.c
>>>>> +++ b/drivers/pwm/pwm-omap-dmtimer.c
>>>>> @@ -23,6 +23,7 @@
>>>>> #include <linux/mutex.h>
>>>>> #include <linux/of.h>
>>>>> #include <linux/of_platform.h>
>>>>> +#include <linux/platform_data/dmtimer-omap.h>
>>>>> #include <linux/platform_data/pwm_omap_dmtimer.h>
>>>>> #include <linux/platform_device.h>
>>>>> #include <linux/pm_runtime.h>
>>>>> @@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip {
>>>>> struct pwm_chip chip;
>>>>> struct mutex mutex;
>>>>> pwm_omap_dmtimer *dm_timer;
>>>>> - struct pwm_omap_dmtimer_pdata *pdata;
>>>>> + struct omap_dm_timer_ops *pdata;
>>>>> struct platform_device *dm_timer_pdev;
>>>>> };
>>>>>
>>>>> @@ -242,19 +243,33 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>>>> {
>>>>> struct device_node *np = pdev->dev.of_node;
>>>>> struct device_node *timer;
>>>>> + struct platform_device *timer_pdev;
>>>>> struct pwm_omap_dmtimer_chip *omap;
>>>>> - struct pwm_omap_dmtimer_pdata *pdata;
>>>>> + struct dmtimer_platform_data *timer_pdata;
>>>>> + struct omap_dm_timer_ops *pdata;
>>>>> pwm_omap_dmtimer *dm_timer;
>>>>> u32 v;
>>>>> int status;
>>>>>
>>>>> - pdata = dev_get_platdata(&pdev->dev);
>>>>> - if (!pdata) {
>>>>> - dev_err(&pdev->dev, "Missing dmtimer platform data\n");
>>>>> + timer = of_parse_phandle(np, "ti,timers", 0);
>>>> of_node_put() should be called when done with device_node pointer returned
>>>> by of_parse_phandle() (you may want to check the return ERROR cases below
>>>> regarding this statement):
>>>>> + if (!timer)
>>>>> + return -ENODEV;
>>>>> +
>>>>> + timer_pdev = of_find_device_by_node(timer);
>>>>> + if (!timer_pdev) {
>>>>> + dev_err(&pdev->dev, "Unable to find Timer pdev\n");
>>>> here
>>>>> + return -ENODEV;
>>>>> + }
>>>>> +
>>>>> + timer_pdata = dev_get_platdata(&timer_pdev->dev);
>>>>> + if (!timer_pdata) {
>>>>> + dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
>>>> here
>>>>> return -EINVAL;
>>>>> }
>>>>>
>>>>> - if (!pdata->request_by_node ||
>>>>> + pdata = timer_pdata->timer_ops;
>>>>> +
>>>>> + if (!pdata || !pdata->request_by_node ||
>>>>> !pdata->free ||
>>>>> !pdata->enable ||
>>>>> !pdata->disable ||
>>>>> @@ -270,10 +285,6 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>>>> return -EINVAL;
>>>>> }
>>>>>
>>>>> - timer = of_parse_phandle(np, "ti,timers", 0);
>>>>> - if (!timer)
>>>>> - return -ENODEV;
>>>>> -
>>>>> if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
>>>> here
>>>>> dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
>>>>> return -ENODEV;
>>>>> @@ -291,13 +302,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
>>>>>
>>>>> omap->pdata = pdata;
>>>>> omap->dm_timer = dm_timer;
>>>>> -
>>>>> - omap->dm_timer_pdev = of_find_device_by_node(timer);
>>>>> - if (!omap->dm_timer_pdev) {
>>>>> - dev_err(&pdev->dev, "Unable to find timer pdev\n");
>>>>> - omap->pdata->free(dm_timer);
>>>>> - return -EINVAL;
>>>>> - }
>>>>> + omap->dm_timer_pdev = timer_pdev;
>>>>>
>>>>> /*
>>>>> * Ensure that the timer is stopped before we allow PWM core to call
>>>>>
>>>> And all the other return instructions from probe function not listed by git diff
>>>
>>> Thanks for reviewing. I will add the of_node_put call for all the error
>>> paths.
> After that you can add: Reviwed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
>>>
>>>>
>>>
>>> _______________________________________________
>>> linux-arm-kernel mailing list
>>> linux-arm-kernel@lists.infradead.org
>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>>
>>
>> Apart the missing of_node_put() :
>>
>> Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Thanks Neil and Claudiu.
>>
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2018-01-08 16:25 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-02 10:09 [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
2018-01-02 10:09 ` [PATCH v6 01/10] clocksource: dmtimer: Remove all the exports Keerthy
2018-01-02 10:09 ` [PATCH v6 02/10] arm: omap: timer: Wrap the inline functions under OMAP2PLUS define Keerthy
2018-01-02 10:09 ` [PATCH v6 03/10] arm: omap: Move dmtimer.h out of plat-omap Keerthy
2018-01-02 10:09 ` [PATCH v6 04/10] arm: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource Keerthy
2018-01-02 10:09 ` [PATCH v6 05/10] dmtimer: Add timer ops to the platform data structure Keerthy
2018-01-02 10:09 ` [PATCH v6 06/10] clocksource: dmtimer: Populate the timer ops to the pdata Keerthy
2018-01-02 10:09 ` [PATCH v6 07/10] clocksource: timer-dm: Hook device platform data if not already assigned Keerthy
2018-01-02 10:09 ` [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops Keerthy
2018-01-08 8:44 ` Claudiu Beznea
2018-01-08 14:33 ` Keerthy
2018-01-08 14:44 ` Neil Armstrong
2018-01-08 14:47 ` Claudiu Beznea
2018-01-08 16:24 ` Keerthy
2018-01-02 10:09 ` [PATCH v6 09/10] arm: omap: pdata-quirks: Remove unused timer pdata Keerthy
2018-01-02 10:09 ` [PATCH v6 10/10] clocksource: timer-dm: Check prescaler value Keerthy
2018-01-04 22:47 ` Ladislav Michl
2018-01-07 15:56 ` Keerthy
2018-01-07 19:26 ` Ladislav Michl
2018-01-07 15:59 ` [PATCH v6 00/10] omap: dmtimer: Move driver out of plat-omap Keerthy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).