omap: dmtimer: Move driver out of plat-omap

Remove all the unwanted exports from the driver

Signed-off-by Keerthy <[email protected]>

Reviewed-by Sebastian Reichel <[email protected]>

---
Changes in v3:

* Added Sebastian's Reviewed-by.

Changes in v2:

* No code changes in this v2 version. Only enhanced patch statistics for renames.

 arch/arm/plat-omap/dmtimer.c | 27 ---------------------------
 1 file changed, 27 deletions(-)

arch/arm/plat-omap/dmtimer.c +0 -27

index d443e48..72565fc 100644
@@ -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[];
 

Signature · 6 lines

1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Keerthy,

Quoted 1 line · Keerthy

Remove all the unwanted exports from the driver

I'm adding event capture capability to the pwm-omap driver and so far used v4.15-rc3 as codebase.

Intended use is an IR receiver; for that I need to measure pulses width and spaces between pulses. So DM timer was setup to generate interupt after both TCAR1 and TCAR2 are filled, values are passed to IR decoder and TCAR_IT_FLAG is cleared.

Of course, this is just proof of concept and needs to be polished and generalized, but to make it at least work I need functions you just unexported (plus some new).

Question is whenever we need this level of indirection (omap_dm_timer_ops) or plain exports are enough.

Thank you,
ladis

Quoted 240 lines

Signed-off-by Keerthy <[email protected]>

Reviewed-by Sebastian Reichel <[email protected]>

---
Changes in v3:

* Added Sebastian's Reviewed-by.

Changes in v2:

* No code changes in this v2 version. Only enhanced patch statistics for renames.

 arch/arm/plat-omap/dmtimer.c | 27 ---------------------------
 1 file changed, 27 deletions(-)

arch/arm/plat-omap/dmtimer.c +0 -27

index d443e48..72565fc 100644
@@ -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[];
 

Signature · 6 lines

1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 17 lines · Ladislav Michl

Keerthy,

Quoted 1 line · Keerthy

Remove all the unwanted exports from the driver

I'm adding event capture capability to the pwm-omap driver and so far used v4.15-rc3 as codebase.

Intended use is an IR receiver; for that I need to measure pulses width and spaces between pulses. So DM timer was setup to generate interupt after both TCAR1 and TCAR2 are filled, values are passed to IR decoder and TCAR_IT_FLAG is cleared.

Of course, this is just proof of concept and needs to be polished and generalized, but to make it at least work I need functions you just unexported (plus some new).

Quoted 2 lines

Question is whenever we need this level of indirection (omap_dm_timer_ops) or plain exports are enough.

The general guidance is not to do plain exports and go via omap_dm_timer_ops.

Quoted 23 lines · Keerthy

Quoted 19 lines · Ladislav Michl

Keerthy,

Quoted 1 line · Keerthy

Remove all the unwanted exports from the driver

I'm adding event capture capability to the pwm-omap driver and so far used v4.15-rc3 as codebase.

Intended use is an IR receiver; for that I need to measure pulses width and spaces between pulses. So DM timer was setup to generate interupt after both TCAR1 and TCAR2 are filled, values are passed to IR decoder and TCAR_IT_FLAG is cleared.

Of course, this is just proof of concept and needs to be polished and generalized, but to make it at least work I need functions you just unexported (plus some new).

Question is whenever we need this level of indirection (omap_dm_timer_ops) or plain exports are enough.

Quoted 2 lines

The general guidance is not to do plain exports and go via omap_dm_timer_ops.

...in contrary what other clocksource drivers are doing.

Now I'm assuming it is okay to extend omap_dm_timer_ops. That would mean check for ops members to be assigned should be also extended or we should delete it altogether and assume all members are populated?

Thanks,
ladis

Quoted 27 lines · Ladislav Michl

Quoted 25 lines · Keerthy

Quoted 13 lines · Ladislav Michl

Keerthy,

Quoted 1 line · Keerthy

Remove all the unwanted exports from the driver

I'm adding event capture capability to the pwm-omap driver and so far used v4.15-rc3 as codebase.

Intended use is an IR receiver; for that I need to measure pulses width and spaces between pulses. So DM timer was setup to generate interupt after both TCAR1 and TCAR2 are filled, values are passed to IR decoder and TCAR_IT_FLAG is cleared.

Quoted 6 lines

