Commit d2b32be7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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

Pull clockevent/source updates from Daniel Lezcano:

  - Fix memory leak on Cadence TTC at probe time (Feng Mingxi)

  - Use the pm_sleep_ptr macro for the Ingenic driver (Paul Cercueil)

  - Relocate the PMW timer Loongson from the mips arch directory to the
    drivers/clocksource (Keguang Zhang)

  - Use the same function names instead of using aliases and move data
    defined in the header to the driver directly as this one is the only
    user of the header file and remove this one on i.MX GPT (Uwe
    Kleine-König)

  - Convert Broadcom Kona family timer bindings to DT schema (Michael
     Kelley)

  - Add DT bindings for Ralink SoCs timer (Sergio Paracuellos)
parents ccaa4926 8b5bf64c

Documentation/devicetree/bindings/timer/brcm,kona-timer.txt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
Broadcom Kona Family timer

-----------------------------------------------------

This timer is used in the following Broadcom SoCs:

 BCM11130, BCM11140, BCM11351, BCM28145, BCM28155



Required properties:

- compatible : "brcm,kona-timer"

- DEPRECATED: compatible : "bcm,kona-timer"

- reg : Register range for the timer

- interrupts : interrupt for the timer

- clocks: phandle + clock specifier pair of the external clock

- clock-frequency: frequency that the clock operates



Only one of clocks or clock-frequency should be specified.



Refer to clocks/clock-bindings.txt for generic clock consumer properties.



Example:

	timer@35006000 {

		compatible = "brcm,kona-timer";

		reg = <0x35006000 0x1000>;

		interrupts = <0x0 7 0x4>;

		clocks = <&hub_timer_clk>;

	};

Documentation/devicetree/bindings/timer/brcm,kona-timer.yaml

0 → 100644
+52 −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/brcm,kona-timer.yaml#

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



title: Broadcom Kona family timer



maintainers:

  - Florian Fainelli <f.fainelli@gmail.com>



properties:

  compatible:

    const: brcm,kona-timer



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-frequency: true



oneOf:

  - required:

      - clocks

  - required:

      - clock-frequency



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/bcm281xx.h>

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

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



    timer@35006000 {

        compatible = "brcm,kona-timer";

        reg = <0x35006000 0x1000>;

        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&aon_ccu BCM281XX_AON_CCU_HUB_TIMER>;

    };

...

Documentation/devicetree/bindings/timer/loongson,ls1x-pwmtimer.yaml

0 → 100644
+48 −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/loongson,ls1x-pwmtimer.yaml#

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



title: Loongson-1 PWM timer



maintainers:

  - Keguang Zhang <keguang.zhang@gmail.com>



description:

  Loongson-1 PWM timer can be used for system clock source

  and clock event timers.



properties:

  compatible:

    const: loongson,ls1b-pwmtimer



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/loongson,ls1x-clk.h>

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

    clocksource: timer@1fe5c030 {

        compatible = "loongson,ls1b-pwmtimer";

        reg = <0x1fe5c030 0x10>;



        clocks = <&clkc LS1X_CLKID_APB>;

        interrupt-parent = <&intc0>;

        interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;

    };

Documentation/devicetree/bindings/timer/ralink,rt2880-timer.yaml

0 → 100644
+44 −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/ralink,rt2880-timer.yaml#

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



title: Timer present in Ralink family SoCs



maintainers:

  - Sergio Paracuellos <sergio.paracuellos@gmail.com>



properties:

  compatible:

    const: ralink,rt2880-timer



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - interrupts



additionalProperties: false



examples:

  - |

    timer@100 {

        compatible = "ralink,rt2880-timer";

        reg = <0x100 0x20>;



        clocks = <&sysc 3>;



        interrupt-parent = <&intc>;

        interrupts = <1>;

    };

...

arch/mips/include/asm/mach-loongson32/loongson1.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 


#include <regs-clk.h>

#include <regs-mux.h>

#include <regs-pwm.h>

#include <regs-rtc.h>

#include <regs-wdt.h>