Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ description: |
See also:
include/dt-bindings/clock/qcom,sm8450-videocc.h
include/dt-bindings/clock/qcom,sm8650-videocc.h
include/dt-bindings/clock/qcom,x1p42100-videocc.h

properties:
compatible:
Expand All @@ -26,6 +27,7 @@ properties:
- qcom,sm8550-videocc
- qcom,sm8650-videocc
- qcom,x1e80100-videocc
- qcom,x1p42100-videocc

clocks:
items:
Expand Down Expand Up @@ -61,6 +63,7 @@ allOf:
enum:
- qcom,sm8450-videocc
- qcom,sm8550-videocc
- qcom,x1p42100-videocc
then:
required:
- required-opps
Expand Down
10 changes: 10 additions & 0 deletions arch/arm64/boot/dts/qcom/purwa.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
/* X1P42100 is heavily based on hamoa, with some meaningful differences */
#include "hamoa.dtsi"

#include <dt-bindings/clock/qcom,x1p42100-videocc.h>

/delete-node/ &bwmon_cluster0;
/delete-node/ &cluster_pd2;
/delete-node/ &cpu_map_cluster2;
Expand Down Expand Up @@ -34,10 +36,18 @@
/delete-node/ &cluster2_rep_2_3;
/delete-node/ &apss_funnel_in2;

&camcc {
compatible = "qcom,x1p42100-camcc";
};

&gcc {
compatible = "qcom,x1p42100-gcc", "qcom,x1e80100-gcc";
};

&videocc {
compatible = "qcom,x1p42100-videocc";
};

&gmu {
compatible = "qcom,adreno-gmu-x145.0", "qcom,adreno-gmu";
};
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/configs/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,9 @@ CONFIG_CLK_X1E80100_DISPCC=m
CONFIG_CLK_X1E80100_GCC=y
CONFIG_CLK_X1E80100_GPUCC=m
CONFIG_CLK_X1E80100_TCSRCC=y
CONFIG_CLK_X1P42100_CAMCC=m
CONFIG_CLK_X1P42100_GPUCC=m
CONFIG_CLK_X1P42100_VIDEOCC=m
CONFIG_CLK_QCM2290_GPUCC=m
CONFIG_QCOM_A53PLL=y
CONFIG_QCOM_CLK_APCS_MSM8916=y
Expand Down
20 changes: 20 additions & 0 deletions drivers/clk/qcom/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@ config CLK_X1E80100_TCSRCC
Support for the TCSR clock controller on X1E80100 devices.
Say Y if you want to use peripheral devices such as SD/UFS.

config CLK_X1P42100_CAMCC
tristate "X1P42100 Camera Clock Controller"
depends on ARM64 || COMPILE_TEST
select CLK_X1E80100_GCC
help
Support for the camera clock controller on Qualcomm Technologies, Inc.
X1P42100 devices.
Say Y if you want to support camera devices and camera functionality
such as capturing pictures.

config CLK_X1P42100_GPUCC
tristate "X1P42100 Graphics Clock Controller"
depends on ARM64 || COMPILE_TEST
Expand All @@ -117,6 +127,16 @@ config CLK_X1P42100_GPUCC
Say Y if you want to support graphics controller devices and
functionality such as 3D graphics.

config CLK_X1P42100_VIDEOCC
tristate "X1P42100 Video Clock Controller"
depends on ARM64 || COMPILE_TEST
select CLK_X1E80100_GCC
help
Support for the video clock controller on Qualcomm Technologies, Inc.
X1P42100 devices.
Say Y if you want to support video devices and functionality such as
video encode/decode.

config CLK_QCM2290_GPUCC
tristate "QCM2290 Graphics Clock Controller"
depends on ARM64 || COMPILE_TEST
Expand Down
2 changes: 2 additions & 0 deletions drivers/clk/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ obj-$(CONFIG_CLK_X1E80100_DISPCC) += dispcc-x1e80100.o
obj-$(CONFIG_CLK_X1E80100_GCC) += gcc-x1e80100.o
obj-$(CONFIG_CLK_X1E80100_GPUCC) += gpucc-x1e80100.o
obj-$(CONFIG_CLK_X1E80100_TCSRCC) += tcsrcc-x1e80100.o
obj-$(CONFIG_CLK_X1P42100_CAMCC) += camcc-x1p42100.o
obj-$(CONFIG_CLK_X1P42100_GPUCC) += gpucc-x1p42100.o
obj-$(CONFIG_CLK_X1P42100_VIDEOCC) += videocc-x1p42100.o
obj-$(CONFIG_CLK_QCM2290_GPUCC) += gpucc-qcm2290.o
obj-$(CONFIG_IPQ_APSS_PLL) += apss-ipq-pll.o
obj-$(CONFIG_IPQ_APSS_5424) += apss-ipq5424.o
Expand Down
Loading