linux-pwm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/3] arm: plat-omap: Add PWM dmtimer platform data quirks
@ 2015-11-02 11:14 Neil Armstrong
  2015-11-30 18:37 ` Tony Lindgren
  0 siblings, 1 reply; 5+ messages in thread
From: Neil Armstrong @ 2015-11-02 11:14 UTC (permalink / raw)
  To: Thierry Reding, Tony Lindgren, linux-pwm, linux-kernel,
	linux-arm-kernel, linux-omap, Grant Erickson, NeilBrown,
	Joachim Eastwood

In order to set the currently platform dependent dmtimer
functions pointers as platform data for the pwm-omap-dmtimer
platform driver, add it to plat-omap auxdata_lookup table.

Suggested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm/mach-omap2/pdata-quirks.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index ea56397..647dec5 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -23,6 +23,8 @@
 #include <linux/platform_data/pinctrl-single.h>
 #include <linux/platform_data/iommu-omap.h>
 #include <linux/platform_data/wkup_m3.h>
+#include <linux/platform_data/pwm_omap_dmtimer.h>
+#include <plat/dmtimer.h>

 #include <asm/siginfo.h>
 #include <asm/signal.h>
@@ -453,6 +455,24 @@ 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)
+struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {
+	.request_by_node = omap_dm_timer_request_by_node,
+	.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,
+	.write_counter = omap_dm_timer_write_counter,
+};
+#endif
+
 /*
  * Few boards still need auxdata populated before we populate
  * the dev entries in of_platform_populate().
@@ -506,6 +526,9 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
 	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] 5+ messages in thread

* Re: [PATCH 3/3] arm: plat-omap: Add PWM dmtimer platform data quirks
  2015-11-02 11:14 [PATCH 3/3] arm: plat-omap: Add PWM dmtimer platform data quirks Neil Armstrong
@ 2015-11-30 18:37 ` Tony Lindgren
  2016-01-22 16:15   ` [PATCH repost] " Neil Armstrong
  0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2015-11-30 18:37 UTC (permalink / raw)
  To: Neil Armstrong
  Cc: Thierry Reding, linux-pwm, linux-kernel, linux-arm-kernel,
	linux-omap, Grant Erickson, NeilBrown, Joachim Eastwood

* Neil Armstrong <narmstrong@baylibre.com> [151102 03:14]:
> In order to set the currently platform dependent dmtimer
> functions pointers as platform data for the pwm-omap-dmtimer
> platform driver, add it to plat-omap auxdata_lookup table.
> 
> Suggested-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

Actually this one will need to wait for Thierry to merge the driver
first because of the dependency to the platform_data. Please resend
this one separately once the driver hits the mainline tree.

Regards,

Tony

> ---
>  arch/arm/mach-omap2/pdata-quirks.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
> index ea56397..647dec5 100644
> --- a/arch/arm/mach-omap2/pdata-quirks.c
> +++ b/arch/arm/mach-omap2/pdata-quirks.c
> @@ -23,6 +23,8 @@
>  #include <linux/platform_data/pinctrl-single.h>
>  #include <linux/platform_data/iommu-omap.h>
>  #include <linux/platform_data/wkup_m3.h>
> +#include <linux/platform_data/pwm_omap_dmtimer.h>
> +#include <plat/dmtimer.h>
> 
>  #include <asm/siginfo.h>
>  #include <asm/signal.h>
> @@ -453,6 +455,24 @@ 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)
> +struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {
> +	.request_by_node = omap_dm_timer_request_by_node,
> +	.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,
> +	.write_counter = omap_dm_timer_write_counter,
> +};
> +#endif
> +
>  /*
>   * Few boards still need auxdata populated before we populate
>   * the dev entries in of_platform_populate().
> @@ -506,6 +526,9 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
>  	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	[flat|nested] 5+ messages in thread

* [PATCH repost] arm: plat-omap: Add PWM dmtimer platform data quirks
  2015-11-30 18:37 ` Tony Lindgren
@ 2016-01-22 16:15   ` Neil Armstrong
  2016-01-25 18:08     ` Tony Lindgren
  0 siblings, 1 reply; 5+ messages in thread
