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

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

Merge "clk: msm: clock: Keep the graphics clock peripheral memory always on"

parents 6504b975 d4ee23e4

arch/arm/boot/dts/qcom/msm-gdsc-cobalt.dtsi

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -142,6 +142,7 @@ 
		      <0x5065130 0x4>,

		      <0x5066090 0x4>;

		reg-names = "base", "domain_addr", "sw_reset";

		qcom,retain-periph;

		status = "disabled";

	};

};

drivers/clk/msm/clock-gpu-cobalt.c

+6 −0
Original line number Diff line number Diff line
@@ -510,6 +510,12 @@ int msm_gpucc_cobalt_probe(struct platform_device *pdev) 
	udelay(1);

	clk_disable_unprepare(&gpucc_gfx3d_clk.c);



	/*

	 * Force periph logic to be ON since after NAP, the value of the perf

	 * counter might be corrupted frequently.

	 */

	clk_set_flags(&gpucc_gfx3d_clk.c, CLKFLAG_RETAIN_PERIPH);



	dev_info(&pdev->dev, "Registered GPU clocks\n");

	return 0;

}