Of course, this is just proof of concept and needs to be polished and generalized, but to make it at least work I need functions you just unexported (plus some new).

Question is whenever we need this level of indirection (omap_dm_timer_ops) or plain exports are enough.

The general guidance is not to do plain exports and go via omap_dm_timer_ops.

Quoted 5 lines

...in contrary what other clocksource drivers are doing.

Now I'm assuming it is okay to extend omap_dm_timer_ops. That would mean check for ops members to be assigned should be also extended or we should delete it altogether and assume all members are populated?

It should be fine to extend omap_dm_timer_ops. What are the ops missing for your new implementation?

Tony,

Your thoughts on the above?

R

Quoted 34 lines · Keerthy

Quoted 32 lines · Ladislav Michl

Quoted 20 lines · Keerthy

Quoted 17 lines · Ladislav Michl

Keerthy,

Quoted 1 line · Keerthy

Remove all the unwanted exports from the driver

I'm adding event capture capability to the pwm-omap driver and so far used v4.15-rc3 as codebase.

Intended use is an IR receiver; for that I need to measure pulses width and spaces between pulses. So DM timer was setup to generate interupt after both TCAR1 and TCAR2 are filled, values are passed to IR decoder and TCAR_IT_FLAG is cleared.

Of course, this is just proof of concept and needs to be polished and generalized, but to make it at least work I need functions you just unexported (plus some new).

Quoted 5 lines

Quoted 2 lines

Question is whenever we need this level of indirection (omap_dm_timer_ops) or plain exports are enough.

The general guidance is not to do plain exports and go via omap_dm_timer_ops.

...in contrary what other clocksource drivers are doing.

Now I'm assuming it is okay to extend omap_dm_timer_ops. That would mean check for ops members to be assigned should be also extended or we should delete it altogether and assume all members are populated?

Quoted 2 lines

It should be fine to extend omap_dm_timer_ops. What are the ops missing for your new implementation?

Read capture registers, configure capture and ack interrupt. Perhaps set_pwm could be extended to configure capture as well.

I'll update my code on top of your changes and we'll see how it would work.

Quoted 6 lines

Tony,

Your thoughts on the above?

R

Quoted 23 lines · Ladislav Michl

Quoted 22 lines · Keerthy

Quoted 21 lines · Ladislav Michl

Quoted 20 lines · Keerthy

Quoted 17 lines · Ladislav Michl

Keerthy,

Quoted 1 line · Keerthy

Remove all the unwanted exports from the driver

I'm adding event capture capability to the pwm-omap driver and so far used v4.15-rc3 as codebase.

Intended use is an IR receiver; for that I need to measure pulses width and spaces between pulses. So DM timer was setup to generate interupt after both TCAR1 and TCAR2 are filled, values are passed to IR decoder and TCAR_IT_FLAG is cleared.

Of course, this is just proof of concept and needs to be polished and generalized, but to make it at least work I need functions you just unexported (plus some new).

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

Quoted 5 lines

Quoted 2 lines

Question is whenever we need this level of indirection (omap_dm_timer_ops) or plain exports are enough.

The general guidance is not to do plain exports and go via omap_dm_timer_ops.

...in contrary what other clocksource drivers are doing.

Quoted 11 lines

Quoted 6 lines

Quoted 3 lines

Now I'm assuming it is okay to extend omap_dm_timer_ops. That would mean check for ops members to be assigned should be also extended or we should delete it altogether and assume all members are populated?

It should be fine to extend omap_dm_timer_ops. What are the ops missing for your new implementation?

Read capture registers, configure capture and ack interrupt. Perhaps set_pwm could be extended to configure capture as well.

I'll update my code on top of your changes and we'll see how it would work.

Hmm what do you mean? We don't want to export tons of custom functions from the timers in and then be in trouble when at some point we have a Linux generic hw timer framework. We already had to deal with these custom exports earlier with conversion to multiarch and then again with device tree.

For now, it's best to pass the timer information to the pwm driver in platform data. In the long run that will be much easier to deal with than fixing random drivers tinkering with the timer registers directly.

Ideally the pwm driver would just do a request_irq from the dmtimer code where dmtimer code would implement an interrupt controller. That would be already most fo the Linux generic hardware timer framework right there :)

Quoted 6 lines · Tony Lindgren

