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

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

Merge "defconfig: lito: Enable AOP and GPU clock drivers"

parents e593b48b 10b63ed0
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -35,6 +35,27 @@
	usb_nop_phy: usb_nop_phy {
		compatible = "usb-nop-xceiv";
	};

	cxo: bi_tcxo {
		compatible = "fixed-factor-clock";
		clocks = <&xo_board>;
		clock-mult = <1>;
		clock-div = <2>;
		#clock-cells = <0>;
	};

	cxo_a: bi_tcxo_ao {
		compatible = "fixed-factor-clock";
		clocks = <&xo_board>;
		clock-mult = <1>;
		clock-div = <2>;
		#clock-cells = <0>;
	};
};

&rpmhcc {
	compatible = "qcom,dummycc";
	clock-output-names = "rpmh_clocks";
};

&usb0 {
+5 −22
Original line number Diff line number Diff line
@@ -850,28 +850,6 @@
		};
	};

	cxo: bi_tcxo {
		compatible = "fixed-factor-clock";
		clocks = <&xo_board>;
		clock-mult = <1>;
		clock-div = <2>;
		#clock-cells = <0>;
	};

	cxo_a: bi_tcxo_ao {
		compatible = "fixed-factor-clock";
		clocks = <&xo_board>;
		clock-mult = <1>;
		clock-div = <2>;
		#clock-cells = <0>;
	};

	rpmhcc: qcom,rpmhclk {
		compatible = "qcom,dummycc";
		clock-output-names = "rpmh_clocks";
		#clock-cells = <1>;
	};

	aopcc: qcom,aopclk {
		compatible = "qcom,dummycc";
		clock-output-names = "qdss_clocks";
@@ -1085,6 +1063,11 @@
		system_pm {
			compatible = "qcom,system-pm";
		};

		rpmhcc: qcom,rpmhclk {
			compatible = "qcom,lito-rpmh-clk";
			#clock-cells = <1>;
		};
	};

	disp_rsc: rsc@af20000 {
+2 −0
Original line number Diff line number Diff line
@@ -363,10 +363,12 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y
CONFIG_QCOM_GENI_SE=y
# CONFIG_QCOM_A53PLL is not set
CONFIG_QCOM_CLK_RPMH=y
CONFIG_MSM_CLK_AOP_QMP=y
CONFIG_SM_GCC_LITO=y
CONFIG_SM_VIDEOCC_LITO=y
CONFIG_SM_CAMCC_LITO=y
CONFIG_SM_DISPCC_LITO=y
CONFIG_SM_GPUCC_LITO=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK_QCOM=y
CONFIG_MAILBOX=y
+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y
CONFIG_QCOM_GENI_SE=y
# CONFIG_QCOM_A53PLL is not set
CONFIG_QCOM_CLK_RPMH=y
CONFIG_MSM_CLK_AOP_QMP=y
CONFIG_SM_GCC_LITO=y
CONFIG_SM_VIDEOCC_LITO=y
CONFIG_SM_CAMCC_LITO=y