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

Commit 86a5c0a9 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: gcc: Add support for BB_CLK3 for SDM429"

parents b5960294 8794fb56

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

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

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

 * Copyright (c) 2014-2020, 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
@@ -70,9 +70,11 @@ DEFINE_CLK_RPM_SMD_XO_BUFFER(bb_clk1, bb_clk1_a, BB_CLK1_ID); 
DEFINE_CLK_RPM_SMD_XO_BUFFER(bb_clk2, bb_clk2_a, BB_CLK2_ID);

DEFINE_CLK_RPM_SMD_XO_BUFFER(rf_clk2, rf_clk2_a, RF_CLK2_ID);

DEFINE_CLK_RPM_SMD_XO_BUFFER(div_clk2, div_clk2_a, DIV_CLK2_ID);

DEFINE_CLK_RPM_SMD_XO_BUFFER(bb_clk3, bb_clk3_a, BB_CLK3_ID);



DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk1_pin, bb_clk1_a_pin, BB_CLK1_ID);

DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk2_pin, bb_clk2_a_pin, BB_CLK2_ID);

DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk3_pin, bb_clk3_a_pin, BB_CLK3_ID);



/* Voter clocks */

static DEFINE_CLK_VOTER(pnoc_msmbus_clk, &pnoc_clk.c, LONG_MAX);
@@ -4108,6 +4110,8 @@ static struct clk_lookup msm_clocks_lookup_8937[] = { 
};



static struct clk_lookup msm_clocks_lookup_sdm429[] = {

	CLK_LIST(bb_clk3),

	CLK_LIST(bb_clk3_pin),

	CLK_LIST(gpll0_clk_src_8937),

	CLK_LIST(gpll0_ao_clk_src_8937),

	CLK_LIST(gpll0_sleep_clk_src),

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

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

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

 * Copyright (c) 2014-2018, 2020, 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
@@ -310,6 +310,8 @@ 
#define clk_bb_clk2_a				0x59682706

#define clk_bb_clk2_pin				0x498938e5

#define clk_bb_clk2_a_pin			0x52513787

#define clk_bb_clk3				0x3a9e99a8

#define clk_bb_clk3_pin				0x3a96c14c

#define clk_rf_clk1				0xaabeea5a

#define clk_rf_clk1_a				0x72a10cb8

#define clk_rf_clk1_pin				0x8f463562

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

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

 * Copyright (c) 2014-2016, 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2016, 2018-2020, 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
@@ -243,6 +243,7 @@ 
/* XO clock */

#define BB_CLK1_ID		0x1

#define BB_CLK2_ID		0x2

#define BB_CLK3_ID		0x3

#define RF_CLK2_ID		0x5

#define LN_BB_CLK_ID		0x8

#define DIV_CLK1_ID		0xb