Hmm what do you mean? We don't want to export tons of custom functions from the timers in and then be in trouble when at some point we have a Linux generic hw timer framework. We already had to deal with these custom exports earlier with conversion to multiarch and then again with device tree.

Quoted 3 lines

For now, it's best to pass the timer information to the pwm driver in platform data. In the long run that will be much easier to deal with than fixing random drivers tinkering with the timer registers directly.

All that register access would happen only in drivers/clocksource/timer-dm.c? So platform data will hold all function pointers needed for event capture and the pwm driver will do only interface to pwm framework.

Quoted 3 lines

Ideally the pwm driver would just do a request_irq from the dmtimer code where dmtimer code would implement an interrupt controller. That would be already most fo the Linux generic hardware timer framework right there :)

I do not follow. Each general-purpose timer module has its own interrupt line, so claiming that irq directly using request_irq seems enough. Could you explain interrupt controller idea a bit more?

Quoted 3 lines · Ladislav Michl

I do not follow. Each general-purpose timer module has its own interrupt line, so claiming that irq directly using request_irq seems enough. Could you explain interrupt controller idea a bit more?

Well let's assume we have drivers/clocksource/timer-dm.c implement an irq controller. Then the pwm driver would just do:

pwm9: dmtimer-pwm {
	compatible = "ti,omap-dmtimer-pwm";
	#pwm-cells = <3>;
	ti,timers = <&timer9>;
	ti,clock-source = <0x00>; /* timer_sys_ck */
	interrupts-extended = <&timer9 IRQ_TYPE_SOMETHING>;
};

Then you can do whatever you need to in the pwm driver with enable_irq/disable_irq + a handler?

If reading the line status is needed.. Then maybe the GPIO framework needs to have hardware timer support instead?

Anyways, just thinking out loud how we could have a Linux generic hardware timer framework that drivers like pwm could then use.

Quoted 16 lines · Tony Lindgren

Quoted 3 lines · Ladislav Michl

I do not follow. Each general-purpose timer module has its own interrupt line, so claiming that irq directly using request_irq seems enough. Could you explain interrupt controller idea a bit more?

Well let's assume we have drivers/clocksource/timer-dm.c implement an irq controller. Then the pwm driver would just do:

pwm9: dmtimer-pwm {
	compatible = "ti,omap-dmtimer-pwm";
	#pwm-cells = <3>;
	ti,timers = <&timer9>;
	ti,clock-source = <0x00>; /* timer_sys_ck */
	interrupts-extended = <&timer9 IRQ_TYPE_SOMETHING>;
};

Quoted 2 lines

Then you can do whatever you need to in the pwm driver with enable_irq/disable_irq + a handler?

That seems to work. Now should we map 1:1 to timer interrupt or have separate interrupt for match, overflow and capture? Former would need some more dm_timer_ops to determine interrupt source, while later would work "automagically" - but I haven't tested it yet.

Quoted 2 lines

If reading the line status is needed.. Then maybe the GPIO framework needs to have hardware timer support instead?

It does not seem OMAP can read event pin value in event capture mode.

Quoted 2 lines

Anyways, just thinking out loud how we could have a Linux generic hardware timer framework that drivers like pwm could then use.

I need a bit longer chain:
dmtimer -> pwm -> rc (which calls ir_raw_event_store from interrupt) Is extending pwm core with interrpt callback the right thing there? Something like:
(*pulse_captured)(ktime_t width, ktime_t last_edge);

Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.

Signed-off-by Keerthy <[email protected]>

---

Changes in v4:

* Switched to dev_get_platdata.

Changes in v3:

* Used of_find_platdata_by_node function to fetch platform data for timer node.

 drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

Keerthy,

Quoted 7 lines · Keerthy

Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.

Signed-off-by Keerthy <[email protected]>

---

Changes in v4:

Quoted 1 line

* Switched to dev_get_platdata.

Where do you expect dev.platform_data to be set? PWM driver is failing with:
omap-dmtimer-pwm dmtimer-pwm: dmtimer pdata structure NULL
omap-dmtimer-pwm: probe of dmtimer-pwm failed with error -22

Which I fixed with patch bellow, to be able to test your patchset.

Also I'm running a bit out of time, so I'll send few clean up patches and event capture code to get some feedback early.

Regards,
ladis

drivers/clocksource/timer-dm.c +1 -0

