Merge "msm: clock-gcc-8916: Add clock entries for SCM driver" (bc3d8054) · Commits · e / devices / android_kernel_sony_msm8994

drivers/clk/qcom/clock-gcc-8916.c

+14 −3

Original line number	Diff line number	Diff line
		@@ -2519,9 +2519,6 @@ static struct clk_lookup msm_clocks_lookup[] = {
		/* Voteable Clocks */
		CLK_LIST(gcc_blsp1_ahb_clk),
		CLK_LIST(gcc_boot_rom_ahb_clk),
		CLK_LIST(gcc_crypto_ahb_clk),
		CLK_LIST(gcc_crypto_axi_clk),
		CLK_LIST(gcc_crypto_clk),
		CLK_LIST(gcc_prng_ahb_clk),
		CLK_LIST(gcc_apss_tcu_clk),
		CLK_LIST(gcc_gfx_tbu_clk),
		@@ -2611,6 +2608,14 @@ static struct clk_lookup msm_clocks_lookup[] = {
		CLK_LIST(wcnss_m_clk),
		};

		static struct clk_lookup msm_clocks_gcc_8916_crypto[] = {
		/* Crypto clocks */
		CLK_LOOKUP_OF("core_clk", gcc_crypto_clk, "scm"),
		CLK_LOOKUP_OF("iface_clk", gcc_crypto_ahb_clk, "scm"),
		CLK_LOOKUP_OF("bus_clk", gcc_crypto_axi_clk, "scm"),
		CLK_LOOKUP_OF("core_clk_src", crypto_clk_src, "scm"),
		};

		static int msm_gcc_probe(struct platform_device *pdev)
		{
		struct resource *res;
		@@ -2688,6 +2693,12 @@ static int msm_gcc_probe(struct platform_device *pdev)
		if (ret)
		return ret;

		ret = of_msm_clock_register(pdev->dev.of_node,
		msm_clocks_gcc_8916_crypto,
		ARRAY_SIZE(msm_clocks_gcc_8916_crypto));
		if (ret)
		return ret;

		clk_set_rate(&apss_ahb_clk_src.c, 19200000);
		clk_prepare_enable(&apss_ahb_clk_src.c);