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

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

Merge "msm: clock-8916: cleanup code for 8916"

parents aa13e760 e1f12c90

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

+3 −1
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ static void __iomem *virt_bases[N_BASES]; 
#define CAMSS_AHB_CBCR					0x5A014

#define CAMSS_TOP_AHB_CBCR				0x56004

#define CAMSS_MICRO_AHB_CBCR				0x5600C

#define CAMSS_MICRO_BCR					0x56008

#define JPEG0_CMD_RCGR					0x57000

#define CAMSS_JPEG0_BCR					0x57018

#define CAMSS_JPEG0_CBCR				0x57020
@@ -1689,6 +1690,7 @@ static struct branch_clk gcc_camss_mclk1_clk = { 


static struct branch_clk gcc_camss_micro_ahb_clk = {

	.cbcr_reg = CAMSS_MICRO_AHB_CBCR,

	.bcr_reg =  CAMSS_MICRO_BCR,

	.has_sibling = 1,

	.base = &virt_bases[GCC_BASE],

	.c = {
@@ -1785,7 +1787,7 @@ static struct branch_clk gcc_camss_vfe0_clk = { 


static struct branch_clk gcc_camss_vfe_ahb_clk = {

	.cbcr_reg = CAMSS_VFE_AHB_CBCR,

	.has_sibling = 1,

	.has_sibling = 0,

	.base = &virt_bases[GCC_BASE],

	.c = {

		.dbg_name = "gcc_camss_vfe_ahb_clk",

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

+2 −11
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


#include "clock.h"



#define GCC_DEBUG_CLK_CTL	0x6c000

#define GCC_DEBUG_CLK_CTL	0x74000

#define RPM_MISC_CLK_TYPE	0x306b6c63

#define RPM_BUS_CLK_TYPE	0x316b6c63

#define RPM_MEM_CLK_TYPE	0x326b6c63
@@ -86,11 +86,6 @@ static DEFINE_CLK_VOTER(bimc_acpu_a_clk, &bimc_a_clk.c, LONG_MAX); 
static DEFINE_CLK_VOTER(pcnoc_keepalive_a_clk, &pcnoc_a_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(pcnoc_sps_clk,        &pcnoc_a_clk.c, LONG_MAX);



/* MMNOC no longer available, put equivalent vote on SNOC */

static DEFINE_CLK_VOTER(snoc_mmnoc_ahb_clk, &snoc_a_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(snoc_mmnoc_axi_clk, &snoc_a_clk.c, LONG_MAX);





/* Branch Voter clocks */

static DEFINE_CLK_BRANCH_VOTER(xo_gcc, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_otg_clk, &xo_clk_src.c);
@@ -130,11 +125,10 @@ static struct clk_lookup msm_clocks_rpm[] = { 
	CLK_LIST(xo_lpm_clk),

	CLK_LIST(xo_pil_mss_clk),

	CLK_LIST(xo_pil_pronto_clk),

	CLK_LIST(xo_wlan_clk),



	CLK_LIST(snoc_msmbus_clk),

	CLK_LIST(snoc_msmbus_a_clk),

	CLK_LIST(snoc_mmnoc_axi_clk),

	CLK_LIST(snoc_mmnoc_ahb_clk),

	CLK_LIST(pcnoc_msmbus_clk),

	CLK_LIST(pcnoc_msmbus_a_clk),

	CLK_LIST(bimc_msmbus_clk),
@@ -199,9 +193,6 @@ static int msm_rpmcc_8916_probe(struct platform_device *pdev) 
	clk_set_rate(&pcnoc_keepalive_a_clk.c, 19200000);

	clk_prepare_enable(&pcnoc_keepalive_a_clk.c);



	clk_prepare_enable(&snoc_mmnoc_ahb_clk.c);

	clk_prepare_enable(&snoc_mmnoc_axi_clk.c);



	clk_prepare_enable(&xo_a_clk_src.c);



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