Commit e2ebc659 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

Merge branch '20240602114439.1611-1-quic_jkona@quicinc.com' into arm64-for-6.11 

Merge the SM8650 video and clock controller drivers to gain access to
the constants from the DeviceTree binding.
parents b7a28d8a 09ea4216

Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml

+5 −2
Original line number Diff line number Diff line
@@ -8,15 +8,17 @@ title: Qualcomm Camera Clock & Reset Controller on SM8450 


maintainers:

  - Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>

  - Jagadeesh Kona <quic_jkona@quicinc.com>



description: |

  Qualcomm camera clock control module provides the clocks, resets and power

  domains on SM8450.



  See also::

  See also:

    include/dt-bindings/clock/qcom,sc8280xp-camcc.h

    include/dt-bindings/clock/qcom,sm8450-camcc.h

    include/dt-bindings/clock/qcom,sm8550-camcc.h

    include/dt-bindings/clock/qcom,sc8280xp-camcc.h

    include/dt-bindings/clock/qcom,sm8650-camcc.h

    include/dt-bindings/clock/qcom,x1e80100-camcc.h



allOf:
@@ -28,6 +30,7 @@ properties: 
      - qcom,sc8280xp-camcc

      - qcom,sm8450-camcc

      - qcom,sm8550-camcc

      - qcom,sm8650-camcc

      - qcom,x1e80100-camcc



  clocks:

Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml

+5 −1
Original line number Diff line number Diff line
@@ -8,18 +8,22 @@ title: Qualcomm Video Clock & Reset Controller on SM8450 


maintainers:

  - Taniya Das <quic_tdas@quicinc.com>

  - Jagadeesh Kona <quic_jkona@quicinc.com>



description: |

  Qualcomm video clock control module provides the clocks, resets and power

  domains on SM8450.



  See also:: include/dt-bindings/clock/qcom,videocc-sm8450.h

  See also:

    include/dt-bindings/clock/qcom,sm8450-videocc.h

    include/dt-bindings/clock/qcom,sm8650-videocc.h



properties:

  compatible:

    enum:

      - qcom,sm8450-videocc

      - qcom,sm8550-videocc

      - qcom,sm8650-videocc



  reg:

    maxItems: 1

drivers/clk/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -827,6 +827,14 @@ config SM_CAMCC_8550 
	  Support for the camera clock controller on SM8550 devices.

	  Say Y if you want to support camera devices and camera functionality.



config SM_CAMCC_8650

	tristate "SM8650 Camera Clock Controller"

	depends on ARM64 || COMPILE_TEST

	select SM_GCC_8650

	help

	  Support for the camera clock controller on SM8650 devices.

	  Say Y if you want to support camera devices and camera functionality.



config SM_DISPCC_6115

	tristate "SM6115 Display Clock Controller"

	depends on ARM64 || COMPILE_TEST

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ obj-$(CONFIG_SM_CAMCC_6350) += camcc-sm6350.o 
obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o

obj-$(CONFIG_SM_CAMCC_8450) += camcc-sm8450.o

obj-$(CONFIG_SM_CAMCC_8550) += camcc-sm8550.o

obj-$(CONFIG_SM_CAMCC_8650) += camcc-sm8650.o

obj-$(CONFIG_SM_DISPCC_6115) += dispcc-sm6115.o

obj-$(CONFIG_SM_DISPCC_6125) += dispcc-sm6125.o

obj-$(CONFIG_SM_DISPCC_6350) += dispcc-sm6350.o

drivers/clk/qcom/camcc-sm8650.c

0 → 100644
+3591 −0

File added.

Preview size limit exceeded, changes collapsed.