| Message ID | 1515478987-5786-6-git-send-email-j-keerthy@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | omap: dmtimer: Move driver out of plat-omap | expand |
On 01/09/2018 12:23 AM, J, KEERTHY wrote: > 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); Have you looked into collapsing this into the set_source() option above for OMAP1? Looks like the only reason the pdev is needed is for retrieving the pdev id, which is also stored in the omap_dm_timer structure? > u32 timer_capability; > u32 timer_errata; > int (*get_context_loss_count)(struct device *); > + struct omap_dm_timer_ops *timer_ops; Any reason why this is not a const? We don't expect this to change right. regards Suman > }; > > #endif /* __PLATFORM_DATA_DMTIMER_OMAP_H__ */ > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- To unsubscribe from this list: send the line "unsubscribe linux-pwm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 13 February 2018 08:16 AM, Suman Anna wrote: > On 01/09/2018 12:23 AM, J, KEERTHY wrote: >> 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); > Have you looked into collapsing this into the set_source() option above > for OMAP1? Looks like the only reason the pdev is needed is for > retrieving the pdev id, which is also stored in the omap_dm_timer structure? I would prefer not to touch the mach-omap1 part as part of this migration series. I will revisit this once the migration is done. > >> u32 timer_capability; >> u32 timer_errata; >> int (*get_context_loss_count)(struct device *); >> + struct omap_dm_timer_ops *timer_ops; > > Any reason why this is not a const? We don't expect this to change right. Yes this can be. > > regards > Suman > >> }; >> >> #endif /* __PLATFORM_DATA_DMTIMER_OMAP_H__ */ >> -- >> 1.9.1 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >> > -- To unsubscribe from this list: send the line "unsubscribe linux-pwm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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__ */