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

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

Merge "clock-mmss-8994: Add parent for oxili_gfx3d_clk"

parents 8a3fdb78 fbb215d9

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

+4 −2
Original line number Diff line number Diff line
@@ -1248,10 +1248,12 @@ 
		vdd_dig-supply = <&pm8994_s1_corner>;

		mmpll4_dig-supply = <&pm8994_s1_corner>;

		mmpll4_analog-supply = <&pm8994_l12>;

		clock-names = "xo", "gpll0", "mmssnoc_ahb";

		clock-names = "xo", "gpll0", "mmssnoc_ahb",

			"oxili_gfx3d_clk";

		clocks = <&clock_rpm clk_cxo_clk_src>,

		         <&clock_gcc clk_gpll0_out_mmsscc>,

			 <&clock_rpm clk_mmssnoc_ahb_clk>;

			 <&clock_rpm clk_mmssnoc_ahb_clk>,

			 <&clock_rpm clk_oxili_gfx3d_clk_src>;

		#clock-cells = <1>;

	};

drivers/clk/qcom/clock-mmss-8994.c

+9 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,7 @@ static struct mux_clk mmss_debug_mux = { 
	.ops = &debug_mux_ops,

	MUX_SRC_LIST(

		{ &mmsscc_mmssnoc_ahb.c, 0x0001 },

		{ &oxili_gfx3d_clk.c, 0x000d },

		{ &mmss_misc_ahb_clk.c, 0x0003 },

		{ &mmss_mmssnoc_axi_clk.c, 0x0004 },

		{ &mmss_s0_axi_clk.c, 0x0005 },
@@ -2435,6 +2436,14 @@ int msm_mmsscc_8994_probe(struct platform_device *pdev) 
		return PTR_ERR(tmp);

	}



	tmp = oxili_gfx3d_clk.c.parent =

				devm_clk_get(&pdev->dev, "oxili_gfx3d_clk");

	if (IS_ERR(tmp)) {

		if (PTR_ERR(tmp) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Unable to get oxili_gfx3d clock!");

		return PTR_ERR(tmp);

	}



	rc = of_msm_clock_register(pdev->dev.of_node, msm_clocks_mmss_8994,

				   ARRAY_SIZE(msm_clocks_mmss_8994));

	if (rc)