Commit 5d3a48fe authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-qcom-sdm845-camcc' and 'clk-mtk-unused' into clk-next 

 - Qualcomm SDM845 camera clock controller

* clk-qcom-sdm845-camcc:
  clk: qcom: Add camera clock controller driver for SDM845
  dt-bindings: clock: Introduce QCOM Camera clock bindings

* clk-mtk-unused:
  clk: mediatek: remove unused array audio_parents
parents faff3d8e 78412c26 1adb0a9f

Documentation/devicetree/bindings/clock/qcom,camcc.txt

0 → 100644
+18 −0
Original line number Original line Diff line number Diff line 
Qualcomm Camera Clock & Reset Controller Binding

------------------------------------------------



Required properties :

- compatible : shall contain "qcom,sdm845-camcc".

- reg : shall contain base register location and length.

- #clock-cells : from common clock binding, shall contain 1.

- #reset-cells : from common reset binding, shall contain 1.

- #power-domain-cells : from generic power domain binding, shall contain 1.



Example:

	camcc: clock-controller@ad00000 {

		compatible = "qcom,sdm845-camcc";

		reg = <0xad00000 0x10000>;

		#clock-cells = <1>;

		#reset-cells = <1>;

		#power-domain-cells = <1>;

	};

drivers/clk/mediatek/clk-mt2701.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -249,11 +249,6 @@ static const char * const msdc30_parents[] = { 
	"univpll2_d4"

	"univpll2_d4"

};

};





static const char * const audio_parents[] = {

	"clk26m",

	"syspll1_d16"

};



static const char * const aud_intbus_parents[] = {

static const char * const aud_intbus_parents[] = {

	"clk26m",

	"clk26m",

	"syspll1_d4",

	"syspll1_d4",

drivers/clk/qcom/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,14 @@ config MSM_GCC_8998 
	  Say Y if you want to use peripheral devices such as UART, SPI,

	  Say Y if you want to use peripheral devices such as UART, SPI,

	  i2c, USB, UFS, SD/eMMC, PCIe, etc.

	  i2c, USB, UFS, SD/eMMC, PCIe, etc.





config SDM_CAMCC_845

	tristate "SDM845 Camera Clock Controller"

	depends on COMMON_CLK_QCOM

	select SDM_GCC_845

	help

	  Support for the camera clock controller on SDM845 devices.

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



config SDM_GCC_845

config SDM_GCC_845

	tristate "SDM845 Global Clock Controller"

	tristate "SDM845 Global Clock Controller"

	select QCOM_GDSC

	select QCOM_GDSC

drivers/clk/qcom/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += apcs-msm8916.o 
obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o

obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o

obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o

obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o

obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o

obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o

obj-$(CONFIG_SDM_CAMCC_845) += camcc-sdm845.o

obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o

obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o

obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o

obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o

obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o

obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o

drivers/clk/qcom/camcc-sdm845.c

0 → 100644
+1745 −0

File added.

Preview size limit exceeded, changes collapsed.