Commit 228ad72e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v6.13-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core 

Pull clocksource/event updates from Daniel Lezcano:

  - Remove unused dw_apb_clockevent_[pause|resume|stop] functions as
    they are unused since 2021 (David Alan Gilbert)

  - Make the sp804 driver user selectable as they may be unused on some
    platforms (Mark Brown)

  - Don't fail if the ti-dm does not describe an interrupt in the DT as
    this could be a normal situation if the PWM is used (Judith Mendez)

  - Always use cluster 0 counter as a clocksource on a multi-cluster
    system to prevent problems related to the time shifting between
    clusters if multiple per cluster clocksource is used (Paul Burton)

  - Move the RaLink system tick counter from the arch directory to the
    clocksource directory (Sergio Paracuellos)

  - Convert the owl-timer bindings into yaml schema (Ivaylo Ivanov)

  - Fix child node refcount handling on the TI DM by relying on the
    __free annotation to automatically release the refcount on the node
    (Javier Carrasco)

  - Remove pointless cast in the GPX driver as PTR_ERR already does that
    (Tang Bin)

  - Use of_property_present() for non-boolean properties where it is
    possible in the different drivers (Rob Herring)

Link: https://lore.kernel.org/lkml/8d402321-96f1-47f7-9347-a850350d60de@linaro.org
parents 3c2fb015 08b97fbd

Documentation/devicetree/bindings/timer/actions,owl-timer.txt

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
Actions Semi Owl Timer



Required properties:

- compatible      :  "actions,s500-timer" for S500

                     "actions,s700-timer" for S700

                     "actions,s900-timer" for S900

- reg             :  Offset and length of the register set for the device.

- interrupts      :  Should contain the interrupts.

- interrupt-names :  Valid names are: "2hz0", "2hz1",

                                      "timer0", "timer1", "timer2", "timer3"

                     See ../resource-names.txt



Example:



		timer@b0168000 {

			compatible = "actions,s500-timer";

			reg = <0xb0168000 0x100>;

			interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

			             <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "timer0", "timer1";

		};

Documentation/devicetree/bindings/timer/actions,owl-timer.yaml

0 → 100644
+107 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/timer/actions,owl-timer.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Actions Semi Owl timer



maintainers:

  - Andreas Färber <afaerber@suse.de>



description:

  Actions Semi Owl SoCs provide 32bit and 2Hz timers.

  The 32bit timers support dynamic irq, as well as one-shot mode.



properties:

  compatible:

    enum:

      - actions,s500-timer

      - actions,s700-timer

      - actions,s900-timer



  clocks:

    maxItems: 1



  interrupts:

    minItems: 1

    maxItems: 6



  interrupt-names:

    minItems: 1

    maxItems: 6

    items:

      enum:

        - 2hz0

        - 2hz1

        - timer0

        - timer1

        - timer2

        - timer3



  reg:

    maxItems: 1



required:

  - compatible

  - clocks

  - interrupts

  - interrupt-names

  - reg



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - actions,s500-timer

    then:

      properties:

        interrupts:

          minItems: 4

          maxItems: 4

        interrupt-names:

          items:

            - const: 2hz0

            - const: 2hz1

            - const: timer0

            - const: timer1



  - if:

      properties:

        compatible:

          contains:

            enum:

              - actions,s700-timer

              - actions,s900-timer

    then:

      properties:

        interrupts:

          minItems: 1

          maxItems: 1

        interrupt-names:

          items:

            - const: timer1



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    soc {

      #address-cells = <1>;

      #size-cells = <1>;

      timer@b0168000 {

        compatible = "actions,s500-timer";

        reg = <0xb0168000 0x100>;

        clocks = <&hosc>;

        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

        interrupt-names = "2hz0", "2hz1", "timer0", "timer1";

      };

    };

...

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,7 @@ F: Documentation/devicetree/bindings/mmc/owl-mmc.yaml 
F:	Documentation/devicetree/bindings/net/actions,owl-emac.yaml

F:	Documentation/devicetree/bindings/pinctrl/actions,*

F:	Documentation/devicetree/bindings/power/actions,owl-sps.txt

F:	Documentation/devicetree/bindings/timer/actions,owl-timer.txt

F:	Documentation/devicetree/bindings/timer/actions,owl-timer.yaml

F:	arch/arm/boot/dts/actions/

F:	arch/arm/mach-actions/

F:	arch/arm64/boot/dts/actions/

arch/mips/ralink/Kconfig

+0 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

if RALINK



config CLKEVT_RT3352

	bool

	depends on SOC_RT305X || SOC_MT7620

	default y

	select TIMER_OF

	select CLKSRC_MMIO



config RALINK_ILL_ACC

	bool

	depends on SOC_RT305X

arch/mips/ralink/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ ifndef CONFIG_MIPS_GIC 
	obj-y += clk.o timer.o

endif



obj-$(CONFIG_CLKEVT_RT3352) += cevt-rt3352.o



obj-$(CONFIG_RALINK_ILL_ACC) += ill_acc.o



obj-$(CONFIG_IRQ_INTC) += irq.o