clk: qcom: Add NOC sleep clocks for USB client to vote

USB required to vote for active and sleep NOC clocks both
because when apps power collapse happens, then USB vote is
not honoured. Move the NOC clocks to active and sleep both.

Change-Id: I6528ff0511af8f6209dded1b64a374e02f314283
Signed-off-by: Sujeet Kumar <ksujeet@codeaurora.org>
This commit is contained in:
Sujeet Kumar 2015-07-07 13:34:11 +05:30 committed by Gerrit - the friendly Code Review server
parent a38f02d6e2
commit 381bfe3852
4 changed files with 19 additions and 0 deletions

View File

@ -194,6 +194,10 @@ static DEFINE_CLK_VOTER(pnoc_usb_a_clk, &pnoc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(snoc_usb_a_clk, &snoc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(bimc_usb_a_clk, &bimc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(pnoc_usb_clk, &pnoc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(snoc_usb_clk, &snoc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(bimc_usb_clk, &bimc_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);
@ -3207,6 +3211,9 @@ static struct clk_lookup msm_clocks_lookup[] = {
CLK_LIST(pnoc_usb_a_clk),
CLK_LIST(snoc_usb_a_clk),
CLK_LIST(bimc_usb_a_clk),
CLK_LIST(pnoc_usb_clk),
CLK_LIST(snoc_usb_clk),
CLK_LIST(bimc_usb_clk),
CLK_LIST(ipa_clk),
CLK_LIST(ipa_a_clk),

View File

@ -72,13 +72,16 @@ DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk2_pin, bb_clk2_a_pin, BB_CLK2_ID);
static DEFINE_CLK_VOTER(bimc_msmbus_clk, &bimc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(bimc_msmbus_a_clk, &bimc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(bimc_usb_a_clk, &bimc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(bimc_usb_clk, &bimc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(pcnoc_keepalive_a_clk, &pcnoc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(pcnoc_msmbus_clk, &pcnoc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(pcnoc_msmbus_a_clk, &pcnoc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(pcnoc_usb_a_clk, &pcnoc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(pcnoc_usb_clk, &pcnoc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(snoc_msmbus_clk, &snoc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(snoc_msmbus_a_clk, &snoc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(snoc_usb_a_clk, &snoc_a_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(snoc_usb_clk, &snoc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(sysmmnoc_msmbus_clk, &sysmmnoc_clk.c, LONG_MAX);
static DEFINE_CLK_VOTER(sysmmnoc_msmbus_a_clk, &sysmmnoc_a_clk.c, LONG_MAX);
@ -3310,13 +3313,16 @@ static struct clk_lookup msm_clocks_lookup[] = {
CLK_LIST(sysmmnoc_msmbus_a_clk),
CLK_LIST(bimc_msmbus_clk),
CLK_LIST(bimc_msmbus_a_clk),
CLK_LIST(bimc_usb_clk),
CLK_LIST(bimc_usb_a_clk),
CLK_LIST(pcnoc_keepalive_a_clk),
CLK_LIST(pcnoc_msmbus_clk),
CLK_LIST(pcnoc_msmbus_a_clk),
CLK_LIST(pcnoc_usb_clk),
CLK_LIST(pcnoc_usb_a_clk),
CLK_LIST(snoc_msmbus_clk),
CLK_LIST(snoc_msmbus_a_clk),
CLK_LIST(snoc_usb_clk),
CLK_LIST(snoc_usb_a_clk),
CLK_LIST(xo_lpm_clk),
CLK_LIST(xo_otg_clk),

View File

@ -230,9 +230,11 @@
#define clk_pnoc_keepalive_a_clk 0x9464f720
#define clk_pnoc_sps_clk 0x23d3f584
#define clk_pnoc_usb_a_clk 0x11d6a74e
#define clk_pnoc_usb_clk 0x266d8376
#define clk_snoc_clk 0x2c341aa0
#define clk_snoc_a_clk 0x8fcef2af
#define clk_snoc_usb_a_clk 0x34b7821b
#define clk_snoc_usb_clk 0x29f9d73d
#define clk_snoc_msmbus_clk 0xe6900bb6
#define clk_snoc_msmbus_a_clk 0x5d4683bd
#define clk_snoc_mmnoc_axi_clk 0xfedd4bd5
@ -247,6 +249,7 @@
#define clk_bimc_msmbus_clk 0xd212feea
#define clk_bimc_msmbus_a_clk 0x71d1a499
#define clk_bimc_usb_a_clk 0xea410834
#define clk_bimc_usb_clk 0x9bd2b2bf
#define clk_qdss_clk 0x1492202a
#define clk_qdss_a_clk 0xdd121669
#define clk_xo_clk_src 0x6ac2a778

View File

@ -36,13 +36,16 @@
#define clk_bimc_msmbus_clk 0xd212feea
#define clk_bimc_msmbus_a_clk 0x71d1a499
#define clk_bimc_usb_a_clk 0xea410834
#define clk_bimc_usb_clk 0x9bd2b2bf
#define clk_pcnoc_keepalive_a_clk 0x9464f720
#define clk_pcnoc_msmbus_clk 0x2b53b688
#define clk_pcnoc_msmbus_a_clk 0x9753a54f
#define clk_pcnoc_usb_a_clk 0x11d6a74e
#define clk_pcnoc_usb_clk 0x57adc448
#define clk_snoc_msmbus_clk 0xe6900bb6
#define clk_snoc_msmbus_a_clk 0x5d4683bd
#define clk_snoc_usb_a_clk 0x34b7821b
#define clk_snoc_usb_clk 0x29f9d73d
#define clk_sysmmnoc_clk 0xebb1df78
#define clk_sysmmnoc_a_clk 0x6ca682a2
#define clk_sysmmnoc_msmbus_clk 0xd61e5721