Commit 4defb935 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'samsung-clk-6.15' of... 

Merge tag 'samsung-clk-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into clk-samsung

Pull Samsung clk driver updates from Krzysztof Kozlowski:

 - Samsung Exynos990: Add support for the PERIS clock controller in existing
   driver
 - Samsung Exynos2200: Add new driver for several clock controllers (Alive,
   CMGP, HSI, PERIC/PERIS, TOP, UFS and VFS)
 - Samsung Exynos7870: Add new driver for several clock controllers (Alive,
   MIF, DISP AUD, FSYS, G3D, ISP, MFC and PERI)
 - Correct undefined behavior / runtime array bounds check of flexible
   array member (last 'hws' element in 'struct clk_hw_onecell_data').
   The code was logically correct for normal case, but not for the
   clang/GCC runtime bounds checking of flexible array member.
 - Spelling and header inclusion cleanups

* tag 'samsung-clk-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  clk: samsung: Drop unused clk.h and of.h headers
  clk: samsung: Add missing mod_devicetable.h header
  clk: samsung: add initial exynos7870 clock driver
  clk: samsung: introduce Exynos2200 clock driver
  clk: samsung: clk-pll: add support for pll_4311
  dt-bindings: clock: add clock definitions and documentation for exynos7870 CMU
  dt-bindings: clock: add Exynos2200 SoC
  clk: samsung: Fix UBSAN panic in samsung_clk_init()
  clk: samsung: Fix spelling mistake "stablization" -> "stabilization"
  clk: samsung: exynos990: Add CMU_PERIS block
  dt-bindings: clock: exynos990: Add CMU_PERIS block
parents 2014c95a 017bbc92

Documentation/devicetree/bindings/clock/samsung,exynos2200-cmu.yaml

0 → 100644
+247 −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/samsung,exynos2200-cmu.yaml#

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



title: Samsung Exynos2200 SoC clock controller



maintainers:

  - Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>

  - Chanwoo Choi <cw00.choi@samsung.com>

  - Krzysztof Kozlowski <krzk@kernel.org>



description: |

  Exynos2200 clock controller is comprised of several CMU units, generating

  clocks for different domains. Those CMU units are modeled as separate device

  tree nodes, and might depend on each other. The root clocks in that root tree

  are two external clocks: XTCXO (76.8 MHz) and RTCCLK (32768 Hz). XTCXO must be

  defined as a fixed-rate clock in dts, whereas RTCCLK originates from PMIC.



  CMU_TOP is a top-level CMU, where all base clocks are prepared using PLLs and

  dividers; all other clocks of function blocks (other CMUs) are usually

  derived from CMU_TOP.



  Each clock is assigned an identifier and client nodes can use this identifier

  to specify the clock which they consume. All clocks available for usage

  in clock consumer nodes are defined as preprocessor macros in

  'include/dt-bindings/clock/samsung,exynos2200-cmu.h' header.



