Commit 05a5b5d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull more clk updates from Stephen Boyd:
 "Here's some more updates that missed the last pull request because I
  happened to tag the tree at an earlier point in the history of
  clk-next. I must have fat fingered it and checked out an older version
  of clk-next on this second computer I'm using.

  This time it actually includes more code for Qualcomm SoCs, the AT91
  major updates, and some Rockchip SoC clk driver updates as well. I've
  corrected this flow so this shouldn't happen again"

* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (83 commits)
  clk: bcm2835: Do not use prediv with bcm2711's PLLs
  clk: drop unused function __clk_get_flags
  clk: hsdk: Fix bad dependency on IOMEM
  dt-bindings: clock: Fix YAML schemas for LPASS clocks on SC7180
  clk: mmp: avoid missing prototype warning
  clk: sparx5: Add Sparx5 SoC DPLL clock driver
  dt-bindings: clock: sparx5: Add bindings include file
  clk: qoriq: add LS1021A core pll mux options
  clk: clk-atlas6: fix return value check in atlas6_clk_init()
  clk: tegra: pll: Improve PLLM enable-state detection
  clk: X1000: Add support for calculat REFCLK of USB PHY.
  clk: JZ4780: Reformat the code to align it.
  clk: JZ4780: Add functions for enable and disable USB PHY.
  clk: Ingenic: Add RTC related clocks for Ingenic SoCs.
  dt-bindings: clock: Add tabs to align code.
  dt-bindings: clock: Add RTC related clocks for Ingenic SoCs.
  clk: davinci: Use fallthrough pseudo-keyword
  clk: imx: Use fallthrough pseudo-keyword
  clk: qcom: gcc-sdm660: Fix up gcc_mss_mnoc_bimc_axi_clk
  clk: qcom: gcc-sdm660: Add missing modem reset
  ...
parents 45860394 dd9c697a

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,15 @@ maintainers: 
  - Eric Anholt <eric@anholt.net>

  - Stefan Wahren <wahrenst@gmx.net>



select:

  properties:

    compatible:

      contains:

        const: raspberrypi,bcm2835-firmware



  required:

    - compatible



properties:

  compatible:

    items:

Documentation/devicetree/bindings/clock/idt,versaclock5.txt

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
Binding for IDT VersaClock 5,6 programmable i2c clock generators.



The IDT VersaClock 5 and VersaClock 6 are programmable i2c clock

generators providing from 3 to 12 output clocks.



==I2C device node==



Required properties:

- compatible:	shall be one of

		"idt,5p49v5923"

		"idt,5p49v5925"

		"idt,5p49v5933"

		"idt,5p49v5935"

		"idt,5p49v6901"

		"idt,5p49v6965"

- reg:		i2c device address, shall be 0x68 or 0x6a.

- #clock-cells:	from common clock binding; shall be set to 1.

- clocks:	from common clock binding; list of parent clock handles,

		- 5p49v5923 and

		  5p49v5925 and

		  5p49v6901: (required) either or both of XTAL or CLKIN

					reference clock.

		- 5p49v5933 and

		- 5p49v5935: (optional) property not present (internal

					Xtal used) or CLKIN reference

					clock.

- clock-names:	from common clock binding; clock input names, can be

		- 5p49v5923 and

		  5p49v5925 and

		  5p49v6901: (required) either or both of "xin", "clkin".

		- 5p49v5933 and

		- 5p49v5935: (optional) property not present or "clkin".



For all output ports, a corresponding, optional child node named OUT1,

OUT2, etc. can represent a each output, and the node can be used to

specify the following:



- itd,mode: can be one of the following:

                 - VC5_LVPECL

                 - VC5_CMOS

                 - VC5_HCSL33

                 - VC5_LVDS

                 - VC5_CMOS2

                 - VC5_CMOSD

                 - VC5_HCSL25



- idt,voltage-microvolts:  can be one of the following

                 - 1800000

                 - 2500000

                 - 3300000

-  idt,slew-percent: Percent of normal, can be one of

                 - 80

                 - 85

                 - 90

                 - 100



==Mapping between clock specifier and physical pins==



When referencing the provided clock in the DT using phandle and

clock specifier, the following mapping applies:



5P49V5923:

	0 -- OUT0_SEL_I2CB

	1 -- OUT1

	2 -- OUT2



5P49V5933:

	0 -- OUT0_SEL_I2CB

	1 -- OUT1

	2 -- OUT4



5P49V5925 and

5P49V5935:

	0 -- OUT0_SEL_I2CB

	1 -- OUT1

	2 -- OUT2

	3 -- OUT3

	4 -- OUT4



5P49V6901:

	0 -- OUT0_SEL_I2CB

	1 -- OUT1

	2 -- OUT2

	3 -- OUT3

	4 -- OUT4



==Example==



/* 25MHz reference crystal */

ref25: ref25m {

	compatible = "fixed-clock";

	#clock-cells = <0>;

	clock-frequency = <25000000>;

};



i2c-master-node {



	/* IDT 5P49V5923 i2c clock generator */

	vc5: clock-generator@6a {

		compatible = "idt,5p49v5923";

		reg = <0x6a>;

		#clock-cells = <1>;



		/* Connect XIN input to 25MHz reference */

		clocks = <&ref25m>;

		clock-names = "xin";



		OUT1 {

			itd,mode = <VC5_CMOS>;

			idt,voltage-microvolts = <1800000>;

			idt,slew-percent = <80>;

		};

		OUT2 {

			...

		};

		...

	};

};



/* Consumer referencing the 5P49V5923 pin OUT1 */