From: Neil Armstrong @ 2016-01-22 16:15 UTC (permalink / raw)
  To: thierry.reding, tony, linux-pwm, linux-kernel, linux-arm-kernel,
	linux-omap
  Cc: Neil Armstrong

In order to set the currently platform dependent dmtimer
functions pointers as platform data for the pwm-omap-dmtimer
platform driver, add it to plat-omap auxdata_lookup table.

Suggested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm/mach-omap2/pdata-quirks.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Tony, Thierry,

The previous patches are now upstream, here is a repost of the patch re-tested
against mainline.

Ref: http://lkml.kernel.org/r/56374592.4060201@baylibre.com 
Patchset: http://lkml.kernel.org/r/5620ED2C.1090107@baylibre.com

Neil

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index e781e4f..a935d28 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -23,6 +23,8 @@
 #include <linux/platform_data/pinctrl-single.h>
 #include <linux/platform_data/iommu-omap.h>
 #include <linux/platform_data/wkup_m3.h>
+#include <linux/platform_data/pwm_omap_dmtimer.h>
+#include <plat/dmtimer.h>
 
 #include "common.h"
 #include "common-board-devices.h"
@@ -449,6 +451,24 @@ 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)
+struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {
+	.request_by_node = omap_dm_timer_request_by_node,
+	.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,
+	.write_counter = omap_dm_timer_write_counter,
+};
+#endif
+
 /*
  * Few boards still need auxdata populated before we populate
  * the dev entries in of_platform_populate().
@@ -502,6 +522,9 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
 	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] 5+ messages in thread

* Re: [PATCH repost] arm: plat-omap: Add PWM dmtimer platform data quirks
  2016-01-22 16:15   ` [PATCH repost] " Neil Armstrong
@ 2016-01-25 18:08     ` Tony Lindgren
  2016-01-26  8:44       ` Neil Armstrong
  0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2016-01-25 18:08 UTC (permalink / raw)
  To: Neil Armstrong
  Cc: thierry.reding, linux-pwm, linux-kernel, linux-arm-kernel,
	linux-omap

* Neil Armstrong <narmstrong@baylibre.com> [160122 08:16]:
> In order to set the currently platform dependent dmtimer
> functions pointers as platform data for the pwm-omap-dmtimer
> platform driver, add it to plat-omap auxdata_lookup table.
> 
> Suggested-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  arch/arm/mach-omap2/pdata-quirks.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> Tony, Thierry,
> 
> The previous patches are now upstream, here is a repost of the patch re-tested
> against mainline.
> 
> Ref: http://lkml.kernel.org/r/56374592.4060201@baylibre.com 
> Patchset: http://lkml.kernel.org/r/5620ED2C.1090107@baylibre.com

OK great. I'll add this into omap-for-v4.5/fixes so we get the
PWM driver working.

Regards,

Tony

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH repost] arm: plat-omap: Add PWM dmtimer platform data quirks
  2016-01-25 18:08     ` Tony Lindgren
@ 2016-01-26  8:44       ` Neil Armstrong
  0 siblings, 0 replies; 5+ messages in thread
From: Neil Armstrong @ 2016-01-26  8:44 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: thierry.reding, linux-pwm, linux-kernel, linux-arm-kernel,
	linux-omap

On 01/25/2016 07:08 PM, Tony Lindgren wrote:
> * Neil Armstrong <narmstrong@baylibre.com> [160122 08:16]:
>>
>> Tony, Thierry,
>>
>> The previous patches are now upstream, here is a repost of the patch re-tested
>> against mainline.
>>
>> Ref: http://lkml.kernel.org/r/56374592.4060201@baylibre.com 
>> Patchset: http://lkml.kernel.org/r/5620ED2C.1090107@baylibre.com
> 
> OK great. I'll add this into omap-for-v4.5/fixes so we get the
> PWM driver working.
> 
> Regards,
> 
> Tony
> 

Thanks for all Tony !

Neil

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-01-26  8:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-02 11:14 [PATCH 3/3] arm: plat-omap: Add PWM dmtimer platform data quirks Neil Armstrong
2015-11-30 18:37 ` Tony Lindgren
2016-01-22 16:15   ` [PATCH repost] " Neil Armstrong
2016-01-25 18:08     ` Tony Lindgren
2016-01-26  8:44       ` Neil Armstrong

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).