Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1702813 > unrolled thread

[PATCH 0/3] iio: trigger: stm32-timer: add STM32H7 variant

Started byFabrice Gasnier <fabrice.gasnier@st.com>
First post2017-08-03 11:20 +0200
Last post2017-08-10 19:20 +0200
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] iio: trigger: stm32-timer: add STM32H7 variant Fabrice Gasnier <fabrice.gasnier@st.com> - 2017-08-03 11:20 +0200
    [PATCH 3/3] iio: trigger: stm32-timer: add output compare triggers Fabrice Gasnier <fabrice.gasnier@st.com> - 2017-08-03 11:20 +0200
      Re: [PATCH 3/3] iio: trigger: stm32-timer: add output compare  triggers Jonathan Cameron <jic23@kernel.org> - 2017-08-10 01:40 +0200
    [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for STM32H7 Fabrice Gasnier <fabrice.gasnier@st.com> - 2017-08-03 11:20 +0200
      Re: [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for  STM32H7 Jonathan Cameron <jic23@kernel.org> - 2017-08-10 01:40 +0200
      Re: [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for  STM32H7 Rob Herring <robh@kernel.org> - 2017-08-10 19:20 +0200

#1702813 — [PATCH 0/3] iio: trigger: stm32-timer: add STM32H7 variant

FromFabrice Gasnier <fabrice.gasnier@st.com>
Date2017-08-03 11:20 +0200
Subject[PATCH 0/3] iio: trigger: stm32-timer: add STM32H7 variant
Message-ID<uaksq-6mu-7@gated-at.bofh.it>
STM32H7 variant has additional timer instances, and slightly different
valid triggers.
This patchset introduces a new compatible for STM32H7 timers, to handle
this new variant, with appropriate configuration data.

Fabrice Gasnier (3):
  dt-bindings: iio: timer: stm32: add support for STM32H7
  iio: trigger: stm32-timer: add support for STM32H7
  iio: trigger: stm32-timer: add output compare triggers

 .../bindings/iio/timer/stm32-timer-trigger.txt     |  4 +-
 drivers/iio/trigger/stm32-timer-trigger.c          | 78 +++++++++++++++++++---
 include/linux/iio/timer/stm32-timer-trigger.h      | 14 ++++
 3 files changed, 84 insertions(+), 12 deletions(-)

-- 
1.9.1

[toc] | [next] | [standalone]

#1702814 — [PATCH 3/3] iio: trigger: stm32-timer: add output compare triggers

FromFabrice Gasnier <fabrice.gasnier@st.com>
Date2017-08-03 11:20 +0200
Subject[PATCH 3/3] iio: trigger: stm32-timer: add output compare triggers
Message-ID<uaksq-6mu-15@gated-at.bofh.it>
In reply to#1702813
Add output compare trigger sources available on some instances.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
---
 drivers/iio/trigger/stm32-timer-trigger.c     | 31 +++++++++++++++++----------
 include/linux/iio/timer/stm32-timer-trigger.h | 12 +++++++++++
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
index 33890f9..a9bc5b6 100644
--- a/drivers/iio/trigger/stm32-timer-trigger.c
+++ b/drivers/iio/trigger/stm32-timer-trigger.c
@@ -29,12 +29,14 @@
 	{ TIM7_TRGO,},
 	{ TIM8_TRGO, TIM8_TRGO2, TIM8_CH1, TIM8_CH2, TIM8_CH3, TIM8_CH4,},
 	{ TIM9_TRGO, TIM9_CH1, TIM9_CH2,},
-	{ }, /* timer 10 */
-	{ }, /* timer 11 */
+	{ TIM10_OC1,},
+	{ TIM11_OC1,},
 	{ TIM12_TRGO, TIM12_CH1, TIM12_CH2,},
-	{ }, /* timer 13 */
-	{ }, /* timer 14 */
+	{ TIM13_OC1,},
+	{ TIM14_OC1,},
 	{ TIM15_TRGO,},
+	{ TIM16_OC1,},
+	{ TIM17_OC1,},
 };
 
 /* List the triggers accepted by each timer */
@@ -47,10 +49,10 @@
 	{ }, /* timer 6 */
 	{ }, /* timer 7 */
 	{ TIM1_TRGO, TIM2_TRGO, TIM4_TRGO, TIM5_TRGO,},
-	{ TIM2_TRGO, TIM3_TRGO,},
+	{ TIM2_TRGO, TIM3_TRGO, TIM10_OC1, TIM11_OC1,},
 	{ }, /* timer 10 */
 	{ }, /* timer 11 */
-	{ TIM4_TRGO, TIM5_TRGO,},
+	{ TIM4_TRGO, TIM5_TRGO, TIM13_OC1, TIM14_OC1,},
 };
 
 static const void *stm32h7_valids_table[][MAX_VALIDS] = {
@@ -65,10 +67,12 @@
 	{ }, /* timer 9 */
 	{ }, /* timer 10 */
 	{ }, /* timer 11 */
-	{ TIM4_TRGO, TIM5_TRGO,},
+	{ TIM4_TRGO, TIM5_TRGO, TIM13_OC1, TIM14_OC1,},
 	{ }, /* timer 13 */
 	{ }, /* timer 14 */
-	{ TIM1_TRGO, TIM3_TRGO,},
+	{ TIM1_TRGO, TIM3_TRGO, TIM16_OC1, TIM17_OC1,},
+	{ }, /* timer 16 */
+	{ }, /* timer 17 */
 };
 
 struct stm32_timer_trigger {
@@ -91,6 +95,11 @@ static bool stm32_timer_is_trgo2_name(const char *name)
 	return !!strstr(name, "trgo2");
 }
 
+static bool stm32_timer_is_trgo_name(const char *name)
+{
+	return (!!strstr(name, "trgo") && !strstr(name, "trgo2"));
+}
+
 static int stm32_timer_start(struct stm32_timer_trigger *priv,
 			     struct iio_trigger *trig,
 			     unsigned int frequency)
@@ -355,6 +364,7 @@ static int stm32_setup_iio_triggers(struct stm32_timer_trigger *priv)
 
 	while (cur && *cur) {
 		struct iio_trigger *trig;
+		bool cur_is_trgo = stm32_timer_is_trgo_name(*cur);
 		bool cur_is_trgo2 = stm32_timer_is_trgo2_name(*cur);
 
 		if (cur_is_trgo2 && !priv->has_trgo2) {
@@ -371,10 +381,9 @@ static int stm32_setup_iio_triggers(struct stm32_timer_trigger *priv)
 
 		/*
 		 * sampling frequency and master mode attributes
-		 * should only be available on trgo trigger which
-		 * is always the first in the list.
+		 * should only be available on trgo/trgo2 triggers
 		 */
-		if (cur == priv->triggers || cur_is_trgo2)
+		if (cur_is_trgo || cur_is_trgo2)
 			trig->dev.groups = stm32_trigger_attr_groups;
 
 		iio_trigger_set_drvdata(trig, priv);
diff --git a/include/linux/iio/timer/stm32-timer-trigger.h b/include/linux/iio/timer/stm32-timer-trigger.h
index 20f4653..d68add8 100644
--- a/include/linux/iio/timer/stm32-timer-trigger.h
+++ b/include/linux/iio/timer/stm32-timer-trigger.h
@@ -55,12 +55,24 @@
 #define TIM9_CH1	"tim9_ch1"
 #define TIM9_CH2	"tim9_ch2"
 
+#define TIM10_OC1	"tim10_oc1"
+
+#define TIM11_OC1	"tim11_oc1"
+
 #define TIM12_TRGO	"tim12_trgo"
 #define TIM12_CH1	"tim12_ch1"
 #define TIM12_CH2	"tim12_ch2"
 
+#define TIM13_OC1	"tim13_oc1"
+
+#define TIM14_OC1	"tim14_oc1"
+
 #define TIM15_TRGO	"tim15_trgo"
 
+#define TIM16_OC1	"tim16_oc1"
+
+#define TIM17_OC1	"tim17_oc1"
+
 bool is_stm32_timer_trigger(struct iio_trigger *trig);
 
 #endif
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1708067 — Re: [PATCH 3/3] iio: trigger: stm32-timer: add output compare triggers

FromJonathan Cameron <jic23@kernel.org>
Date2017-08-10 01:40 +0200
SubjectRe: [PATCH 3/3] iio: trigger: stm32-timer: add output compare triggers
Message-ID<ucIJX-5Sx-11@gated-at.bofh.it>
In reply to#1702814
On Thu, 3 Aug 2017 11:14:14 +0200
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:

> Add output compare trigger sources available on some instances.
> 
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Applied to the togreg branch of iio.git and pushed out as testing.

Thanks,

Jonathan
> ---
>  drivers/iio/trigger/stm32-timer-trigger.c     | 31 +++++++++++++++++----------
>  include/linux/iio/timer/stm32-timer-trigger.h | 12 +++++++++++
>  2 files changed, 32 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
> index 33890f9..a9bc5b6 100644
> --- a/drivers/iio/trigger/stm32-timer-trigger.c
> +++ b/drivers/iio/trigger/stm32-timer-trigger.c
> @@ -29,12 +29,14 @@
>  	{ TIM7_TRGO,},
>  	{ TIM8_TRGO, TIM8_TRGO2, TIM8_CH1, TIM8_CH2, TIM8_CH3, TIM8_CH4,},
>  	{ TIM9_TRGO, TIM9_CH1, TIM9_CH2,},
> -	{ }, /* timer 10 */
> -	{ }, /* timer 11 */
> +	{ TIM10_OC1,},
> +	{ TIM11_OC1,},
>  	{ TIM12_TRGO, TIM12_CH1, TIM12_CH2,},
> -	{ }, /* timer 13 */
> -	{ }, /* timer 14 */
> +	{ TIM13_OC1,},
> +	{ TIM14_OC1,},
>  	{ TIM15_TRGO,},
> +	{ TIM16_OC1,},
> +	{ TIM17_OC1,},
>  };
>  
>  /* List the triggers accepted by each timer */
> @@ -47,10 +49,10 @@
>  	{ }, /* timer 6 */
>  	{ }, /* timer 7 */
>  	{ TIM1_TRGO, TIM2_TRGO, TIM4_TRGO, TIM5_TRGO,},
> -	{ TIM2_TRGO, TIM3_TRGO,},
> +	{ TIM2_TRGO, TIM3_TRGO, TIM10_OC1, TIM11_OC1,},
>  	{ }, /* timer 10 */
>  	{ }, /* timer 11 */
> -	{ TIM4_TRGO, TIM5_TRGO,},
> +	{ TIM4_TRGO, TIM5_TRGO, TIM13_OC1, TIM14_OC1,},
>  };
>  
>  static const void *stm32h7_valids_table[][MAX_VALIDS] = {
> @@ -65,10 +67,12 @@
>  	{ }, /* timer 9 */
>  	{ }, /* timer 10 */
>  	{ }, /* timer 11 */
> -	{ TIM4_TRGO, TIM5_TRGO,},
> +	{ TIM4_TRGO, TIM5_TRGO, TIM13_OC1, TIM14_OC1,},
>  	{ }, /* timer 13 */
>  	{ }, /* timer 14 */
> -	{ TIM1_TRGO, TIM3_TRGO,},
> +	{ TIM1_TRGO, TIM3_TRGO, TIM16_OC1, TIM17_OC1,},
> +	{ }, /* timer 16 */
> +	{ }, /* timer 17 */
>  };
>  
>  struct stm32_timer_trigger {
> @@ -91,6 +95,11 @@ static bool stm32_timer_is_trgo2_name(const char *name)
>  	return !!strstr(name, "trgo2");
>  }
>  
> +static bool stm32_timer_is_trgo_name(const char *name)
> +{
> +	return (!!strstr(name, "trgo") && !strstr(name, "trgo2"));
> +}
> +
>  static int stm32_timer_start(struct stm32_timer_trigger *priv,
>  			     struct iio_trigger *trig,
>  			     unsigned int frequency)
> @@ -355,6 +364,7 @@ static int stm32_setup_iio_triggers(struct stm32_timer_trigger *priv)
>  
>  	while (cur && *cur) {
>  		struct iio_trigger *trig;
> +		bool cur_is_trgo = stm32_timer_is_trgo_name(*cur);
>  		bool cur_is_trgo2 = stm32_timer_is_trgo2_name(*cur);
>  
>  		if (cur_is_trgo2 && !priv->has_trgo2) {
> @@ -371,10 +381,9 @@ static int stm32_setup_iio_triggers(struct stm32_timer_trigger *priv)
>  
>  		/*
>  		 * sampling frequency and master mode attributes
> -		 * should only be available on trgo trigger which
> -		 * is always the first in the list.
> +		 * should only be available on trgo/trgo2 triggers
>  		 */
> -		if (cur == priv->triggers || cur_is_trgo2)
> +		if (cur_is_trgo || cur_is_trgo2)
>  			trig->dev.groups = stm32_trigger_attr_groups;
>  
>  		iio_trigger_set_drvdata(trig, priv);
> diff --git a/include/linux/iio/timer/stm32-timer-trigger.h b/include/linux/iio/timer/stm32-timer-trigger.h
> index 20f4653..d68add8 100644
> --- a/include/linux/iio/timer/stm32-timer-trigger.h
> +++ b/include/linux/iio/timer/stm32-timer-trigger.h
> @@ -55,12 +55,24 @@
>  #define TIM9_CH1	"tim9_ch1"
>  #define TIM9_CH2	"tim9_ch2"
>  
> +#define TIM10_OC1	"tim10_oc1"
> +
> +#define TIM11_OC1	"tim11_oc1"
> +
>  #define TIM12_TRGO	"tim12_trgo"
>  #define TIM12_CH1	"tim12_ch1"
>  #define TIM12_CH2	"tim12_ch2"
>  
> +#define TIM13_OC1	"tim13_oc1"
> +
> +#define TIM14_OC1	"tim14_oc1"
> +
>  #define TIM15_TRGO	"tim15_trgo"
>  
> +#define TIM16_OC1	"tim16_oc1"
> +
> +#define TIM17_OC1	"tim17_oc1"
> +
>  bool is_stm32_timer_trigger(struct iio_trigger *trig);
>  
>  #endif

[toc] | [prev] | [next] | [standalone]

#1702817 — [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for STM32H7

FromFabrice Gasnier <fabrice.gasnier@st.com>
Date2017-08-03 11:20 +0200
Subject[PATCH 1/3] dt-bindings: iio: timer: stm32: add support for STM32H7
Message-ID<uaksr-6mu-25@gated-at.bofh.it>
In reply to#1702813
STM32H7 has slightly different triggers than previous versions.
Introduce st,stm32h7-timer-trigger compatible to handle this new variant.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
---
 Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt b/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
index 55a653d..b565ced 100644
--- a/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
+++ b/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
@@ -4,7 +4,9 @@ Must be a sub-node of an STM32 Timers device tree node.
 See ../mfd/stm32-timers.txt for details about the parent node.
 
 Required parameters:
-- compatible:	Must be "st,stm32-timer-trigger".
+- compatible:	Must be one of:
+		"st,stm32-timer-trigger"
+		"st,stm32h7-timer-trigger"
 - reg:		Identify trigger hardware block.
 
 Example:
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1708064 — Re: [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for STM32H7

FromJonathan Cameron <jic23@kernel.org>
Date2017-08-10 01:40 +0200
SubjectRe: [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for STM32H7
Message-ID<ucIJX-5Sx-3@gated-at.bofh.it>
In reply to#1702817
On Thu, 3 Aug 2017 11:14:12 +0200
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:

> STM32H7 has slightly different triggers than previous versions.
> Introduce st,stm32h7-timer-trigger compatible to handle this new variant.
> 
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Applied to the togreg branch of iio.git and pushed out as testing.
Thanks,

Jonathan
> ---
>  Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt b/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
> index 55a653d..b565ced 100644
> --- a/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
> +++ b/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
> @@ -4,7 +4,9 @@ Must be a sub-node of an STM32 Timers device tree node.
>  See ../mfd/stm32-timers.txt for details about the parent node.
>  
>  Required parameters:
> -- compatible:	Must be "st,stm32-timer-trigger".
> +- compatible:	Must be one of:
> +		"st,stm32-timer-trigger"
> +		"st,stm32h7-timer-trigger"
>  - reg:		Identify trigger hardware block.
>  
>  Example:

[toc] | [prev] | [next] | [standalone]

#1708908 — Re: [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for STM32H7

FromRob Herring <robh@kernel.org>
Date2017-08-10 19:20 +0200
SubjectRe: [PATCH 1/3] dt-bindings: iio: timer: stm32: add support for STM32H7
Message-ID<ucZhM-8l-5@gated-at.bofh.it>
In reply to#1702817
On Thu, Aug 03, 2017 at 11:14:12AM +0200, Fabrice Gasnier wrote:
> STM32H7 has slightly different triggers than previous versions.
> Introduce st,stm32h7-timer-trigger compatible to handle this new variant.
> 
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
> ---
>  Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Acked-by: Rob Herring <robh@kernel.org>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web