Commit 5324ed66 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge branch 'for-v6.17/clk-dt-bindings-headers' into next/clk

parents 320e7efc da5cb65d

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

+31 −6
Original line number Diff line number Diff line
@@ -32,23 +32,24 @@ description: | 
properties:

  compatible:

    enum:

      - samsung,exynosautov920-cmu-top

      - samsung,exynosautov920-cmu-cpucl0

      - samsung,exynosautov920-cmu-cpucl1

      - samsung,exynosautov920-cmu-cpucl2

      - samsung,exynosautov920-cmu-peric0

      - samsung,exynosautov920-cmu-peric1

      - samsung,exynosautov920-cmu-misc

      - samsung,exynosautov920-cmu-hsi0

      - samsung,exynosautov920-cmu-hsi1

      - samsung,exynosautov920-cmu-hsi2

      - samsung,exynosautov920-cmu-misc

      - samsung,exynosautov920-cmu-peric0

      - samsung,exynosautov920-cmu-peric1

      - samsung,exynosautov920-cmu-top



  clocks:

    minItems: 1

    maxItems: 4

    maxItems: 5



  clock-names:

    minItems: 1

    maxItems: 4

    maxItems: 5



  "#clock-cells":

    const: 1
@@ -201,6 +202,30 @@ allOf: 
            - const: usbdrd

            - const: mmc_card



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynosautov920-cmu-hsi2



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (38.4 MHz)

            - description: CMU_HSI2 NOC clock (from CMU_TOP)

            - description: CMU_HSI2 NOC UFS clock (from CMU_TOP)

            - description: CMU_HSI2 UFS EMBD clock (from CMU_TOP)

            - description: CMU_HSI2 ETHERNET clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: noc

            - const: ufs

            - const: embd

            - const: ethernet



required:

  - compatible

  - "#clock-cells"

include/dt-bindings/clock/samsung,exynosautov920.h

+9 −0
Original line number Diff line number Diff line
@@ -286,4 +286,13 @@ 
#define CLK_MOUT_HSI1_USBDRD_USER	3

#define CLK_MOUT_HSI1_USBDRD		4



/* CMU_HSI2 */

#define FOUT_PLL_ETH                    1

#define CLK_MOUT_HSI2_NOC_UFS_USER      2

#define CLK_MOUT_HSI2_UFS_EMBD_USER     3

#define CLK_MOUT_HSI2_ETHERNET          4

#define CLK_MOUT_HSI2_ETHERNET_USER     5

#define CLK_DOUT_HSI2_ETHERNET          6

#define CLK_DOUT_HSI2_ETHERNET_PTP      7



#endif /* _DT_BINDINGS_CLOCK_EXYNOSAUTOV920_H */