index 39be39e6a8dd..d3d8a49cae0d 100644
@@ -773,6 +773,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 		dev_err(dev, "%s: no platform data.\n", __func__);
 		return -ENODEV;
 	}
+	dev->platform_data = pdata;
 
 	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (unlikely(!irq)) {

Quoted 9 lines

Changes in v3:

* Used of_find_platdata_by_node function to fetch platform data for timer node.

 drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

Quoted 10 lines · Ladislav Michl

Keerthy,

Quoted 7 lines · Keerthy

Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.

Signed-off-by Keerthy <[email protected]>

---

Changes in v4:

Quoted 8 lines

Quoted 1 line

* Switched to dev_get_platdata.

Where do you expect dev.platform_data to be set? PWM driver is failing with:
omap-dmtimer-pwm dmtimer-pwm: dmtimer pdata structure NULL
omap-dmtimer-pwm: probe of dmtimer-pwm failed with error -22

Which I fixed with patch bellow, to be able to test your patchset.

Thanks! I will make the below patch part of my series.

Quoted 7 lines

Also I'm running a bit out of time, so I'll send few clean up patches and event capture code to get some feedback early.

Regards,
ladis

drivers/clocksource/timer-dm.c static int omap_dm_timer_probe(struct platform_device *pdev) · line 776

Quoted 9 lines

drivers/clocksource/timer-dm.c +1 -0

index 39be39e6a8dd..d3d8a49cae0d 100644
@@ -773,6 +773,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 		dev_err(dev, "%s: no platform data.\n", __func__);
 		return -ENODEV;
 	}
+	dev->platform_data = pdata;

Quoted 5 lines

drivers/clocksource/timer-dm.c +0 -0

 	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (unlikely(!irq)) {
 

Quoted 1 line

Quoted 7 lines

Quoted 7 lines

Changes in v3:

* Used of_find_platdata_by_node function to fetch platform data for timer node.

 drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 31 lines · Keerthy

Quoted 10 lines · Ladislav Michl

Keerthy,

Quoted 7 lines · Keerthy

Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.

Signed-off-by Keerthy <[email protected]>

---

Changes in v4:

Quoted 8 lines

Quoted 1 line

* Switched to dev_get_platdata.

Where do you expect dev.platform_data to be set? PWM driver is failing with:
omap-dmtimer-pwm dmtimer-pwm: dmtimer pdata structure NULL
omap-dmtimer-pwm: probe of dmtimer-pwm failed with error -22

Which I fixed with patch bellow, to be able to test your patchset.

Thanks! I will make the below patch part of my series.

Quoted 7 lines

Also I'm running a bit out of time, so I'll send few clean up patches and event capture code to get some feedback early.

Regards,
ladis

Quoted 9 lines

drivers/clocksource/timer-dm.c static int omap_dm_timer_probe(struct platform_device *pdev) · line 776

Quoted 9 lines

drivers/clocksource/timer-dm.c +1 -0

index 39be39e6a8dd..d3d8a49cae0d 100644
@@ -773,6 +773,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 		dev_err(dev, "%s: no platform data.\n", __func__);
 		return -ENODEV;
 	}
+	dev->platform_data = pdata;

drivers/clocksource/timer-dm.c: In function 'omap_dm_timer_probe':
drivers/clocksource/timer-dm.c:744:21: warning: assignment discards 'const' qualifier from pointer target type

This cannot be done as we are assigning a const pointer to a non-const pointer.

I will figure out a different way for this fix.

Quoted 18 lines

Quoted 6 lines

drivers/clocksource/timer-dm.c +0 -0

 	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (unlikely(!irq)) {
 

Quoted 1 line

Quoted 7 lines

Quoted 7 lines

Changes in v3:

* Used of_find_platdata_by_node function to fetch platform data for timer node.

 drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 44 lines · Keerthy

Quoted 29 lines · Keerthy

Quoted 10 lines · Ladislav Michl

Keerthy,

Quoted 7 lines · Keerthy

Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.

Signed-off-by Keerthy <[email protected]>

---

Changes in v4:

Quoted 8 lines

Quoted 1 line

* Switched to dev_get_platdata.

Where do you expect dev.platform_data to be set? PWM driver is failing with:
omap-dmtimer-pwm dmtimer-pwm: dmtimer pdata structure NULL
omap-dmtimer-pwm: probe of dmtimer-pwm failed with error -22

Which I fixed with patch bellow, to be able to test your patchset.

Thanks! I will make the below patch part of my series.

Quoted 7 lines

Also I'm running a bit out of time, so I'll send few clean up patches and event capture code to get some feedback early.

Regards,
ladis

Quoted 9 lines

drivers/clocksource/timer-dm.c static int omap_dm_timer_probe(struct platform_device *pdev) · line 776

Quoted 9 lines

drivers/clocksource/timer-dm.c +1 -0

index 39be39e6a8dd..d3d8a49cae0d 100644
@@ -773,6 +773,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 		dev_err(dev, "%s: no platform data.\n", __func__);
 		return -ENODEV;
 	}