properties:

  compatible:

    enum:

      - samsung,exynos2200-cmu-alive

      - samsung,exynos2200-cmu-cmgp

      - samsung,exynos2200-cmu-hsi0

      - samsung,exynos2200-cmu-peric0

      - samsung,exynos2200-cmu-peric1

      - samsung,exynos2200-cmu-peric2

      - samsung,exynos2200-cmu-peris

      - samsung,exynos2200-cmu-top

      - samsung,exynos2200-cmu-ufs

      - samsung,exynos2200-cmu-vts



  clocks:

    minItems: 1

    maxItems: 6



  clock-names:

    minItems: 1

    maxItems: 6



  "#clock-cells":

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - clocks

  - clock-names

  - reg

  - "#clock-cells"



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos2200-cmu-alive



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (76.8 MHz)

            - description: CMU_ALIVE NOC clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: noc



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos2200-cmu-cmgp



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (76.8 MHz)

            - description: CMU_CMGP NOC clock (from CMU_TOP)

            - description: CMU_CMGP PERI clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: noc

            - const: peri



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos2200-cmu-hsi0



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (76.8 MHz)

            - description: External RTC clock (32768 Hz)

            - description: CMU_HSI0 NOC clock (from CMU_TOP)

            - description: CMU_HSI0 DPGTC clock (from CMU_TOP)

            - description: CMU_HSI0 DPOSC clock (from CMU_TOP)

            - description: CMU_HSI0 USB32DRD clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: rtcclk

            - const: noc

            - const: dpgtc

            - const: dposc

            - const: usb



  - if:

      properties:

        compatible:

          contains:

            enum:

              - samsung,exynos2200-cmu-peric0

              - samsung,exynos2200-cmu-peric1

              - samsung,exynos2200-cmu-peric2



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (76.8 MHz)

            - description: CMU_PERICn NOC clock (from CMU_TOP)

            - description: CMU_PERICn IP0 clock (from CMU_TOP)

            - description: CMU_PERICn IP1 clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: noc

            - const: ip0

            - const: ip1



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos2200-cmu-peris



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (25.6 MHz)

            - description: CMU_PERIS NOC clock (from CMU_TOP)

            - description: CMU_PERIS GIC clock (from CMU_TOP)



        clock-names:

          items:

            - const: tcxo_div3

            - const: noc

            - const: gic



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos2200-cmu-top



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (76.8 MHz)



        clock-names:

          items:

            - const: oscclk



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos2200-cmu-ufs



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (76.8 MHz)

            - description: CMU_UFS NOC clock (from CMU_TOP)

            - description: CMU_UFS MMC clock (from CMU_TOP)

            - description: CMU_UFS UFS clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: noc

            - const: mmc

            - const: ufs



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos2200-cmu-vts



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (76.8 MHz)

            - description: CMU_VTS DMIC clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: dmic



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/samsung,exynos2200-cmu.h>



    cmu_vts: clock-controller@15300000 {

        compatible = "samsung,exynos2200-cmu-vts";

        reg = <0x15300000 0x8000>;

        #clock-cells = <1>;



        clocks = <&oscclk>,

                 <&cmu_top CLK_DOUT_CMU_VTS_DMIC>;

        clock-names = "oscclk", "dmic";

    };



...

Documentation/devicetree/bindings/clock/samsung,exynos7870-cmu.yaml

0 → 100644
+227 −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/samsung,exynos7870-cmu.yaml#

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



title: Samsung Exynos7870 SoC clock controller



maintainers:

  - Kaustabh Chakraborty <kauschluss@disroot.org>



description: |

  Exynos7870 clock controller is comprised of several CMU units, generating

  clocks for different domains. Those CMU units are modeled as separate device

  tree nodes, and might depend on each other. The root clock in that root tree

  is an external clock: OSCCLK (26 MHz). This external clock must be defined

  as a fixed-rate clock in dts.



  Each clock is assigned an identifier and client nodes can use this identifier

  to specify the clock which they consume. All clocks available for usage

  in clock consumer nodes are defined as preprocessor macros in

  include/dt-bindings/clock/samsung,exynos7870-cmu.h header.



