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

Commit 2520fd03 authored by Odelu Kukatla's avatar Odelu Kukatla
Browse files

clk: msm: gcc: Update the source id for venus/camss 



The source id for GPLL4 was incorrectly set for Venus and Camss clocks,
update the same.

Fix the pll configuration for single cluster.

Change-Id: Iae7a2d32dd0c082b598407730272dd045561d27c
Signed-off-by: default avatarOdelu Kukatla <okukatla@codeaurora.org>
parent 61fde68c

drivers/clk/msm/clock-cpu-8939.c

+4 −3
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2014-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
@@ -746,7 +746,7 @@ static int clock_a53_probe(struct platform_device *pdev) 
		clk_set_rate(&cci_clk.c, rate);

	}



	for (mux_id = 0; mux_id < A53SS_MUX_CCI; mux_id++) {

	for (mux_id = 0; mux_id < mux_num; mux_id++) {

		/* Force a PLL reconfiguration */

		config_pll(mux_id);

	}
@@ -762,6 +762,7 @@ static int clock_a53_probe(struct platform_device *pdev) 
	for_each_online_cpu(cpu) {

		WARN(clk_prepare_enable(&cpuclk[cpu/4]->c),

				"Unable to turn on CPU clock");

		if (!single_cluster)

			clk_prepare_enable(&cci_clk.c);

	}

	put_online_cpus();

drivers/clk/msm/clock-gcc-8952.c

+3 −2
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ static struct pll_vote_clk gpll4_clk_src = { 
		CLK_INIT(gpll4_clk_src.c),

	},

};

DEFINE_EXT_CLK(gpll4_out_clk_src, &gpll4_clk_src.c);



static struct clk_freq_tbl ftbl_gcc_camss_top_ahb_clk[] = {

	F( 40000000,	gpll0,	10,	1,	2),
@@ -601,7 +602,7 @@ static struct clk_freq_tbl ftbl_gcc_venus0_vcodec0_clk_gold[] = { 
	F( 200000000,          gpll0,    4,    0,     0),

	F( 270000000,          gpll6,    4,    0,     0),

	F( 308570000,          gpll6,  3.5,    0,     0),

	F( 329140000,          gpll4,  3.5,    0,     0),

	F( 329140000,          gpll4_out,  3.5,    0,     0),

	F( 360000000,          gpll6,    3,    0,     0),

	F_END

};
@@ -665,7 +666,7 @@ static struct clk_freq_tbl ftbl_gcc_camss_vfe0_1_clk_gold[] = { 
	F( 266670000,          gpll0,    3,    0,     0),

	F( 308570000,          gpll6,  3.5,    0,     0),

	F( 320000000,          gpll0,  2.5,    0,     0),

	F( 329140000,          gpll4,  3.5,    0,     0),

	F( 329140000,          gpll4_out,  3.5,    0,     0),

	F( 360000000,          gpll6,    3,    0,     0),

	F_END

};

include/dt-bindings/clock/msm-clocks-hwio-8952.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-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
@@ -283,6 +283,7 @@ 
/* cci_clk_src and usb_fs_system_clk_src */

#define gpll0_out_aux_source_val	2

#define gpll4_source_val		2   /* sdcc1_apss_clk_src */

#define gpll4_out_source_val		3   /* sdcc1_apss_clk_src */

#define gpll6_source_val		2   /* mclk0_2_clk_src */

#define gpll6_aux_source_val		3   /* gfx3d_clk_src */

#define gpll6_out_main_source_val	1   /* usb_fs_ic_clk_src */