* [PATCH v5 0/5] Microchip TCB Capture driver @ 2020-05-19 8:37 Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 1/5] ARM: at91: add atmel tcb capabilities Kamel Bouhara ` (4 more replies) 0 siblings, 5 replies; 11+ messages in thread From: Kamel Bouhara @ 2020-05-19 8:37 UTC (permalink / raw) To: William Breathitt Gray, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel Cc: Thomas Petazzoni, linux-input, devicetree, linux-iio, Kamel Bouhara Hello, Here is a new counter driver to support Microchip TCB capture devices. Each SoC has two TCB blocks, each one including three independent channels.The following series adds support for two counter modes: increase and quadrature decoder. As for the atmel clocksource and pwm, the counter driver needs to fill some tcb capabilities in order to operate with the right configuration. This is achieved in first patch of this series. Please feel free to comment. Cheers, Changes in v5: - Fix duplicate keys errors in yaml dt-schema Changes in v4: - Use existing binding to document capture mode of the Microchip TCBs. Changes in v3: - Updated the brand name: s/atmel/microchip/. - Added missing kernel doc for new elements introduced in structure atmel_tcb_config. - Removed useless blank line - Added an explicit clock removing path using devm_add_action_or_reset Changes in v2: - Fixed first patch not applying on mainline - Updated return code to -EINVAL when user is requesting qdec mode on a counter device not supporting it. - Added an error case returning -EINVAL when action edge is performed in qdec mode. - Removed no need to explicity setting ops to NULL from static struct as it is the default value. - Changed confusing code by using snprintf for the sake of clarity. - Changed code to use ARRAY_SIZE so that future reviewers will know that num_counts matches what's in the atmel_tc_count array without having to check so themselves. - Fixed errors reported by dt_binding_check Alexandre Belloni (2): dt-bindings: atmel-tcb: convert bindings to json-schema dt-bindings: microchip: atmel,at91rm9200-tcb: add sama5d2 compatible Kamel Bouhara (3): ARM: at91: add atmel tcb capabilities dt-bindings: counter: microchip-tcb-capture counter counter: Add microchip TCB capture counter .../devicetree/bindings/mfd/atmel-tcb.txt | 56 --- .../soc/microchip/atmel,at91rm9200-tcb.yaml | 176 ++++++++ drivers/counter/Kconfig | 11 + drivers/counter/Makefile | 1 + drivers/counter/microchip-tcb-capture.c | 397 ++++++++++++++++++ include/soc/at91/atmel_tcb.h | 5 + 6 files changed, 590 insertions(+), 56 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-tcb.txt create mode 100644 Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml create mode 100644 drivers/counter/microchip-tcb-capture.c -- 2.25.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v5 1/5] ARM: at91: add atmel tcb capabilities 2020-05-19 8:37 [PATCH v5 0/5] Microchip TCB Capture driver Kamel Bouhara @ 2020-05-19 8:37 ` Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 2/5] dt-bindings: atmel-tcb: convert bindings to json-schema Kamel Bouhara ` (3 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Kamel Bouhara @ 2020-05-19 8:37 UTC (permalink / raw) To: William Breathitt Gray, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel Cc: Thomas Petazzoni, linux-input, devicetree, linux-iio, Kamel Bouhara Some atmel socs have extra tcb capabilities that allow using a generic clock source or enabling a quadrature decoder. Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> --- include/soc/at91/atmel_tcb.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/soc/at91/atmel_tcb.h b/include/soc/at91/atmel_tcb.h index c3c7200ce151..1d7071dc0bca 100644 --- a/include/soc/at91/atmel_tcb.h +++ b/include/soc/at91/atmel_tcb.h @@ -36,9 +36,14 @@ struct clk; /** * struct atmel_tcb_config - SoC data for a Timer/Counter Block * @counter_width: size in bits of a timer counter register + * @has_gclk: boolean indicating if a timer counter has a generic clock + * @has_qdec: boolean indicating if a timer counter has a quadrature + * decoder. */ struct atmel_tcb_config { size_t counter_width; + bool has_gclk; + bool has_qdec; }; /** -- 2.25.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v5 2/5] dt-bindings: atmel-tcb: convert bindings to json-schema 2020-05-19 8:37 [PATCH v5 0/5] Microchip TCB Capture driver Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 1/5] ARM: at91: add atmel tcb capabilities Kamel Bouhara @ 2020-05-19 8:37 ` Kamel Bouhara 2020-05-26 22:49 ` Rob Herring 2020-05-19 8:37 ` [PATCH v5 3/5] dt-bindings: microchip: atmel,at91rm9200-tcb: add sama5d2 compatible Kamel Bouhara ` (2 subsequent siblings) 4 siblings, 1 reply; 11+ messages in thread From: Kamel Bouhara @ 2020-05-19 8:37 UTC (permalink / raw) To: William Breathitt Gray, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel Cc: Thomas Petazzoni, linux-input, devicetree, linux-iio From: Alexandre Belloni <alexandre.belloni@bootlin.com> Convert Atmel Timer Counter Blocks bindings to DT schema format using json-schema. Also move it out of mfd as it is not and has never been related to mfd. Cc: Rob Herring <robh+dt@kernel.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- .../devicetree/bindings/mfd/atmel-tcb.txt | 56 -------- .../soc/microchip/atmel,at91rm9200-tcb.yaml | 126 ++++++++++++++++++ 2 files changed, 126 insertions(+), 56 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-tcb.txt create mode 100644 Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml diff --git a/Documentation/devicetree/bindings/mfd/atmel-tcb.txt b/Documentation/devicetree/bindings/mfd/atmel-tcb.txt deleted file mode 100644 index c4a83e364cb6..000000000000 --- a/Documentation/devicetree/bindings/mfd/atmel-tcb.txt +++ /dev/null @@ -1,56 +0,0 @@ -* Device tree bindings for Atmel Timer Counter Blocks -- compatible: Should be "atmel,<chip>-tcb", "simple-mfd", "syscon". - <chip> can be "at91rm9200" or "at91sam9x5" -- reg: Should contain registers location and length -- #address-cells: has to be 1 -- #size-cells: has to be 0 -- interrupts: Should contain all interrupts for the TC block - Note that you can specify several interrupt cells if the TC - block has one interrupt per channel. -- clock-names: tuple listing input clock names. - Required elements: "t0_clk", "slow_clk" - Optional elements: "t1_clk", "t2_clk" -- clocks: phandles to input clocks. - -The TCB can expose multiple subdevices: - * a timer - - compatible: Should be "atmel,tcb-timer" - - reg: Should contain the TCB channels to be used. If the - counter width is 16 bits (at91rm9200-tcb), two consecutive - channels are needed. Else, only one channel will be used. - -Examples: - -One interrupt per TC block: - tcb0: timer@fff7c000 { - compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0xfff7c000 0x100>; - interrupts = <18 4>; - clocks = <&tcb0_clk>, <&clk32k>; - clock-names = "t0_clk", "slow_clk"; - - timer@0 { - compatible = "atmel,tcb-timer"; - reg = <0>, <1>; - }; - - timer@2 { - compatible = "atmel,tcb-timer"; - reg = <2>; - }; - }; - -One interrupt per TC channel in a TC block: - tcb1: timer@fffdc000 { - compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0xfffdc000 0x100>; - interrupts = <26 4>, <27 4>, <28 4>; - clocks = <&tcb1_clk>, <&clk32k>; - clock-names = "t0_clk", "slow_clk"; - }; - - diff --git a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml new file mode 100644 index 000000000000..4b683151265e --- /dev/null +++ b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml @@ -0,0 +1,126 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/soc/microchip/atmel,at91rm9200-tcb.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Atmel Timer Counter Block + +maintainers: + - Alexandre Belloni <alexandre.belloni@bootlin.com> + +description: | + The Atmel (now Microchip) SoCs have timers named Timer Counter Block. Each + timer has three channels with two counters each. + +properties: + compatible: + items: + - enum: + - atmel,at91rm9200-tcb + - atmel,at91sam9x5-tcb + - const: simple-mfd + - const: syscon + + reg: + maxItems: 1 + + interrupts: + description: + List of interrupts. One interrupt per TCB channel if available or one + interrupt for the TC block + minItems: 1 + maxItems: 3 + + clock-names: + description: + List of clock names. Always includes t0_clk and slow clk. Also includes + t1_clk and t2_clk if a clock per channel is available. + minItems: 2 + maxItems: 4 + items: + enum: + - t0_clk + - t1_clk + - t2_clk + - slow_clk + + clocks: + minItems: 2 + maxItems: 4 + + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + +patternProperties: + "^timer@[0-2]$": + description: The timer block channels that are used as timers. + type: object + properties: + compatible: + const: atmel,tcb-timer + reg: + description: + List of channels to use for this particular timer. + minItems: 1 + maxItems: 3 + + required: + - compatible + - reg + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - '#address-cells' + - '#size-cells' + +examples: + - | + /* One interrupt per TC block: */ + tcb0: timer@fff7c000 { + compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfff7c000 0x100>; + interrupts = <18 4>; + clocks = <&tcb0_clk>, <&clk32k>; + clock-names = "t0_clk", "slow_clk"; + + timer@0 { + compatible = "atmel,tcb-timer"; + reg = <0>, <1>; + }; + + timer@2 { + compatible = "atmel,tcb-timer"; + reg = <2>; + }; + }; + + /* One interrupt per TC channel in a TC block: */ + tcb1: timer@fffdc000 { + compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfffdc000 0x100>; + interrupts = <26 4>, <27 4>, <28 4>; + clocks = <&tcb1_clk>, <&clk32k>; + clock-names = "t0_clk", "slow_clk"; + + timer@0 { + compatible = "atmel,tcb-timer"; + reg = <0>; + }; + + timer@1 { + compatible = "atmel,tcb-timer"; + reg = <1>; + }; + }; -- 2.25.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v5 2/5] dt-bindings: atmel-tcb: convert bindings to json-schema 2020-05-19 8:37 ` [PATCH v5 2/5] dt-bindings: atmel-tcb: convert bindings to json-schema Kamel Bouhara @ 2020-05-26 22:49 ` Rob Herring 0 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2020-05-26 22:49 UTC (permalink / raw) To: Kamel Bouhara Cc: William Breathitt Gray, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni, linux-input, devicetree, linux-iio On Tue, May 19, 2020 at 10:37:13AM +0200, Kamel Bouhara wrote: > From: Alexandre Belloni <alexandre.belloni@bootlin.com> > > Convert Atmel Timer Counter Blocks bindings to DT schema format using > json-schema. > > Also move it out of mfd as it is not and has never been related to mfd. > > Cc: Rob Herring <robh+dt@kernel.org> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> This should have your Sob too. > --- > .../devicetree/bindings/mfd/atmel-tcb.txt | 56 -------- > .../soc/microchip/atmel,at91rm9200-tcb.yaml | 126 ++++++++++++++++++ > 2 files changed, 126 insertions(+), 56 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-tcb.txt > create mode 100644 Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml > > diff --git a/Documentation/devicetree/bindings/mfd/atmel-tcb.txt b/Documentation/devicetree/bindings/mfd/atmel-tcb.txt > deleted file mode 100644 > index c4a83e364cb6..000000000000 > --- a/Documentation/devicetree/bindings/mfd/atmel-tcb.txt > +++ /dev/null > @@ -1,56 +0,0 @@ > -* Device tree bindings for Atmel Timer Counter Blocks > -- compatible: Should be "atmel,<chip>-tcb", "simple-mfd", "syscon". > - <chip> can be "at91rm9200" or "at91sam9x5" > -- reg: Should contain registers location and length > -- #address-cells: has to be 1 > -- #size-cells: has to be 0 > -- interrupts: Should contain all interrupts for the TC block > - Note that you can specify several interrupt cells if the TC > - block has one interrupt per channel. > -- clock-names: tuple listing input clock names. > - Required elements: "t0_clk", "slow_clk" > - Optional elements: "t1_clk", "t2_clk" > -- clocks: phandles to input clocks. > - > -The TCB can expose multiple subdevices: > - * a timer > - - compatible: Should be "atmel,tcb-timer" > - - reg: Should contain the TCB channels to be used. If the > - counter width is 16 bits (at91rm9200-tcb), two consecutive > - channels are needed. Else, only one channel will be used. > - > -Examples: > - > -One interrupt per TC block: > - tcb0: timer@fff7c000 { > - compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <0xfff7c000 0x100>; > - interrupts = <18 4>; > - clocks = <&tcb0_clk>, <&clk32k>; > - clock-names = "t0_clk", "slow_clk"; > - > - timer@0 { > - compatible = "atmel,tcb-timer"; > - reg = <0>, <1>; > - }; > - > - timer@2 { > - compatible = "atmel,tcb-timer"; > - reg = <2>; > - }; > - }; > - > -One interrupt per TC channel in a TC block: > - tcb1: timer@fffdc000 { > - compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <0xfffdc000 0x100>; > - interrupts = <26 4>, <27 4>, <28 4>; > - clocks = <&tcb1_clk>, <&clk32k>; > - clock-names = "t0_clk", "slow_clk"; > - }; > - > - > diff --git a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml > new file mode 100644 > index 000000000000..4b683151265e > --- /dev/null > +++ b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml > @@ -0,0 +1,126 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/soc/microchip/atmel,at91rm9200-tcb.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Atmel Timer Counter Block > + > +maintainers: > + - Alexandre Belloni <alexandre.belloni@bootlin.com> > + > +description: | > + The Atmel (now Microchip) SoCs have timers named Timer Counter Block. Each > + timer has three channels with two counters each. > + > +properties: > + compatible: > + items: > + - enum: > + - atmel,at91rm9200-tcb > + - atmel,at91sam9x5-tcb > + - const: simple-mfd > + - const: syscon > + > + reg: > + maxItems: 1 > + > + interrupts: > + description: > + List of interrupts. One interrupt per TCB channel if available or one > + interrupt for the TC block > + minItems: 1 > + maxItems: 3 > + > + clock-names: > + description: > + List of clock names. Always includes t0_clk and slow clk. Also includes > + t1_clk and t2_clk if a clock per channel is available. This can express the 2nd sentence: allOf: - contains: const: t0_clk - contains: const: slow_clk > + minItems: 2 > + maxItems: 4 > + items: > + enum: > + - t0_clk > + - t1_clk > + - t2_clk > + - slow_clk > + > + clocks: > + minItems: 2 > + maxItems: 4 > + > + '#address-cells': > + const: 1 > + > + '#size-cells': > + const: 0 > + > +patternProperties: > + "^timer@[0-2]$": > + description: The timer block channels that are used as timers. > + type: object > + properties: > + compatible: > + const: atmel,tcb-timer > + reg: > + description: > + List of channels to use for this particular timer. > + minItems: 1 > + maxItems: 3 > + > + required: > + - compatible > + - reg > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - clock-names > + - '#address-cells' > + - '#size-cells' > + > +examples: > + - | > + /* One interrupt per TC block: */ > + tcb0: timer@fff7c000 { > + compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0xfff7c000 0x100>; > + interrupts = <18 4>; > + clocks = <&tcb0_clk>, <&clk32k>; > + clock-names = "t0_clk", "slow_clk"; > + > + timer@0 { > + compatible = "atmel,tcb-timer"; > + reg = <0>, <1>; > + }; > + > + timer@2 { > + compatible = "atmel,tcb-timer"; > + reg = <2>; > + }; > + }; > + > + /* One interrupt per TC channel in a TC block: */ > + tcb1: timer@fffdc000 { > + compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0xfffdc000 0x100>; > + interrupts = <26 4>, <27 4>, <28 4>; > + clocks = <&tcb1_clk>, <&clk32k>; > + clock-names = "t0_clk", "slow_clk"; > + > + timer@0 { > + compatible = "atmel,tcb-timer"; > + reg = <0>; > + }; > + > + timer@1 { > + compatible = "atmel,tcb-timer"; > + reg = <1>; > + }; > + }; > -- > 2.25.0 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v5 3/5] dt-bindings: microchip: atmel,at91rm9200-tcb: add sama5d2 compatible 2020-05-19 8:37 [PATCH v5 0/5] Microchip TCB Capture driver Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 1/5] ARM: at91: add atmel tcb capabilities Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 2/5] dt-bindings: atmel-tcb: convert bindings to json-schema Kamel Bouhara @ 2020-05-19 8:37 ` Kamel Bouhara 2020-05-26 22:50 ` [PATCH v5 3/5] dt-bindings: microchip: atmel, at91rm9200-tcb: " Rob Herring 2020-05-19 8:37 ` [PATCH v5 4/5] dt-bindings: counter: microchip-tcb-capture counter Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 5/5] counter: Add microchip TCB capture counter Kamel Bouhara 4 siblings, 1 reply; 11+ messages in thread From: Kamel Bouhara @ 2020-05-19 8:37 UTC (permalink / raw) To: William Breathitt Gray, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel Cc: Thomas Petazzoni, linux-input, devicetree, linux-iio From: Alexandre Belloni <alexandre.belloni@bootlin.com> The sama5d2 TC block TIMER_CLOCK1 is different from the at91sam9x5 one. Instead of being MCK / 2, it is the TCB GCLK. Cc: Rob Herring <robh+dt@kernel.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- .../soc/microchip/atmel,at91rm9200-tcb.yaml | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml index 4b683151265e..38403760f64d 100644 --- a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml +++ b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml @@ -19,6 +19,7 @@ properties: - enum: - atmel,at91rm9200-tcb - atmel,at91sam9x5-tcb + - atmel,sama5d2-tcb - const: simple-mfd - const: syscon @@ -38,12 +39,6 @@ properties: t1_clk and t2_clk if a clock per channel is available. minItems: 2 maxItems: 4 - items: - enum: - - t0_clk - - t1_clk - - t2_clk - - slow_clk clocks: minItems: 2 @@ -72,6 +67,35 @@ patternProperties: - compatible - reg +allOf: + - if: + properties: + compatible: + contains: + const: atmel,sama5d2-tcb + then: + properties: + clocks: + minItems: 3 + maxItems: 3 + clock-names: + items: + - const: t0_clk + - const: gclk + - const: slow_clk + else: + properties: + clocks: + minItems: 2 + maxItems: 4 + clock-names: + items: + enum: + - t0_clk + - t1_clk + - t2_clk + - slow_clk + required: - compatible - reg -- 2.25.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v5 3/5] dt-bindings: microchip: atmel, at91rm9200-tcb: add sama5d2 compatible 2020-05-19 8:37 ` [PATCH v5 3/5] dt-bindings: microchip: atmel,at91rm9200-tcb: add sama5d2 compatible Kamel Bouhara @ 2020-05-26 22:50 ` Rob Herring 0 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2020-05-26 22:50 UTC (permalink / raw) To: Kamel Bouhara Cc: devicetree, Alexandre Belloni, Rob Herring, William Breathitt Gray, linux-input, Nicolas Ferre, Thomas Petazzoni, Ludovic Desroches, Mark Rutland, linux-iio, linux-arm-kernel On Tue, 19 May 2020 10:37:14 +0200, Kamel Bouhara wrote: > From: Alexandre Belloni <alexandre.belloni@bootlin.com> > > The sama5d2 TC block TIMER_CLOCK1 is different from the at91sam9x5 one. > Instead of being MCK / 2, it is the TCB GCLK. > > Cc: Rob Herring <robh+dt@kernel.org> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > .../soc/microchip/atmel,at91rm9200-tcb.yaml | 36 +++++++++++++++---- > 1 file changed, 30 insertions(+), 6 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v5 4/5] dt-bindings: counter: microchip-tcb-capture counter 2020-05-19 8:37 [PATCH v5 0/5] Microchip TCB Capture driver Kamel Bouhara ` (2 preceding siblings ...) 2020-05-19 8:37 ` [PATCH v5 3/5] dt-bindings: microchip: atmel,at91rm9200-tcb: add sama5d2 compatible Kamel Bouhara @ 2020-05-19 8:37 ` Kamel Bouhara 2020-05-26 22:51 ` Rob Herring 2020-05-19 8:37 ` [PATCH v5 5/5] counter: Add microchip TCB capture counter Kamel Bouhara 4 siblings, 1 reply; 11+ messages in thread From: Kamel Bouhara @ 2020-05-19 8:37 UTC (permalink / raw) To: William Breathitt Gray, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel Cc: Thomas Petazzoni, linux-input, devicetree, linux-iio, Kamel Bouhara Describe the devicetree binding for the Microchip TCB module. Each counter blocks exposes three independent counters. However, when configured in quadrature decoder, both channel <0> and <1> are required for speed/position and rotation capture (yet only the position is captured). Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> --- .../soc/microchip/atmel,at91rm9200-tcb.yaml | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml index 38403760f64d..e3319c4501c1 100644 --- a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml +++ b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml @@ -52,14 +52,20 @@ properties: patternProperties: "^timer@[0-2]$": - description: The timer block channels that are used as timers. + description: The timer block channels that are used as timers or counters. type: object properties: compatible: - const: atmel,tcb-timer + items: + - enum: + - atmel,tcb-timer + - microchip,tcb-capture reg: description: - List of channels to use for this particular timer. + List of channels to use for this particular timer. In Microchip TCB capture + mode channels are registered as a counter devices, for the qdec mode TCB0's + channel <0> and <1> are required. + minItems: 1 maxItems: 3 @@ -148,3 +154,23 @@ examples: reg = <1>; }; }; + /* TCB0 Capture with QDEC: */ + timer@f800c000 { + compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfff7c000 0x100>; + interrupts = <18 4>; + clocks = <&tcb0_clk>, <&clk32k>; + clock-names = "t0_clk", "slow_clk"; + + timer@0 { + compatible = "microchip,tcb-capture"; + reg = <0>, <1>; + }; + + timer@2 { + compatible = "atmel,tcb-timer"; + reg = <2>; + }; + }; -- 2.25.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v5 4/5] dt-bindings: counter: microchip-tcb-capture counter 2020-05-19 8:37 ` [PATCH v5 4/5] dt-bindings: counter: microchip-tcb-capture counter Kamel Bouhara @ 2020-05-26 22:51 ` Rob Herring 0 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2020-05-26 22:51 UTC (permalink / raw) To: Kamel Bouhara Cc: linux-input, devicetree, Rob Herring, linux-arm-kernel, Thomas Petazzoni, Alexandre Belloni, William Breathitt Gray, Nicolas Ferre, Mark Rutland, Ludovic Desroches, linux-iio On Tue, 19 May 2020 10:37:15 +0200, Kamel Bouhara wrote: > Describe the devicetree binding for the Microchip TCB module. > Each counter blocks exposes three independent counters. > > However, when configured in quadrature decoder, both channel <0> and <1> > are required for speed/position and rotation capture (yet only the > position is captured). > > Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> > --- > .../soc/microchip/atmel,at91rm9200-tcb.yaml | 32 +++++++++++++++++-- > 1 file changed, 29 insertions(+), 3 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v5 5/5] counter: Add microchip TCB capture counter 2020-05-19 8:37 [PATCH v5 0/5] Microchip TCB Capture driver Kamel Bouhara ` (3 preceding siblings ...) 2020-05-19 8:37 ` [PATCH v5 4/5] dt-bindings: counter: microchip-tcb-capture counter Kamel Bouhara @ 2020-05-19 8:37 ` Kamel Bouhara 2020-05-24 15:16 ` Jonathan Cameron 4 siblings, 1 reply; 11+ messages in thread From: Kamel Bouhara @ 2020-05-19 8:37 UTC (permalink / raw) To: William Breathitt Gray, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel Cc: Thomas Petazzoni, linux-input, devicetree, linux-iio, Kamel Bouhara This drivers allows to use the capture mode of the Timer Counter Block hardware block available in Microchip SoCs through the counter subsystem. Two functions of the counter are supported for the moment: period capture and quadrature decoder. The latter is only supported by the SAMA5 series of SoCs. For the period capture mode a basic setup has been chosen that will reset the counter each time the period is actually reached. Of course the device offers much more possibilities. For quadrature mode, both channel 0 and 1 must be configured even if we only capture the position (no revolution/rotation). Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> --- drivers/counter/Kconfig | 11 + drivers/counter/Makefile | 1 + drivers/counter/microchip-tcb-capture.c | 397 ++++++++++++++++++++++++ 3 files changed, 409 insertions(+) create mode 100644 drivers/counter/microchip-tcb-capture.c diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index c80fa76bb531..2de53ab0dd25 100644 --- a/drivers/counter/Kconfig +++ b/drivers/counter/Kconfig @@ -70,4 +70,15 @@ config FTM_QUADDEC To compile this driver as a module, choose M here: the module will be called ftm-quaddec. +config MICROCHIP_TCB_CAPTURE + tristate "Microchip Timer Counter Capture driver" + depends on HAS_IOMEM && OF + select REGMAP_MMIO + help + Select this option to enable the Microchip Timer Counter Block + capture driver. + + To compile this driver as a module, choose M here: the + module will be called microchip-tcb-capture. + endif # COUNTER diff --git a/drivers/counter/Makefile b/drivers/counter/Makefile index 55142d1f4c43..0a393f71e481 100644 --- a/drivers/counter/Makefile +++ b/drivers/counter/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_STM32_TIMER_CNT) += stm32-timer-cnt.o obj-$(CONFIG_STM32_LPTIMER_CNT) += stm32-lptimer-cnt.o obj-$(CONFIG_TI_EQEP) += ti-eqep.o obj-$(CONFIG_FTM_QUADDEC) += ftm-quaddec.o +obj-$(CONFIG_MICROCHIP_TCB_CAPTURE) += microchip-tcb-capture.o diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c new file mode 100644 index 000000000000..f7b7743ddb94 --- /dev/null +++ b/drivers/counter/microchip-tcb-capture.c @@ -0,0 +1,397 @@ +// SPDX-License-Identifier: GPL-2.0-only +/** + * Copyright (C) 2020 Microchip + * + * Author: Kamel Bouhara <kamel.bouhara@bootlin.com> + */ +#include <linux/clk.h> +#include <linux/counter.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <soc/at91/atmel_tcb.h> + +#define ATMEL_TC_CMR_MASK (ATMEL_TC_LDRA_RISING | ATMEL_TC_LDRB_FALLING | \ + ATMEL_TC_ETRGEDG_RISING | ATMEL_TC_LDBDIS | \ + ATMEL_TC_LDBSTOP) + +#define ATMEL_TC_QDEN BIT(8) +#define ATMEL_TC_POSEN BIT(9) + +struct mchp_tc_data { + const struct atmel_tcb_config *tc_cfg; + struct counter_device counter; + struct regmap *regmap; + int qdec_mode; + int num_channels; + int channel[2]; + bool trig_inverted; +}; + +enum mchp_tc_count_function { + MCHP_TC_FUNCTION_INCREASE, + MCHP_TC_FUNCTION_QUADRATURE, +}; + +static enum counter_count_function mchp_tc_count_functions[] = { + [MCHP_TC_FUNCTION_INCREASE] = COUNTER_COUNT_FUNCTION_INCREASE, + [MCHP_TC_FUNCTION_QUADRATURE] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4, +}; + +enum mchp_tc_synapse_action { + MCHP_TC_SYNAPSE_ACTION_NONE = 0, + MCHP_TC_SYNAPSE_ACTION_RISING_EDGE, + MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE, + MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE +}; + +static enum counter_synapse_action mchp_tc_synapse_actions[] = { + [MCHP_TC_SYNAPSE_ACTION_NONE] = COUNTER_SYNAPSE_ACTION_NONE, + [MCHP_TC_SYNAPSE_ACTION_RISING_EDGE] = COUNTER_SYNAPSE_ACTION_RISING_EDGE, + [MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE] = COUNTER_SYNAPSE_ACTION_FALLING_EDGE, + [MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE] = COUNTER_SYNAPSE_ACTION_BOTH_EDGES, +}; + +static struct counter_signal mchp_tc_count_signals[] = { + { + .id = 0, + .name = "Channel A", + }, + { + .id = 1, + .name = "Channel B", + } +}; + +static struct counter_synapse mchp_tc_count_synapses[] = { + { + .actions_list = mchp_tc_synapse_actions, + .num_actions = ARRAY_SIZE(mchp_tc_synapse_actions), + .signal = &mchp_tc_count_signals[0] + }, + { + .actions_list = mchp_tc_synapse_actions, + .num_actions = ARRAY_SIZE(mchp_tc_synapse_actions), + .signal = &mchp_tc_count_signals[1] + } +}; + +static int mchp_tc_count_function_get(struct counter_device *counter, + struct counter_count *count, + size_t *function) +{ + struct mchp_tc_data *const priv = counter->priv; + + if (priv->qdec_mode) + *function = MCHP_TC_FUNCTION_QUADRATURE; + else + *function = MCHP_TC_FUNCTION_INCREASE; + + return 0; +} + +static int mchp_tc_count_function_set(struct counter_device *counter, + struct counter_count *count, + size_t function) +{ + struct mchp_tc_data *const priv = counter->priv; + u32 bmr, cmr; + + regmap_read(priv->regmap, ATMEL_TC_BMR, &bmr); + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr); + + /* Set capture mode */ + cmr &= ~ATMEL_TC_WAVE; + + switch (function) { + case MCHP_TC_FUNCTION_INCREASE: + priv->qdec_mode = 0; + /* Set highest rate based on whether soc has gclk or not */ + bmr &= ~(ATMEL_TC_QDEN | ATMEL_TC_POSEN); + if (priv->tc_cfg->has_gclk) + cmr |= ATMEL_TC_TIMER_CLOCK2; + else + cmr |= ATMEL_TC_TIMER_CLOCK1; + /* Setup the period capture mode */ + cmr |= ATMEL_TC_CMR_MASK; + cmr &= ~(ATMEL_TC_ABETRG | ATMEL_TC_XC0); + break; + case MCHP_TC_FUNCTION_QUADRATURE: + if (!priv->tc_cfg->has_qdec) + return -EINVAL; + /* In QDEC mode settings both channels 0 and 1 are required */ + if (priv->num_channels < 2 || priv->channel[0] != 0 || + priv->channel[1] != 1) { + pr_err("Invalid channels number or id for quadrature mode\n"); + return -EINVAL; + } + priv->qdec_mode = 1; + bmr |= ATMEL_TC_QDEN | ATMEL_TC_POSEN; + cmr |= ATMEL_TC_ETRGEDG_RISING | ATMEL_TC_ABETRG | ATMEL_TC_XC0; + break; + } + + regmap_write(priv->regmap, ATMEL_TC_BMR, bmr); + regmap_write(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), cmr); + + /* Enable clock and trigger counter */ + regmap_write(priv->regmap, ATMEL_TC_REG(priv->channel[0], CCR), + ATMEL_TC_CLKEN | ATMEL_TC_SWTRG); + + if (priv->qdec_mode) { + regmap_write(priv->regmap, + ATMEL_TC_REG(priv->channel[1], CMR), cmr); + regmap_write(priv->regmap, + ATMEL_TC_REG(priv->channel[1], CCR), + ATMEL_TC_CLKEN | ATMEL_TC_SWTRG); + } + + return 0; +} + +static int mchp_tc_count_signal_read(struct counter_device *counter, + struct counter_signal *signal, + enum counter_signal_value *val) +{ + struct mchp_tc_data *const priv = counter->priv; + bool sigstatus; + u32 sr; + + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], SR), &sr); + + if (priv->trig_inverted) + sigstatus = (sr & ATMEL_TC_MTIOB); + else + sigstatus = (sr & ATMEL_TC_MTIOA); + + *val = sigstatus ? COUNTER_SIGNAL_HIGH : COUNTER_SIGNAL_LOW; + + return 0; +} + +static int mchp_tc_count_action_get(struct counter_device *counter, + struct counter_count *count, + struct counter_synapse *synapse, + size_t *action) +{ + struct mchp_tc_data *const priv = counter->priv; + u32 cmr; + + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr); + + *action = MCHP_TC_SYNAPSE_ACTION_NONE; + + if (cmr & ATMEL_TC_ETRGEDG_NONE) + *action = MCHP_TC_SYNAPSE_ACTION_NONE; + else if (cmr & ATMEL_TC_ETRGEDG_RISING) + *action = MCHP_TC_SYNAPSE_ACTION_RISING_EDGE; + else if (cmr & ATMEL_TC_ETRGEDG_FALLING) + *action = MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE; + else if (cmr & ATMEL_TC_ETRGEDG_BOTH) + *action = MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE; + + return 0; +} + +static int mchp_tc_count_action_set(struct counter_device *counter, + struct counter_count *count, + struct counter_synapse *synapse, + size_t action) +{ + struct mchp_tc_data *const priv = counter->priv; + u32 edge = ATMEL_TC_ETRGEDG_NONE; + + /* QDEC mode is rising edge only */ + if (priv->qdec_mode) + return -EINVAL; + + switch (action) { + case MCHP_TC_SYNAPSE_ACTION_NONE: + edge = ATMEL_TC_ETRGEDG_NONE; + break; + case MCHP_TC_SYNAPSE_ACTION_RISING_EDGE: + edge = ATMEL_TC_ETRGEDG_RISING; + break; + case MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE: + edge = ATMEL_TC_ETRGEDG_FALLING; + break; + case MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE: + edge = ATMEL_TC_ETRGEDG_BOTH; + break; + } + + return regmap_write_bits(priv->regmap, + ATMEL_TC_REG(priv->channel[0], CMR), + ATMEL_TC_ETRGEDG, edge); +} + +static int mchp_tc_count_read(struct counter_device *counter, + struct counter_count *count, + unsigned long *val) +{ + struct mchp_tc_data *const priv = counter->priv; + u32 cnt; + + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CV), &cnt); + *val = cnt; + + return 0; +} + +static struct counter_count mchp_tc_counts[] = { + { + .id = 0, + .name = "Timer Counter", + .functions_list = mchp_tc_count_functions, + .num_functions = ARRAY_SIZE(mchp_tc_count_functions), + .synapses = mchp_tc_count_synapses, + .num_synapses = ARRAY_SIZE(mchp_tc_count_synapses), + }, +}; + +static struct counter_ops mchp_tc_ops = { + .signal_read = mchp_tc_count_signal_read, + .count_read = mchp_tc_count_read, + .function_get = mchp_tc_count_function_get, + .function_set = mchp_tc_count_function_set, + .action_get = mchp_tc_count_action_get, + .action_set = mchp_tc_count_action_set +}; + +static const struct atmel_tcb_config tcb_rm9200_config = { + .counter_width = 16, +}; + +static const struct atmel_tcb_config tcb_sam9x5_config = { + .counter_width = 32, +}; + +static const struct atmel_tcb_config tcb_sama5d2_config = { + .counter_width = 32, + .has_gclk = true, + .has_qdec = true, +}; + +static const struct atmel_tcb_config tcb_sama5d3_config = { + .counter_width = 32, + .has_qdec = true, +}; + +static const struct of_device_id atmel_tc_of_match[] = { + { .compatible = "atmel,at91rm9200-tcb", .data = &tcb_rm9200_config, }, + { .compatible = "atmel,at91sam9x5-tcb", .data = &tcb_sam9x5_config, }, + { .compatible = "atmel,sama5d2-tcb", .data = &tcb_sama5d2_config, }, + { .compatible = "atmel,sama5d3-tcb", .data = &tcb_sama5d3_config, }, + { /* sentinel */ } +}; + +static void mchp_tc_clk_remove(void *ptr) +{ + clk_disable_unprepare((struct clk *)ptr); +} + +static int mchp_tc_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + const struct atmel_tcb_config *tcb_config; + const struct of_device_id *match; + struct mchp_tc_data *priv; + char clk_name[7]; + struct regmap *regmap; + struct clk *clk[3]; + int channel; + int ret, i; + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + platform_set_drvdata(pdev, priv); + + match = of_match_node(atmel_tc_of_match, np->parent); + tcb_config = match->data; + if (!tcb_config) { + dev_err(&pdev->dev, "No matching parent node found\n"); + return -ENODEV; + } + + regmap = syscon_node_to_regmap(np->parent); + if (IS_ERR(priv->regmap)) + return PTR_ERR(priv->regmap); + + /* max. channels number is 2 when in QDEC mode */ + priv->num_channels = of_property_count_u32_elems(np, "reg"); + if (priv->num_channels < 0) { + dev_err(&pdev->dev, "Invalid or missing channel\n"); + return -EINVAL; + } + + /* Register channels and initialize clocks */ + for (i = 0; i < priv->num_channels; i++) { + ret = of_property_read_u32_index(np, "reg", i, &channel); + if (ret < 0 || channel > 2) + return -ENODEV; + + priv->channel[i] = channel; + + snprintf(clk_name, sizeof(clk_name), "t%d_clk", channel); + + clk[i] = of_clk_get_by_name(np->parent, clk_name); + if (IS_ERR(clk[i])) { + /* Fallback to t0_clk */ + clk[i] = of_clk_get_by_name(np->parent, "t0_clk"); + if (IS_ERR(clk[i])) + return PTR_ERR(clk[i]); + } + + ret = clk_prepare_enable(clk[i]); + if (ret) + return ret; + + ret = devm_add_action_or_reset(&pdev->dev, + mchp_tc_clk_remove, + clk[i]); + if (ret) + return ret; + + dev_dbg(&pdev->dev, + "Initialized capture mode on channel %d\n", + channel); + } + + priv->tc_cfg = tcb_config; + priv->regmap = regmap; + priv->counter.name = dev_name(&pdev->dev); + priv->counter.parent = &pdev->dev; + priv->counter.ops = &mchp_tc_ops; + priv->counter.num_counts = ARRAY_SIZE(mchp_tc_counts); + priv->counter.counts = mchp_tc_counts; + priv->counter.num_signals = ARRAY_SIZE(mchp_tc_count_signals); + priv->counter.signals = mchp_tc_count_signals; + priv->counter.priv = priv; + + return devm_counter_register(&pdev->dev, &priv->counter); +} + +static const struct of_device_id mchp_tc_dt_ids[] = { + { .compatible = "microchip,tcb-capture", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, mchp_tc_dt_ids); + +static struct platform_driver mchp_tc_driver = { + .probe = mchp_tc_probe, + .driver = { + .name = "microchip-tcb-capture", + .of_match_table = mchp_tc_dt_ids, + }, +}; +module_platform_driver(mchp_tc_driver); + +MODULE_AUTHOR("Kamel Bouhara <kamel.bouhara@bootlin.com>"); +MODULE_DESCRIPTION("Microchip TCB Capture driver"); +MODULE_LICENSE("GPL v2"); -- 2.25.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v5 5/5] counter: Add microchip TCB capture counter 2020-05-19 8:37 ` [PATCH v5 5/5] counter: Add microchip TCB capture counter Kamel Bouhara @ 2020-05-24 15:16 ` Jonathan Cameron 2020-05-24 15:35 ` William Breathitt Gray 0 siblings, 1 reply; 11+ messages in thread From: Jonathan Cameron @ 2020-05-24 15:16 UTC (permalink / raw) To: Kamel Bouhara Cc: William Breathitt Gray, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni, linux-input, devicetree, linux-iio On Tue, 19 May 2020 10:37:16 +0200 Kamel Bouhara <kamel.bouhara@bootlin.com> wrote: > This drivers allows to use the capture mode of the Timer Counter Block > hardware block available in Microchip SoCs through the counter subsystem. > > Two functions of the counter are supported for the moment: period > capture and quadrature decoder. The latter is only supported by the > SAMA5 series of SoCs. > > For the period capture mode a basic setup has been chosen that will > reset the counter each time the period is actually reached. Of course > the device offers much more possibilities. > > For quadrature mode, both channel 0 and 1 must be configured even if we > only capture the position (no revolution/rotation). > > Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> Looks good to me. After reviews from William, DT and maybe something from SoC side if intent is I'm taking this. Jonathan > --- > drivers/counter/Kconfig | 11 + > drivers/counter/Makefile | 1 + > drivers/counter/microchip-tcb-capture.c | 397 ++++++++++++++++++++++++ > 3 files changed, 409 insertions(+) > create mode 100644 drivers/counter/microchip-tcb-capture.c > > diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig > index c80fa76bb531..2de53ab0dd25 100644 > --- a/drivers/counter/Kconfig > +++ b/drivers/counter/Kconfig > @@ -70,4 +70,15 @@ config FTM_QUADDEC > To compile this driver as a module, choose M here: the > module will be called ftm-quaddec. > > +config MICROCHIP_TCB_CAPTURE > + tristate "Microchip Timer Counter Capture driver" > + depends on HAS_IOMEM && OF > + select REGMAP_MMIO > + help > + Select this option to enable the Microchip Timer Counter Block > + capture driver. > + > + To compile this driver as a module, choose M here: the > + module will be called microchip-tcb-capture. > + > endif # COUNTER > diff --git a/drivers/counter/Makefile b/drivers/counter/Makefile > index 55142d1f4c43..0a393f71e481 100644 > --- a/drivers/counter/Makefile > +++ b/drivers/counter/Makefile > @@ -10,3 +10,4 @@ obj-$(CONFIG_STM32_TIMER_CNT) += stm32-timer-cnt.o > obj-$(CONFIG_STM32_LPTIMER_CNT) += stm32-lptimer-cnt.o > obj-$(CONFIG_TI_EQEP) += ti-eqep.o > obj-$(CONFIG_FTM_QUADDEC) += ftm-quaddec.o > +obj-$(CONFIG_MICROCHIP_TCB_CAPTURE) += microchip-tcb-capture.o > diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c > new file mode 100644 > index 000000000000..f7b7743ddb94 > --- /dev/null > +++ b/drivers/counter/microchip-tcb-capture.c > @@ -0,0 +1,397 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/** > + * Copyright (C) 2020 Microchip > + * > + * Author: Kamel Bouhara <kamel.bouhara@bootlin.com> > + */ > +#include <linux/clk.h> > +#include <linux/counter.h> > +#include <linux/mfd/syscon.h> > +#include <linux/module.h> > +#include <linux/mutex.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > +#include <soc/at91/atmel_tcb.h> > + > +#define ATMEL_TC_CMR_MASK (ATMEL_TC_LDRA_RISING | ATMEL_TC_LDRB_FALLING | \ > + ATMEL_TC_ETRGEDG_RISING | ATMEL_TC_LDBDIS | \ > + ATMEL_TC_LDBSTOP) > + > +#define ATMEL_TC_QDEN BIT(8) > +#define ATMEL_TC_POSEN BIT(9) > + > +struct mchp_tc_data { > + const struct atmel_tcb_config *tc_cfg; > + struct counter_device counter; > + struct regmap *regmap; > + int qdec_mode; > + int num_channels; > + int channel[2]; > + bool trig_inverted; > +}; > + > +enum mchp_tc_count_function { > + MCHP_TC_FUNCTION_INCREASE, > + MCHP_TC_FUNCTION_QUADRATURE, > +}; > + > +static enum counter_count_function mchp_tc_count_functions[] = { > + [MCHP_TC_FUNCTION_INCREASE] = COUNTER_COUNT_FUNCTION_INCREASE, > + [MCHP_TC_FUNCTION_QUADRATURE] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4, > +}; > + > +enum mchp_tc_synapse_action { > + MCHP_TC_SYNAPSE_ACTION_NONE = 0, > + MCHP_TC_SYNAPSE_ACTION_RISING_EDGE, > + MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE, > + MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE > +}; > + > +static enum counter_synapse_action mchp_tc_synapse_actions[] = { > + [MCHP_TC_SYNAPSE_ACTION_NONE] = COUNTER_SYNAPSE_ACTION_NONE, > + [MCHP_TC_SYNAPSE_ACTION_RISING_EDGE] = COUNTER_SYNAPSE_ACTION_RISING_EDGE, > + [MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE] = COUNTER_SYNAPSE_ACTION_FALLING_EDGE, > + [MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE] = COUNTER_SYNAPSE_ACTION_BOTH_EDGES, > +}; > + > +static struct counter_signal mchp_tc_count_signals[] = { > + { > + .id = 0, > + .name = "Channel A", > + }, > + { > + .id = 1, > + .name = "Channel B", > + } > +}; > + > +static struct counter_synapse mchp_tc_count_synapses[] = { > + { > + .actions_list = mchp_tc_synapse_actions, > + .num_actions = ARRAY_SIZE(mchp_tc_synapse_actions), > + .signal = &mchp_tc_count_signals[0] > + }, > + { > + .actions_list = mchp_tc_synapse_actions, > + .num_actions = ARRAY_SIZE(mchp_tc_synapse_actions), > + .signal = &mchp_tc_count_signals[1] > + } > +}; > + > +static int mchp_tc_count_function_get(struct counter_device *counter, > + struct counter_count *count, > + size_t *function) > +{ > + struct mchp_tc_data *const priv = counter->priv; > + > + if (priv->qdec_mode) > + *function = MCHP_TC_FUNCTION_QUADRATURE; > + else > + *function = MCHP_TC_FUNCTION_INCREASE; > + > + return 0; > +} > + > +static int mchp_tc_count_function_set(struct counter_device *counter, > + struct counter_count *count, > + size_t function) > +{ > + struct mchp_tc_data *const priv = counter->priv; > + u32 bmr, cmr; > + > + regmap_read(priv->regmap, ATMEL_TC_BMR, &bmr); > + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr); > + > + /* Set capture mode */ > + cmr &= ~ATMEL_TC_WAVE; > + > + switch (function) { > + case MCHP_TC_FUNCTION_INCREASE: > + priv->qdec_mode = 0; > + /* Set highest rate based on whether soc has gclk or not */ > + bmr &= ~(ATMEL_TC_QDEN | ATMEL_TC_POSEN); > + if (priv->tc_cfg->has_gclk) > + cmr |= ATMEL_TC_TIMER_CLOCK2; > + else > + cmr |= ATMEL_TC_TIMER_CLOCK1; > + /* Setup the period capture mode */ > + cmr |= ATMEL_TC_CMR_MASK; > + cmr &= ~(ATMEL_TC_ABETRG | ATMEL_TC_XC0); > + break; > + case MCHP_TC_FUNCTION_QUADRATURE: > + if (!priv->tc_cfg->has_qdec) > + return -EINVAL; > + /* In QDEC mode settings both channels 0 and 1 are required */ > + if (priv->num_channels < 2 || priv->channel[0] != 0 || > + priv->channel[1] != 1) { > + pr_err("Invalid channels number or id for quadrature mode\n"); > + return -EINVAL; > + } > + priv->qdec_mode = 1; > + bmr |= ATMEL_TC_QDEN | ATMEL_TC_POSEN; > + cmr |= ATMEL_TC_ETRGEDG_RISING | ATMEL_TC_ABETRG | ATMEL_TC_XC0; > + break; > + } > + > + regmap_write(priv->regmap, ATMEL_TC_BMR, bmr); > + regmap_write(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), cmr); > + > + /* Enable clock and trigger counter */ > + regmap_write(priv->regmap, ATMEL_TC_REG(priv->channel[0], CCR), > + ATMEL_TC_CLKEN | ATMEL_TC_SWTRG); > + > + if (priv->qdec_mode) { > + regmap_write(priv->regmap, > + ATMEL_TC_REG(priv->channel[1], CMR), cmr); > + regmap_write(priv->regmap, > + ATMEL_TC_REG(priv->channel[1], CCR), > + ATMEL_TC_CLKEN | ATMEL_TC_SWTRG); > + } > + > + return 0; > +} > + > +static int mchp_tc_count_signal_read(struct counter_device *counter, > + struct counter_signal *signal, > + enum counter_signal_value *val) > +{ > + struct mchp_tc_data *const priv = counter->priv; > + bool sigstatus; > + u32 sr; > + > + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], SR), &sr); > + > + if (priv->trig_inverted) > + sigstatus = (sr & ATMEL_TC_MTIOB); > + else > + sigstatus = (sr & ATMEL_TC_MTIOA); > + > + *val = sigstatus ? COUNTER_SIGNAL_HIGH : COUNTER_SIGNAL_LOW; > + > + return 0; > +} > + > +static int mchp_tc_count_action_get(struct counter_device *counter, > + struct counter_count *count, > + struct counter_synapse *synapse, > + size_t *action) > +{ > + struct mchp_tc_data *const priv = counter->priv; > + u32 cmr; > + > + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr); > + > + *action = MCHP_TC_SYNAPSE_ACTION_NONE; > + > + if (cmr & ATMEL_TC_ETRGEDG_NONE) > + *action = MCHP_TC_SYNAPSE_ACTION_NONE; > + else if (cmr & ATMEL_TC_ETRGEDG_RISING) > + *action = MCHP_TC_SYNAPSE_ACTION_RISING_EDGE; > + else if (cmr & ATMEL_TC_ETRGEDG_FALLING) > + *action = MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE; > + else if (cmr & ATMEL_TC_ETRGEDG_BOTH) > + *action = MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE; > + > + return 0; > +} > + > +static int mchp_tc_count_action_set(struct counter_device *counter, > + struct counter_count *count, > + struct counter_synapse *synapse, > + size_t action) > +{ > + struct mchp_tc_data *const priv = counter->priv; > + u32 edge = ATMEL_TC_ETRGEDG_NONE; > + > + /* QDEC mode is rising edge only */ > + if (priv->qdec_mode) > + return -EINVAL; > + > + switch (action) { > + case MCHP_TC_SYNAPSE_ACTION_NONE: > + edge = ATMEL_TC_ETRGEDG_NONE; > + break; > + case MCHP_TC_SYNAPSE_ACTION_RISING_EDGE: > + edge = ATMEL_TC_ETRGEDG_RISING; > + break; > + case MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE: > + edge = ATMEL_TC_ETRGEDG_FALLING; > + break; > + case MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE: > + edge = ATMEL_TC_ETRGEDG_BOTH; > + break; > + } > + > + return regmap_write_bits(priv->regmap, > + ATMEL_TC_REG(priv->channel[0], CMR), > + ATMEL_TC_ETRGEDG, edge); > +} > + > +static int mchp_tc_count_read(struct counter_device *counter, > + struct counter_count *count, > + unsigned long *val) > +{ > + struct mchp_tc_data *const priv = counter->priv; > + u32 cnt; > + > + regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CV), &cnt); > + *val = cnt; > + > + return 0; > +} > + > +static struct counter_count mchp_tc_counts[] = { > + { > + .id = 0, > + .name = "Timer Counter", > + .functions_list = mchp_tc_count_functions, > + .num_functions = ARRAY_SIZE(mchp_tc_count_functions), > + .synapses = mchp_tc_count_synapses, > + .num_synapses = ARRAY_SIZE(mchp_tc_count_synapses), > + }, > +}; > + > +static struct counter_ops mchp_tc_ops = { > + .signal_read = mchp_tc_count_signal_read, > + .count_read = mchp_tc_count_read, > + .function_get = mchp_tc_count_function_get, > + .function_set = mchp_tc_count_function_set, > + .action_get = mchp_tc_count_action_get, > + .action_set = mchp_tc_count_action_set > +}; > + > +static const struct atmel_tcb_config tcb_rm9200_config = { > + .counter_width = 16, > +}; > + > +static const struct atmel_tcb_config tcb_sam9x5_config = { > + .counter_width = 32, > +}; > + > +static const struct atmel_tcb_config tcb_sama5d2_config = { > + .counter_width = 32, > + .has_gclk = true, > + .has_qdec = true, > +}; > + > +static const struct atmel_tcb_config tcb_sama5d3_config = { > + .counter_width = 32, > + .has_qdec = true, > +}; > + > +static const struct of_device_id atmel_tc_of_match[] = { > + { .compatible = "atmel,at91rm9200-tcb", .data = &tcb_rm9200_config, }, > + { .compatible = "atmel,at91sam9x5-tcb", .data = &tcb_sam9x5_config, }, > + { .compatible = "atmel,sama5d2-tcb", .data = &tcb_sama5d2_config, }, > + { .compatible = "atmel,sama5d3-tcb", .data = &tcb_sama5d3_config, }, > + { /* sentinel */ } > +}; > + > +static void mchp_tc_clk_remove(void *ptr) > +{ > + clk_disable_unprepare((struct clk *)ptr); > +} > + > +static int mchp_tc_probe(struct platform_device *pdev) > +{ > + struct device_node *np = pdev->dev.of_node; > + const struct atmel_tcb_config *tcb_config; > + const struct of_device_id *match; > + struct mchp_tc_data *priv; > + char clk_name[7]; > + struct regmap *regmap; > + struct clk *clk[3]; > + int channel; > + int ret, i; > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, priv); > + > + match = of_match_node(atmel_tc_of_match, np->parent); > + tcb_config = match->data; > + if (!tcb_config) { > + dev_err(&pdev->dev, "No matching parent node found\n"); > + return -ENODEV; > + } > + > + regmap = syscon_node_to_regmap(np->parent); > + if (IS_ERR(priv->regmap)) > + return PTR_ERR(priv->regmap); > + > + /* max. channels number is 2 when in QDEC mode */ > + priv->num_channels = of_property_count_u32_elems(np, "reg"); > + if (priv->num_channels < 0) { > + dev_err(&pdev->dev, "Invalid or missing channel\n"); > + return -EINVAL; > + } > + > + /* Register channels and initialize clocks */ > + for (i = 0; i < priv->num_channels; i++) { > + ret = of_property_read_u32_index(np, "reg", i, &channel); > + if (ret < 0 || channel > 2) > + return -ENODEV; > + > + priv->channel[i] = channel; > + > + snprintf(clk_name, sizeof(clk_name), "t%d_clk", channel); > + > + clk[i] = of_clk_get_by_name(np->parent, clk_name); > + if (IS_ERR(clk[i])) { > + /* Fallback to t0_clk */ > + clk[i] = of_clk_get_by_name(np->parent, "t0_clk"); > + if (IS_ERR(clk[i])) > + return PTR_ERR(clk[i]); > + } > + > + ret = clk_prepare_enable(clk[i]); > + if (ret) > + return ret; > + > + ret = devm_add_action_or_reset(&pdev->dev, > + mchp_tc_clk_remove, > + clk[i]); > + if (ret) > + return ret; > + > + dev_dbg(&pdev->dev, > + "Initialized capture mode on channel %d\n", > + channel); > + } > + > + priv->tc_cfg = tcb_config; > + priv->regmap = regmap; > + priv->counter.name = dev_name(&pdev->dev); > + priv->counter.parent = &pdev->dev; > + priv->counter.ops = &mchp_tc_ops; > + priv->counter.num_counts = ARRAY_SIZE(mchp_tc_counts); > + priv->counter.counts = mchp_tc_counts; > + priv->counter.num_signals = ARRAY_SIZE(mchp_tc_count_signals); > + priv->counter.signals = mchp_tc_count_signals; > + priv->counter.priv = priv; > + > + return devm_counter_register(&pdev->dev, &priv->counter); > +} > + > +static const struct of_device_id mchp_tc_dt_ids[] = { > + { .compatible = "microchip,tcb-capture", }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(of, mchp_tc_dt_ids); > + > +static struct platform_driver mchp_tc_driver = { > + .probe = mchp_tc_probe, > + .driver = { > + .name = "microchip-tcb-capture", > + .of_match_table = mchp_tc_dt_ids, > + }, > +}; > +module_platform_driver(mchp_tc_driver); > + > +MODULE_AUTHOR("Kamel Bouhara <kamel.bouhara@bootlin.com>"); > +MODULE_DESCRIPTION("Microchip TCB Capture driver"); > +MODULE_LICENSE("GPL v2"); ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 5/5] counter: Add microchip TCB capture counter 2020-05-24 15:16 ` Jonathan Cameron @ 2020-05-24 15:35 ` William Breathitt Gray 0 siblings, 0 replies; 11+ messages in thread From: William Breathitt Gray @ 2020-05-24 15:35 UTC (permalink / raw) To: Jonathan Cameron Cc: Kamel Bouhara, Rob Herring, Mark Rutland, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni, linux-input, devicetree, linux-iio [-- Attachment #1: Type: text/plain, Size: 1396 bytes --] On Sun, May 24, 2020 at 04:16:24PM +0100, Jonathan Cameron wrote: > On Tue, 19 May 2020 10:37:16 +0200 > Kamel Bouhara <kamel.bouhara@bootlin.com> wrote: > > > This drivers allows to use the capture mode of the Timer Counter Block > > hardware block available in Microchip SoCs through the counter subsystem. > > > > Two functions of the counter are supported for the moment: period > > capture and quadrature decoder. The latter is only supported by the > > SAMA5 series of SoCs. > > > > For the period capture mode a basic setup has been chosen that will > > reset the counter each time the period is actually reached. Of course > > the device offers much more possibilities. > > > > For quadrature mode, both channel 0 and 1 must be configured even if we > > only capture the position (no revolution/rotation). > > > > Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> > > Looks good to me. After reviews from William, DT and maybe > something from SoC side if intent is I'm taking this. > > Jonathan I'll defer to the DT maintainers for the dt-binding changes. Regarding this counter driver, I believe there have been no changes since I signed-off for it in the v3 patchset thread. If that's true, I haven't changed my mind -- I'm still statisfied with this particular version and have no objections if it's merged. ;-) William Breathitt Gray [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-05-26 22:52 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-19 8:37 [PATCH v5 0/5] Microchip TCB Capture driver Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 1/5] ARM: at91: add atmel tcb capabilities Kamel Bouhara 2020-05-19 8:37 ` [PATCH v5 2/5] dt-bindings: atmel-tcb: convert bindings to json-schema Kamel Bouhara 2020-05-26 22:49 ` Rob Herring 2020-05-19 8:37 ` [PATCH v5 3/5] dt-bindings: microchip: atmel,at91rm9200-tcb: add sama5d2 compatible Kamel Bouhara 2020-05-26 22:50 ` [PATCH v5 3/5] dt-bindings: microchip: atmel, at91rm9200-tcb: " Rob Herring 2020-05-19 8:37 ` [PATCH v5 4/5] dt-bindings: counter: microchip-tcb-capture counter Kamel Bouhara 2020-05-26 22:51 ` Rob Herring 2020-05-19 8:37 ` [PATCH v5 5/5] counter: Add microchip TCB capture counter Kamel Bouhara 2020-05-24 15:16 ` Jonathan Cameron 2020-05-24 15:35 ` William Breathitt Gray
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).