Skip to content

Commit e66a601

Browse files
authored
Purwa videocc camcc (#437)
Purwa videocc camcc
2 parents 77ca1c7 + f75adba commit e66a601

8 files changed

Lines changed: 2893 additions & 0 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ description: |
1717
See also:
1818
include/dt-bindings/clock/qcom,sm8450-videocc.h
1919
include/dt-bindings/clock/qcom,sm8650-videocc.h
20+
include/dt-bindings/clock/qcom,x1p42100-videocc.h
2021
2122
properties:
2223
compatible:
@@ -26,6 +27,7 @@ properties:
2627
- qcom,sm8550-videocc
2728
- qcom,sm8650-videocc
2829
- qcom,x1e80100-videocc
30+
- qcom,x1p42100-videocc
2931

3032
clocks:
3133
items:
@@ -61,6 +63,7 @@ allOf:
6163
enum:
6264
- qcom,sm8450-videocc
6365
- qcom,sm8550-videocc
66+
- qcom,x1p42100-videocc
6467
then:
6568
required:
6669
- required-opps

arch/arm64/boot/dts/qcom/purwa.dtsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
/* X1P42100 is heavily based on hamoa, with some meaningful differences */
77
#include "hamoa.dtsi"
88

9+
#include <dt-bindings/clock/qcom,x1p42100-videocc.h>
10+
911
/delete-node/ &bwmon_cluster0;
1012
/delete-node/ &cluster_pd2;
1113
/delete-node/ &cpu_map_cluster2;
@@ -34,10 +36,18 @@
3436
/delete-node/ &cluster2_rep_2_3;
3537
/delete-node/ &apss_funnel_in2;
3638

39+
&camcc {
40+
compatible = "qcom,x1p42100-camcc";
41+
};
42+
3743
&gcc {
3844
compatible = "qcom,x1p42100-gcc", "qcom,x1e80100-gcc";
3945
};
4046

47+
&videocc {
48+
compatible = "qcom,x1p42100-videocc";
49+
};
50+
4151
&gmu {
4252
compatible = "qcom,adreno-gmu-x145.0", "qcom,adreno-gmu";
4353
};

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,9 @@ CONFIG_CLK_X1E80100_DISPCC=m
13991399
CONFIG_CLK_X1E80100_GCC=y
14001400
CONFIG_CLK_X1E80100_GPUCC=m
14011401
CONFIG_CLK_X1E80100_TCSRCC=y
1402+
CONFIG_CLK_X1P42100_CAMCC=m
14021403
CONFIG_CLK_X1P42100_GPUCC=m
1404+
CONFIG_CLK_X1P42100_VIDEOCC=m
14031405
CONFIG_CLK_QCM2290_GPUCC=m
14041406
CONFIG_QCOM_A53PLL=y
14051407
CONFIG_QCOM_CLK_APCS_MSM8916=y

drivers/clk/qcom/Kconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,16 @@ config CLK_X1E80100_TCSRCC
108108
Support for the TCSR clock controller on X1E80100 devices.
109109
Say Y if you want to use peripheral devices such as SD/UFS.
110110

111+
config CLK_X1P42100_CAMCC
112+
tristate "X1P42100 Camera Clock Controller"
113+
depends on ARM64 || COMPILE_TEST
114+
select CLK_X1E80100_GCC
115+
help
116+
Support for the camera clock controller on Qualcomm Technologies, Inc.
117+
X1P42100 devices.
118+
Say Y if you want to support camera devices and camera functionality
119+
such as capturing pictures.
120+
111121
config CLK_X1P42100_GPUCC
112122
tristate "X1P42100 Graphics Clock Controller"
113123
depends on ARM64 || COMPILE_TEST
@@ -117,6 +127,16 @@ config CLK_X1P42100_GPUCC
117127
Say Y if you want to support graphics controller devices and
118128
functionality such as 3D graphics.
119129

130+
config CLK_X1P42100_VIDEOCC
131+
tristate "X1P42100 Video Clock Controller"
132+
depends on ARM64 || COMPILE_TEST
133+
select CLK_X1E80100_GCC
134+
help
135+
Support for the video clock controller on Qualcomm Technologies, Inc.
136+
X1P42100 devices.
137+
Say Y if you want to support video devices and functionality such as
138+
video encode/decode.
139+
120140
config CLK_QCM2290_GPUCC
121141
tristate "QCM2290 Graphics Clock Controller"
122142
depends on ARM64 || COMPILE_TEST

drivers/clk/qcom/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ obj-$(CONFIG_CLK_X1E80100_DISPCC) += dispcc-x1e80100.o
3131
obj-$(CONFIG_CLK_X1E80100_GCC) += gcc-x1e80100.o
3232
obj-$(CONFIG_CLK_X1E80100_GPUCC) += gpucc-x1e80100.o
3333
obj-$(CONFIG_CLK_X1E80100_TCSRCC) += tcsrcc-x1e80100.o
34+
obj-$(CONFIG_CLK_X1P42100_CAMCC) += camcc-x1p42100.o
3435
obj-$(CONFIG_CLK_X1P42100_GPUCC) += gpucc-x1p42100.o
36+
obj-$(CONFIG_CLK_X1P42100_VIDEOCC) += videocc-x1p42100.o
3537
obj-$(CONFIG_CLK_QCM2290_GPUCC) += gpucc-qcm2290.o
3638
obj-$(CONFIG_IPQ_APSS_PLL) += apss-ipq-pll.o
3739
obj-$(CONFIG_IPQ_APSS_5424) += apss-ipq5424.o

0 commit comments

Comments
 (0)