consumer {

	...

	clocks = <&vc5 1>;

	...

}

Documentation/devicetree/bindings/clock/idt,versaclock5.yaml

0 → 100644
+154 −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/clock/idt,versaclock5.yaml#

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



title: Binding for IDT VersaClock 5 and 6 programmable I2C clock generators



description: |

  The IDT VersaClock 5 and VersaClock 6 are programmable I2C

  clock generators providing from 3 to 12 output clocks.



  When referencing the provided clock in the DT using phandle and clock

  specifier, the following mapping applies:



  - 5P49V5923:

    0 -- OUT0_SEL_I2CB

    1 -- OUT1

    2 -- OUT2



  - 5P49V5933:

    0 -- OUT0_SEL_I2CB

    1 -- OUT1

    2 -- OUT4



  - other parts:

    0 -- OUT0_SEL_I2CB

    1 -- OUT1

    2 -- OUT2

    3 -- OUT3

    4 -- OUT4



maintainers:

  - Luca Ceresoli <luca@lucaceresoli.net>



properties:

  compatible:

    enum:

      - idt,5p49v5923

      - idt,5p49v5925

      - idt,5p49v5933

      - idt,5p49v5935

      - idt,5p49v6901

      - idt,5p49v6965



  reg:

    description: I2C device address

    enum: [ 0x68, 0x6a ]



  '#clock-cells':

    const: 1



patternProperties:

  "^OUT[1-4]$":

    type: object

    description:

      Description of one of the outputs (OUT1..OUT4). See "Clock1 Output

      Configuration" in the Versaclock 5/6/6E Family Register Description

      and Programming Guide.

    properties:

      idt,mode:

        description:

          The output drive mode. Values defined in dt-bindings/clk/versaclock.h

        $ref: /schemas/types.yaml#/definitions/uint32

        minimum: 0

        maximum: 6

      idt,voltage-microvolt:

        description: The output drive voltage.

        enum: [ 1800000, 2500000, 3300000 ]

      idt,slew-percent:

        description: The Slew rate control for CMOS single-ended.

        $ref: /schemas/types.yaml#/definitions/uint32

        enum: [ 80, 85, 90, 100 ]



required:

  - compatible

  - reg

  - '#clock-cells'



allOf:

  - if:

      properties:

        compatible:

          enum:

            - idt,5p49v5933

            - idt,5p49v5935

    then:

      # Devices with builtin crystal + optional external input

      properties:

        clock-names:

          const: clkin

        clocks:

          maxItems: 1

    else:

      # Devices without builtin crystal

      properties:

        clock-names:

            minItems: 1

            maxItems: 2

            items:

              enum: [ xin, clkin ]

        clocks:

          minItems: 1

          maxItems: 2

      required:

        - clock-names

        - clocks



examples:

  - |

    #include <dt-bindings/clk/versaclock.h>



    /* 25MHz reference crystal */

    ref25: ref25m {

        compatible = "fixed-clock";

        #clock-cells = <0>;

        clock-frequency = <25000000>;

    };



    i2c@0 {

        reg = <0x0 0x100>;

        #address-cells = <1>;

        #size-cells = <0>;



        /* IDT 5P49V5923 I2C clock generator */

        vc5: clock-generator@6a {

            compatible = "idt,5p49v5923";

            reg = <0x6a>;

            #clock-cells = <1>;



            /* Connect XIN input to 25MHz reference */

            clocks = <&ref25m>;

            clock-names = "xin";



            OUT1 {

                idt,drive-mode = <VC5_CMOSD>;

                idt,voltage-microvolts = <1800000>;

                idt,slew-percent = <80>;

            };



            OUT4 {

                idt,drive-mode = <VC5_LVDS>;

            };

        };

    };



    /* Consumer referencing the 5P49V5923 pin OUT1 */

    consumer {

        /* ... */

        clocks = <&vc5 1>;

        /* ... */

    };



...

Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml→Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

+13 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/qcom,sdm845-gpucc.yaml#

$id: http://devicetree.org/schemas/clock/qcom,gpucc.yaml#

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



title: Qualcomm Graphics Clock & Reset Controller Binding for SDM845

title: Qualcomm Graphics Clock & Reset Controller Binding



maintainers:

  - Taniya Das <tdas@codeaurora.org>



description: |

  Qualcomm graphics clock control module which supports the clocks, resets and

  power domains on SDM845.

  power domains on SDM845/SC7180/SM8150/SM8250.



  See also dt-bindings/clock/qcom,gpucc-sdm845.h.

  See also:

    dt-bindings/clock/qcom,gpucc-sdm845.h

    dt-bindings/clock/qcom,gpucc-sc7180.h

    dt-bindings/clock/qcom,gpucc-sm8150.h

    dt-bindings/clock/qcom,gpucc-sm8250.h



properties:

  compatible:

    const: qcom,sdm845-gpucc

    enum:

      - qcom,sdm845-gpucc

      - qcom,sc7180-gpucc

      - qcom,sm8150-gpucc

      - qcom,sm8250-gpucc



  clocks:

    items:

Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml

+2 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/qcom,kryocc.yaml#

$id: http://devicetree.org/schemas/clock/qcom,msm8996-apcc.yaml#

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



title: Qualcomm clock controller for MSM8996 CPUs
@@ -46,11 +46,9 @@ required: 
additionalProperties: false



examples:

  # Example for msm8996

  - |

    kryocc: clock-controller@6400000 {

        compatible = "qcom,msm8996-apcc";

        reg = <0x6400000 0x90000>;

        #clock-cells = <1>;

    };
 
...

CRA Git | Maintained and supported by SUSTech CRA and CCSE