+	dev->platform_data = pdata;

drivers/clocksource/timer-dm.c: In function 'omap_dm_timer_probe':
drivers/clocksource/timer-dm.c:744:21: warning: assignment discards 'const' qualifier from pointer target type

Quoted 2 lines

This cannot be done as we are assigning a const pointer to a non-const pointer.

Quoted 1 line

I will figure out a different way for this fix.

Ladis,

I fixed that:

drivers/clocksource/timer-dm.c +0 -0

index 1cbd954..e58f555 100644
@@ -807,17 +807,21 @@ static int omap_dm_timer_probe(struct
 platform_device *pdev)
        struct resource *mem, *irq;

drivers/clocksource/timer-dm.c +1 -1

        irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (unlikely(!irq)) {
                dev_err(dev, "%s: no IRQ resource.\n", __func__);

@@ -946,7 +950,7 @@ static int omap_dm_timer_remove(struct
 platform_device *pdev)
        .write_status = omap_dm_timer_write_status,
 };
 
-static const struct dmtimer_platform_data omap3plus_pdata = {
+static struct dmtimer_platform_data omap3plus_pdata = {
        .timer_errata = OMAP_TIMER_ERRATA_I103_I767,
        .timer_ops = &dmtimer_ops,

};

Can you check at your end if this works for you?

Quoted 45 lines · Keerthy

Quoted 44 lines · Keerthy

Quoted 29 lines · Keerthy

Quoted 10 lines · Ladislav Michl

Keerthy,

Quoted 7 lines · Keerthy

Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.

Signed-off-by Keerthy <[email protected]>

---

Changes in v4:

Quoted 8 lines

Quoted 1 line

* Switched to dev_get_platdata.

Where do you expect dev.platform_data to be set? PWM driver is failing with:
omap-dmtimer-pwm dmtimer-pwm: dmtimer pdata structure NULL
omap-dmtimer-pwm: probe of dmtimer-pwm failed with error -22

Which I fixed with patch bellow, to be able to test your patchset.

Thanks! I will make the below patch part of my series.

Quoted 7 lines

Also I'm running a bit out of time, so I'll send few clean up patches and event capture code to get some feedback early.

Regards,
ladis

Quoted 9 lines

drivers/clocksource/timer-dm.c static int omap_dm_timer_probe(struct platform_device *pdev) · line 776

Quoted 9 lines

drivers/clocksource/timer-dm.c +1 -0

index 39be39e6a8dd..d3d8a49cae0d 100644
@@ -773,6 +773,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 		dev_err(dev, "%s: no platform data.\n", __func__);
 		return -ENODEV;
 	}
+	dev->platform_data = pdata;

drivers/clocksource/timer-dm.c: In function 'omap_dm_timer_probe':
drivers/clocksource/timer-dm.c:744:21: warning: assignment discards 'const' qualifier from pointer target type

Quoted 2 lines

Quoted 2 lines

This cannot be done as we are assigning a const pointer to a non-const pointer.

Oh, I didn't even assume it as proper fix, just to show what is missing :)

But technically 'struct dmtimer_platform_data *pdata' is a constant which should not be changed. Also look how all that of_populate chain works - at the end const pointer is assigned to void* platform_data by simple (void *) overcast.

Quoted 13 lines

Quoted 1 line

I will figure out a different way for this fix.

Ladis,

I fixed that:

drivers/clocksource/timer-dm.c +0 -0

index 1cbd954..e58f555 100644
@@ -807,17 +807,21 @@ static int omap_dm_timer_probe(struct
 platform_device *pdev)
        struct resource *mem, *irq;

