Commit 5aabfd91 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-cleanup', 'clk-airoha', 'clk-mediatek', 'clk-sophgo' and... 

Merge branches 'clk-cleanup', 'clk-airoha', 'clk-mediatek', 'clk-sophgo' and 'clk-loongson' into clk-next

 - Airoha EN7581 SoC clk driver
 - Sophgo CV1800B, CV1812H and SG2000 SoC clk driver
 - Loongson-2k0500 and Loongson-2k2000 SoC clk driver

* clk-cleanup:
  clk: gemini: Remove an unused field in struct clk_gemini_pci
  clk: highbank: Remove an unused field in struct hb_clk
  clk: ti: dpll: fix incorrect #ifdef checks
  clk: nxp: Remove an unused field in struct lpc18xx_pll

* clk-airoha:
  clk: en7523: Add EN7581 support
  clk: en7523: Add en_clk_soc_data data structure
  dt-bindings: clock: airoha: add EN7581 binding

* clk-mediatek:
  clk: mediatek: mt8365-mm: fix DPI0 parent
  clk: mediatek: pllfh: Don't log error for missing fhctl node

* clk-sophgo:
  clk: sophgo: avoid open-coded 64-bit division
  clk: sophgo: Make synthesizer struct static
  clk: sophgo: Add clock support for SG2000 SoC
  clk: sophgo: Add clock support for CV1810 SoC
  clk: sophgo: Add clock support for CV1800 SoC
  dt-bindings: clock: sophgo: Add clock controller of SG2000 series SoC

* clk-loongson:
  clk: clk-loongson2: Add Loongson-2K2000 clock support
  dt-bindings: clock: loongson2: Add Loongson-2K2000 compatible
  clk: clk-loongson2: Add Loongson-2K0500 clock support
  dt-bindings: clock: loongson2: Add Loongson-2K0500 compatible
  clk: clk-loongson2: Refactor driver for adding new platforms
  dt-bindings: clock: Add Loongson-2K expand clock index
parents 8e931ef1 66bc4732 4c0c0877 0a7c2fda 4f149dd4

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml

+29 −2
Original line number Diff line number Diff line
@@ -29,10 +29,13 @@ description: | 
properties:

  compatible:

    items:

      - const: airoha,en7523-scu

      - enum:

          - airoha,en7523-scu

          - airoha,en7581-scu



  reg:

    maxItems: 2

    minItems: 2

    maxItems: 3



  "#clock-cells":

    description:
@@ -45,6 +48,30 @@ required: 
  - reg

  - '#clock-cells'



allOf:

  - if:

      properties:

        compatible:

          const: airoha,en7523-scu

    then:

      properties:

        reg:

          items:

            - description: scu base address

            - description: misc scu base address



  - if:

      properties:

        compatible:

          const: airoha,en7581-scu

    then:

      properties:

        reg:

          items:

            - description: scu base address

            - description: misc scu base address

            - description: pb scu base address



additionalProperties: false



examples:

Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ description: | 
properties:

  compatible:

    enum:

      - loongson,ls2k-clk

      - loongson,ls2k0500-clk

      - loongson,ls2k-clk  # This is for Loongson-2K1000

      - loongson,ls2k2000-clk



  reg:

    maxItems: 1

Documentation/devicetree/bindings/clock/sophgo,cv1800-clk.yaml

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
$id: http://devicetree.org/schemas/clock/sophgo,cv1800-clk.yaml#

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



title: Sophgo CV1800 Series Clock Controller

title: Sophgo CV1800/SG2000 Series Clock Controller



maintainers:

  - Inochi Amaoto <inochiama@outlook.com>
@@ -14,6 +14,7 @@ properties: 
    enum:

      - sophgo,cv1800-clk

      - sophgo,cv1810-clk

      - sophgo,sg2000-clk



  reg:

    maxItems: 1

drivers/clk/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ source "drivers/clk/rockchip/Kconfig" 
source "drivers/clk/samsung/Kconfig"

source "drivers/clk/sifive/Kconfig"

source "drivers/clk/socfpga/Kconfig"

source "drivers/clk/sophgo/Kconfig"

source "drivers/clk/sprd/Kconfig"

source "drivers/clk/starfive/Kconfig"

source "drivers/clk/sunxi/Kconfig"

drivers/clk/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ 
obj-$(CONFIG_COMMON_CLK_SAMSUNG)	+= samsung/

obj-$(CONFIG_CLK_SIFIVE)		+= sifive/

obj-y					+= socfpga/

obj-y					+= sophgo/

obj-$(CONFIG_PLAT_SPEAR)		+= spear/

obj-y					+= sprd/

obj-$(CONFIG_ARCH_STI)			+= st/