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

Commit 59827c85 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add clock properties for sdxpoorwills"

parents 400d8e33 8ca25b95

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

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Required properties : 
			"qcom,gcc-sdm845-v2.1"

			"qcom,gcc-sdm670"

			"qcom,debugcc-sdm845"

			"qcom,gcc-sdxpoorwills"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

arch/arm/boot/dts/qcom/sdxpoorwills.dtsi

+11 −4
Original line number Diff line number Diff line
@@ -151,8 +151,11 @@ 
	};



	clock_gcc: qcom,gcc@100000 {

		compatible = "qcom,dummycc";

		clock-output-names = "gcc_clocks";

		compatible = "qcom,gcc-sdxpoorwills";

		reg = <0x100000 0x1f0000>;

		reg-names = "cc_base";

		vdd_cx-supply = <&pmxpoorwills_s5_level>;

		vdd_cx_ao-supply = <&pmxpoorwills_s5_level_ao>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};
@@ -184,7 +187,6 @@ 
		compatible = "qcom,gdsc";

		regulator-name = "gdsc_usb30";

		reg = <0x0010b004 0x4>;

		status = "ok";

	};



	qcom,sps {
@@ -196,7 +198,12 @@ 
		compatible = "qcom,gdsc";

		regulator-name = "gdsc_pcie";

		reg = <0x00137004 0x4>;

		status = "ok";

	};



	gdsc_emac: qcom,gdsc@147004 {

		compatible = "qcom,gdsc";

		regulator-name = "gdsc_emac";

		reg = <0x00147004 0x4>;

	};



	qnand_1: nand@1b00000 {

arch/arm/configs/sdxpoorwills-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ CONFIG_SPS=y 
CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_USB_BAM=y

CONFIG_MDM_GCC_SDXPOORWILLS=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_MSM_QMP=y

arch/arm/configs/sdxpoorwills_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ CONFIG_IPA_UT=y 
CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_MDM_GCC_SDXPOORWILLS=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_MSM_QMP=y

drivers/clk/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -235,4 +235,12 @@ config MSM_CLK_AOP_QMP 
	subsystems via QMP mailboxes.

	Say Y to support the clocks managed by AOP on platforms such as sdm845.



config MDM_GCC_SDXPOORWILLS

	tristate "SDXPOORWILLS Global Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the global clock controller on sdxpoorwills devices.

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

	  i2c, USB, SD/eMMC, etc.



source "drivers/clk/qcom/mdss/Kconfig"