properties:

  compatible:

    enum:

      - samsung,exynos7870-cmu-mif

      - samsung,exynos7870-cmu-dispaud

      - samsung,exynos7870-cmu-fsys

      - samsung,exynos7870-cmu-g3d

      - samsung,exynos7870-cmu-isp

      - samsung,exynos7870-cmu-mfcmscl

      - samsung,exynos7870-cmu-peri



  clocks:

    minItems: 1

    maxItems: 10



  clock-names:

    minItems: 1

    maxItems: 10



  "#clock-cells":

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - clocks

  - clock-names

  - "#clock-cells"

  - reg



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos7870-cmu-mif

    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)



        clock-names:

          items:

            - const: oscclk



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos7870-cmu-dispaud

    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: CMU_DISPAUD bus clock (from CMU_MIF)

            - description: DECON external clock (from CMU_MIF)

            - description: DECON vertical clock (from CMU_MIF)



        clock-names:

          items:

            - const: oscclk

            - const: bus

            - const: decon_eclk

            - const: decon_vclk



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos7870-cmu-fsys

    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: CMU_FSYS bus clock (from CMU_MIF)

            - description: USB20DRD clock (from CMU_MIF)



        clock-names:

          items:

            - const: oscclk

            - const: bus

            - const: usb20drd



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos7870-cmu-g3d

    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: G3D switch clock (from CMU_MIF)



        clock-names:

          items:

            - const: oscclk

            - const: switch



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos7870-cmu-isp

    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: ISP camera clock (from CMU_MIF)

            - description: ISP clock (from CMU_MIF)

            - description: ISP VRA clock (from CMU_MIF)



        clock-names:

          items:

            - const: oscclk

            - const: cam

            - const: isp

            - const: vra



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos7870-cmu-mfcmscl

    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: MSCL clock (from CMU_MIF)

            - description: MFC clock (from CMU_MIF)



        clock-names:

          items:

            - const: oscclk

            - const: mfc

            - const: mscl



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos7870-cmu-peri

    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: CMU_PERI bus clock (from CMU_MIF)

            - description: SPI0 clock (from CMU_MIF)

            - description: SPI1 clock (from CMU_MIF)

            - description: SPI2 clock (from CMU_MIF)

            - description: SPI3 clock (from CMU_MIF)

            - description: SPI4 clock (from CMU_MIF)

            - description: UART0 clock (from CMU_MIF)

            - description: UART1 clock (from CMU_MIF)

            - description: UART2 clock (from CMU_MIF)



        clock-names:

          items:

            - const: oscclk

            - const: bus

            - const: spi0

            - const: spi1

            - const: spi2

            - const: spi3

            - const: spi4

            - const: uart0

            - const: uart1

            - const: uart2



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/samsung,exynos7870-cmu.h>



    cmu_peri: clock-controller@101f0000 {

      compatible = "samsung,exynos7870-cmu-peri";

      reg = <0x101f0000 0x1000>;

      #clock-cells = <1>;



      clock-names = "oscclk", "bus", "spi0", "spi1", "spi2",

                    "spi3", "spi4", "uart0", "uart1", "uart2";

      clocks = <&oscclk>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_BUS>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_SPI0>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_SPI1>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_SPI2>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_SPI3>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_SPI4>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_UART0>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_UART1>,

               <&cmu_mif CLK_GOUT_MIF_CMU_PERI_UART2>;

    };



...

Documentation/devicetree/bindings/clock/samsung,exynos990-clock.yaml

+19 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
  compatible:

    enum:

      - samsung,exynos990-cmu-hsi0

      - samsung,exynos990-cmu-peris

      - samsung,exynos990-cmu-top



  clocks:
@@ -79,6 +80,24 @@ allOf: 
            - const: usbdp_debug

            - const: dpgtc



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos990-cmu-peris



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: CMU_PERIS BUS clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: bus



  - if:

      properties:

        compatible:

drivers/clk/samsung/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK) += clk-exynos5433.o 
obj-$(CONFIG_EXYNOS_AUDSS_CLK_CON) += clk-exynos-audss.o

obj-$(CONFIG_EXYNOS_CLKOUT)	+= clk-exynos-clkout.o

obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)	+= clk-exynos-arm64.o

obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)	+= clk-exynos2200.o

obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)	+= clk-exynos7.o

obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)	+= clk-exynos7870.o

obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)	+= clk-exynos7885.o

obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)	+= clk-exynos850.o

obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)	+= clk-exynos8895.o

drivers/clk/samsung/clk-cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void wait_until_divider_stable(void __iomem *div_reg, unsigned long mask) 
	if (!(readl(div_reg) & mask))

		return;



	pr_err("%s: timeout in divider stablization\n", __func__);

	pr_err("%s: timeout in divider stabilization\n", __func__);

}



/*