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

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

Merge "ARM: dts: msm: update clock_npucc device node for KONA"

parents 79f30a65 4eb34f31

arch/arm64/boot/dts/qcom/kona.dtsi

+8 −3
Original line number Diff line number Diff line
@@ -921,9 +921,13 @@ 
		#reset-cells = <1>;

	};



	clock_npucc: qcom,npucc {

		compatible = "qcom,dummycc";

		clock-output-names = "npucc_clocks";

	clock_npucc: qcom,npucc@9980000 {

		compatible = "qcom,npucc-kona", "syscon";

		reg = <0x9980000 0x10000>,

			<0x9800000 0x10000>,

			<0x9810000 0x10000>;

		reg-names = "cc", "qdsp6ss", "qdsp6ss_pll";

		vdd_cx-supply = <&VDD_CX_LEVEL>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};
@@ -986,6 +990,7 @@ 
		qcom,dispcc = <&clock_dispcc>;

		qcom,camcc = <&clock_camcc>;

		qcom,gpucc = <&clock_gpucc>;

		qcom,npucc = <&clock_npucc>;

		clock-names = "xo_clk_src";

		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		#clock-cells = <1>;

drivers/clk/qcom/debugcc-kona.c

+4 −0
Original line number Diff line number Diff line
@@ -963,6 +963,10 @@ static int clk_debug_kona_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = map_debug_bases(pdev, "qcom,npucc", NPU_CC);

	if (ret)

		return ret;



	clk = devm_clk_register(&pdev->dev, &gcc_debug_mux.hw);

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "Unable to register GCC debug mux\n");