Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54eaf246 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: Add GCC clock driver for SDMMAGPIE"

parents 43a7d245 dd00c81e

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

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Required properties : 
			"qcom,gcc-qcs405"

			"qcom,gcc-mdss-qcs405"

			"qcom,gcc-sm6150"

			"qcom,gcc-sdmmagpie"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

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

+5 −2
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. RPMh Clocks



Required properties:

- compatible:	Must contain "qcom,rpmh-clk-sm8150" or

		"qcom,rpmh-clk-sdmshrike" or "qcom,rpmh-clk-sm6150".

- compatible:	Must contain one of the following:

		"qcom,rpmh-clk-sm6150",

		"qcom,rpmh-clk-sm8150",

		"qcom,rpmh-clk-sdmshrike",

		"qcom,rpmh-clk-sdmmagpie".

- #clock-cells:	Must contain 1.

- mboxes:	List of RPMh mailbox phandle and channel identifier tuples.

- mbox-names:	List of names to identify the RPMh mailboxes used.

drivers/clk/qcom/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -395,3 +395,13 @@ config MSM_DISPCC_SM6150 
	  SM6150 devices.

	  Say Y if you want to support display devices and functionality such as

	  splash screen.



config MSM_GCC_SDMMAGPIE

	tristate "SDMMAGPIE Global Clock Controller"

	depends on COMMON_CLK_QCOM

	select QCOM_GDSC

	help

	  Support for the global clock controller on Qualcomm Technologies, Inc

	  SDMMAGPIE devices.

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

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

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ obj-$(CONFIG_MSM_GCC_8994) += gcc-msm8994.o 
obj-$(CONFIG_MSM_GCC_8996) += gcc-msm8996.o

obj-$(CONFIG_MSM_GCC_SM6150) += gcc-sm6150.o

obj-$(CONFIG_MSM_GCC_SM8150) += gcc-sm8150.o

obj-$(CONFIG_MSM_GCC_SDMMAGPIE) += gcc-sdmmagpie.o

obj-$(CONFIG_MSM_GCC_SDMSHRIKE) += gcc-sdmshrike.o

obj-$(CONFIG_MSM_GPUCC_SM6150) += gpucc-sm6150.o

obj-$(CONFIG_MSM_GPUCC_SM8150) += gpucc-sm8150.o

drivers/clk/qcom/clk-rpmh.c

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static const struct of_device_id clk_rpmh_match_table[] = { 
	{ .compatible = "qcom,rpmh-clk-sm8150", .data = &clk_rpmh_sm8150},

	{ .compatible = "qcom,rpmh-clk-sdmshrike", .data = &clk_rpmh_sdmshrike},

	{ .compatible = "qcom,rpmh-clk-sm6150", .data = &clk_rpmh_sm6150},

	{ .compatible = "qcom,rpmh-clk-sdmmagpie", .data = &clk_rpmh_sm6150},

	{ }

};

MODULE_DEVICE_TABLE(of, clk_rpmh_match_table);