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

Commit 38c8ce9d 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 active clients of SNOC/BIMC"

parents cd2c6fa6 475adc18

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

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 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_clk, &bimc_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(bimc_usb_a_clk, &bimc_a_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(bimc_wcnss_a_clk, &bimc_a_clk.c, LONG_MAX);



/* PCNOC Voter */

static DEFINE_CLK_VOTER(pcnoc_keepalive_a_clk, &pcnoc_a_clk.c, LONG_MAX);
@@ -79,6 +80,7 @@ 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_clk, &snoc_clk.c, LONG_MAX);

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

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



/* SYSMMNOC Voter */

static DEFINE_CLK_VOTER(sysmmnoc_msmbus_clk, &sysmmnoc_clk.c, LONG_MAX);
@@ -3449,6 +3451,7 @@ static struct clk_lookup msm_clocks_lookup[] = { 
	CLK_LIST(bimc_msmbus_a_clk),

	CLK_LIST(bimc_usb_clk),

	CLK_LIST(bimc_usb_a_clk),

	CLK_LIST(bimc_wcnss_a_clk),

	CLK_LIST(pcnoc_keepalive_a_clk),

	CLK_LIST(pcnoc_msmbus_clk),

	CLK_LIST(pcnoc_msmbus_a_clk),
@@ -3458,6 +3461,7 @@ static struct clk_lookup msm_clocks_lookup[] = { 
	CLK_LIST(snoc_msmbus_a_clk),

	CLK_LIST(snoc_usb_clk),

	CLK_LIST(snoc_usb_a_clk),

	CLK_LIST(snoc_wcnss_a_clk),

	CLK_LIST(sysmmnoc_msmbus_clk),

	CLK_LIST(sysmmnoc_msmbus_a_clk),

	CLK_LIST(xo_dwc3_clk),

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

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

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

 * Copyright (c) 2015-2017, 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
@@ -52,6 +52,7 @@ 
#define clk_bimc_msmbus_a_clk				 0x71d1a499

#define clk_bimc_usb_clk				 0x9bd2b2bf

#define clk_bimc_usb_a_clk				 0xea410834

#define clk_bimc_wcnss_a_clk				 0x5a6df715

#define clk_pcnoc_keepalive_a_clk			 0x9464f720

#define clk_pcnoc_msmbus_clk				 0x2b53b688

#define clk_pcnoc_msmbus_a_clk				 0x9753a54f
@@ -61,6 +62,7 @@ 
#define clk_snoc_msmbus_a_clk				 0x5d4683bd

#define clk_snoc_usb_clk				 0x29f9d73d

#define clk_snoc_usb_a_clk				 0x34b7821b

#define clk_snoc_wcnss_a_clk				 0xd3949ebc

#define clk_sysmmnoc_msmbus_a_clk			 0x50600f1b

#define clk_sysmmnoc_msmbus_clk				 0xd61e5721

#define clk_xo_dwc3_clk					 0xfad488ce