drivers/clocksource/timer-dm.c static int omap_dm_timer_probe(struct · line 816

Quoted 10 lines

drivers/clocksource/timer-dm.c +3 -2

        struct device *dev = &pdev->dev;
        const struct of_device_id *match;
-       const struct dmtimer_platform_data *pdata;
+       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 = match ? (struct dmtimer_platform_data *)match->data :
+               dev->platform_data;

All that seems needlesly complicated, what about patch bellow?

Quoted 5 lines

drivers/clocksource/timer-dm.c +0 -0

        if (!pdata && !dev->of_node) {
                dev_err(dev, "%s: no platform data.\n", __func__);
                return -ENODEV;
        }
 

drivers/clocksource/timer-dm.c static int omap_dm_timer_probe(struct · line 823

Quoted 2 lines

drivers/clocksource/timer-dm.c +2 -0

+       if (!dev->platform_data)
+               dev->platform_data = pdata;

Does the above condition bring us anything?

Quoted 15 lines

drivers/clocksource/timer-dm.c +1 -1

        irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (unlikely(!irq)) {
                dev_err(dev, "%s: no IRQ resource.\n", __func__);

@@ -946,7 +950,7 @@ static int omap_dm_timer_remove(struct
 platform_device *pdev)
        .write_status = omap_dm_timer_write_status,
 };
 
-static const struct dmtimer_platform_data omap3plus_pdata = {
+static struct dmtimer_platform_data omap3plus_pdata = {
        .timer_errata = OMAP_TIMER_ERRATA_I103_I767,
        .timer_ops = &dmtimer_ops,

};

Quoted 1 line

Can you check at your end if this works for you?

Note, it is untested as I ran out of time and will continue after New Year.

drivers/clocksource/timer-dm.c +1 -3

index 1cbd95420914..85024f11773a 100644
@@ -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);

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.

As dmtimer no longer exports functions, there is no point to have them non-static. Also delete those not used anywhere.

Signed-off-by Ladislav Michl <[email protected]>

---
 drivers/clocksource/timer-dm.c | 125 ++++++++---------------------------------
 include/clocksource/dmtimer.h  |  26 ---------
 2 files changed, 23 insertions(+), 128 deletions(-)

drivers/clocksource/timer-dm.c +23 -102

index 392978ccd8a6..ec3a28c90c70 100644
@@ -204,16 +204,6 @@ static inline u32 omap_dm_timer_reserved_systimer(int id)
 	return (omap_reserved_systimers & (1 << (id - 1))) ? 1 : 0;
 }
 
-int omap_dm_timer_reserve_systimer(int id)
-{
-	if (omap_dm_timer_reserved_systimer(id))
-		return -ENODEV;
-
-	omap_reserved_systimers |= (1 << (id - 1));
-
-	return 0;
-}
-
 static struct omap_dm_timer *_omap_dm_timer_request(int req_type, void *data)
 {
 	struct omap_dm_timer *timer = NULL, *t;

@@ -298,16 +288,16 @@ static struct omap_dm_timer *_omap_dm_timer_request(int req_type, void *data)
 	return timer;
 }
 
-struct omap_dm_timer *omap_dm_timer_request(void)
+static struct omap_dm_timer *omap_dm_timer_request(void)
 {
 	return _omap_dm_timer_request(REQUEST_ANY, NULL);
 }
 
-struct omap_dm_timer *omap_dm_timer_request_specific(int id)
+static struct omap_dm_timer *omap_dm_timer_request_specific(int id)
 {
 	/* Requesting timer by ID is not supported when device tree is used */
 	if (of_have_populated_dt()) {
-		pr_warn("%s: Please use omap_dm_timer_request_by_cap/node()\n",
+		pr_warn("%s: Please use omap_dm_timer_request_by_node()\n",
 			__func__);
 		return NULL;
 	}

@@ -315,20 +305,6 @@ struct omap_dm_timer *omap_dm_timer_request_specific(int id)
 	return _omap_dm_timer_request(REQUEST_BY_ID, &id);
 }
 
-/**
- * omap_dm_timer_request_by_cap - Request a timer by capability
- * @cap:	Bit mask of capabilities to match
- *
- * Find a timer based upon capabilities bit mask. Callers of this function
- * should use the definitions found in the plat/dmtimer.h file under the
- * comment "timer capabilities used in hwmod database". Returns pointer to
- * timer handle on success and a NULL pointer on failure.
- */
-struct omap_dm_timer *omap_dm_timer_request_by_cap(u32 cap)
-{
-	return _omap_dm_timer_request(REQUEST_BY_CAP, &cap);
-}
-
 /**
  * omap_dm_timer_request_by_node - Request a timer by device-tree node
  * @np:		Pointer to device-tree timer node

@@ -336,7 +312,7 @@ struct omap_dm_timer *omap_dm_timer_request_by_cap(u32 cap)
  * Request a timer based upon a device node pointer. Returns pointer to
  * timer handle on success and a NULL pointer on failure.
  */
-struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np)
+static struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np)
 {
 	if (!np)
 		return NULL;

@@ -344,7 +320,7 @@ struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np)
 	return _omap_dm_timer_request(REQUEST_BY_NODE, np);
 }
 
