Skip to content

Commit 07c34b3

Browse files
committed
Merge branch '20230707035744.22245-2-quic_jkona@quicinc.com' into clk-for-6.7
Merge the SM8550 camera clock controller patches through a topic branch, to make them available for the DeviceTree source as well.
2 parents 1fa2d1a + a209cf9 commit 07c34b3

7 files changed

Lines changed: 3796 additions & 2 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ description: |
1313
Qualcomm camera clock control module provides the clocks, resets and power
1414
domains on SM8450.
1515
16-
See also:: include/dt-bindings/clock/qcom,sm8450-camcc.h
16+
See also::
17+
include/dt-bindings/clock/qcom,sm8450-camcc.h
18+
include/dt-bindings/clock/qcom,sm8550-camcc.h
1719
1820
properties:
1921
compatible:
20-
const: qcom,sm8450-camcc
22+
enum:
23+
- qcom,sm8450-camcc
24+
- qcom,sm8550-camcc
2125

2226
clocks:
2327
items:

drivers/clk/qcom/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,13 @@ config SM_CAMCC_8450
764764
Support for the camera clock controller on SM8450 devices.
765765
Say Y if you want to support camera devices and camera functionality.
766766

767+
config SM_CAMCC_8550
768+
tristate "SM8550 Camera Clock Controller"
769+
select SM_GCC_8550
770+
help
771+
Support for the camera clock controller on SM8550 devices.
772+
Say Y if you want to support camera devices and camera functionality.
773+
767774
config SM_DISPCC_6115
768775
tristate "SM6115 Display Clock Controller"
769776
depends on ARM64 || COMPILE_TEST

drivers/clk/qcom/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ obj-$(CONFIG_SDX_GCC_75) += gcc-sdx75.o
102102
obj-$(CONFIG_SM_CAMCC_6350) += camcc-sm6350.o
103103
obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o
104104
obj-$(CONFIG_SM_CAMCC_8450) += camcc-sm8450.o
105+
obj-$(CONFIG_SM_CAMCC_8550) += camcc-sm8550.o
105106
obj-$(CONFIG_SM_DISPCC_6115) += dispcc-sm6115.o
106107
obj-$(CONFIG_SM_DISPCC_6125) += dispcc-sm6125.o
107108
obj-$(CONFIG_SM_DISPCC_6350) += dispcc-sm6350.o

0 commit comments

Comments
 (0)