-int omap_dm_timer_free(struct omap_dm_timer *timer)
+static int omap_dm_timer_free(struct omap_dm_timer *timer)
 {
 	if (unlikely(!timer))
 		return -EINVAL;

@@ -424,7 +400,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
 
 #else
 
-struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
+static struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
 {
 	if (timer && !IS_ERR(timer->fclk))
 		return timer->fclk;

@@ -440,18 +416,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
 
 #endif
 
-int omap_dm_timer_trigger(struct omap_dm_timer *timer)
-{
-	if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) {
-		pr_err("%s: timer not available or enabled.\n", __func__);
-		return -EINVAL;
-	}
-
-	omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0);
-	return 0;
-}
-
-int omap_dm_timer_start(struct omap_dm_timer *timer)
+static int omap_dm_timer_start(struct omap_dm_timer *timer)
 {
 	u32 l;
 

@@ -471,7 +436,7 @@ int omap_dm_timer_start(struct omap_dm_timer *timer)
 	return 0;
 }
 
-int omap_dm_timer_stop(struct omap_dm_timer *timer)
+static int omap_dm_timer_stop(struct omap_dm_timer *timer)
 {
 	unsigned long rate = 0;
 

@@ -556,8 +521,8 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
 	return ret;
 }
 
-int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
-			    unsigned int load)
+static int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
+				  unsigned int load)
 {
 	u32 l;
 

@@ -581,37 +546,8 @@ int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
 	return 0;
 }
 
-/* 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,
-                            unsigned int load)
-{
-	u32 l;
-
-	if (unlikely(!timer))
-		return -EINVAL;
-
-	omap_dm_timer_enable(timer);
-
-	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
-	if (autoreload) {
-		l |= OMAP_TIMER_CTRL_AR;
-		omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);
-	} else {
-		l &= ~OMAP_TIMER_CTRL_AR;
-	}
-	l |= OMAP_TIMER_CTRL_ST;
-
-	__omap_dm_timer_load_start(timer, l, load, timer->posted);
-
-	/* Save the context */
-	timer->context.tclr = l;
-	timer->context.tldr = load;
-	timer->context.tcrr = load;
-	return 0;
-}
-
-int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,
-			     unsigned int match)
+static int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,
+				   unsigned int match)
 {
 	u32 l;
 

@@ -634,8 +570,8 @@ int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,
 	return 0;
 }
 
-int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,
-			   int toggle, int trigger)
+static int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,
+				 int toggle, int trigger)
 {
 	u32 l;
 

@@ -659,7 +595,8 @@ int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,
 	return 0;
 }
 
-int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
+static int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer,
+					int prescaler)
 {
 	u32 l;
 

@@ -681,8 +618,8 @@ int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)
 	return 0;
 }
 
-int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
-				  unsigned int value)
+static int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
+					unsigned int value)
 {
 	if (unlikely(!timer))
 		return -EINVAL;

@@ -704,7 +641,7 @@ int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
  *
  * Disables the specified timer interrupts for a timer.
  */
-int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask)
+static int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask)
 {
 	u32 l = mask;
 

@@ -727,7 +664,7 @@ int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask)
 	return 0;
 }
 
-unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
+static unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
 {
 	unsigned int l;
 

@@ -741,7 +678,7 @@ unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
 	return l;
 }
 
-int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)
+static int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)
 {
 	if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev)))
 		return -EINVAL;

@@ -751,7 +688,7 @@ int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)
 	return 0;
 }
 
-unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)
+static unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)
 {
 	if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) {
 		pr_err("%s: timer not iavailable or enabled.\n", __func__);

@@ -761,7 +698,7 @@ unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)
 	return __omap_dm_timer_read_counter(timer, timer->posted);
 }
 
-int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)
+static int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)
 {
 	if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) {
 		pr_err("%s: timer not available or enabled.\n", __func__);

@@ -775,22 +712,6 @@ int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)
 	return 0;
 }
 
-int omap_dm_timers_active(void)
-{
-	struct omap_dm_timer *timer;
-
-	list_for_each_entry(timer, &omap_timer_list, node) {
-		if (!timer->reserved)
-			continue;
-
-		if (omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG) &
-		    OMAP_TIMER_CTRL_ST) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
 static const struct of_device_id omap_timer_match[];
 
 /**

include/clocksource/dmtimer.h +0 -26

index 862ad62dab9d..63d6ec0747d9 100644
@@ -124,40 +124,14 @@ struct omap_dm_timer {
 	struct list_head node;
 };
 
-int omap_dm_timer_reserve_systimer(int id);
-struct omap_dm_timer *omap_dm_timer_request(void);
-struct omap_dm_timer *omap_dm_timer_request_specific(int timer_id);
-struct omap_dm_timer *omap_dm_timer_request_by_cap(u32 cap);
-struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *np);
-int omap_dm_timer_free(struct omap_dm_timer *timer);
 void omap_dm_timer_enable(struct omap_dm_timer *timer);
 void omap_dm_timer_disable(struct omap_dm_timer *timer);
 
 int omap_dm_timer_get_irq(struct omap_dm_timer *timer);
 
 u32 omap_dm_timer_modify_idlect_mask(u32 inputmask);
-struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer);
-
-int omap_dm_timer_trigger(struct omap_dm_timer *timer);
-int omap_dm_timer_start(struct omap_dm_timer *timer);
-int omap_dm_timer_stop(struct omap_dm_timer *timer);
 
 int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source);
-int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload, unsigned int value);
-int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload, unsigned int value);
-int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, unsigned int match);
-int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on, int toggle, int trigger);
-int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler);
-
-int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer, unsigned int value);
-int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask);
-
-unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer);
-int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value);
-unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer);
-int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value);
-
-int omap_dm_timers_active(void);
 
 /*
  * Do not use the defines below, they are not needed. They should be only

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 <[email protected]>

---
 drivers/clocksource/timer-dm.c | 3 +++
 1 file changed, 3 insertions(+)

drivers/clocksource/timer-dm.c +3 -0

index ec3a28c90c70..95cd98be8541 100644
@@ -609,6 +609,9 @@ static int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer,
 	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);
 

Keerthy,

Quoted 4 lines · 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.

thanks for nice work. I'll send two more patches as a reply to this one. I'd be glad if you could make them part of your serie. One of them would be nice to have for pwm driver prescaler fix which will be send independently.
Also, if that helps you can have my

Tested-by Ladislav Michl <[email protected]>

on IGEPv2 (OMAP3430 based)

Quoted 2 lines

Boot tested on DRA7-EVM and AM437X-GP-EVM.

I guess PWM driver was not tested, right? See comment to PATCH 7/8.

Quoted 1 line

Compile tested omap1_defconfig.

Thank you,
ladis

Quoted 8 lines · Ladislav Michl

Keerthy,

Quoted 4 lines · 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.

Quoted 7 lines

thanks for nice work. I'll send two more patches as a reply to this one. I'd be glad if you could make them part of your serie. One of them would be nice to have for pwm driver prescaler fix which will be send independently.
Also, if that helps you can have my

Tested-by Ladislav Michl <[email protected]>

on IGEPv2 (OMAP3430 based)

Thanks a bunch! :-). I will take the pwm driver fix along with mine.

should i also take the two patches which you sent:

[PATCH 1/2] clocksource: timer-dm: Make unexported functions static [PATCH 2/2] clocksource: timer-dm: Check prescaler value

Also what about this:
[PATCH] pwm: omap-dmtimer: Fix frequency when using prescaler

Let me know. I plan to send v6 with your Tested-by.

Thanks,
Keerthy