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

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

Merge "ARM: dts: msm: Add snoc wcnss clock for 8937"

parents f619a21e d077b44d

arch/arm/boot/dts/qcom/msm8937.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -1079,9 +1079,11 @@ 
		clocks = <&clock_gcc clk_xo_wlan_clk>,

			 <&clock_gcc clk_rf_clk2>,

			 <&clock_debug clk_gcc_debug_mux_8937>,

			 <&clock_gcc clk_wcnss_m_clk>;

			 <&clock_gcc clk_wcnss_m_clk>,

			 <&clock_gcc clk_snoc_wcnss_a_clk>;



		clock-names = "xo", "rf_clk", "measure", "wcnss_debug";

		clock-names = "xo", "rf_clk", "measure", "wcnss_debug",

				"snoc_wcnss";



		qcom,has-autodetect-xo;

		qcom,is-pronto-v3;

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

+6 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ 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);



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

static DEFINE_CLK_VOTER(bimc_wcnss_a_clk, &bimc_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);
@@ -3782,6 +3785,9 @@ static struct clk_lookup msm_clocks_lookup_common[] = { 
	CLK_LIST(snoc_usb_clk),

	CLK_LIST(bimc_usb_clk),



	CLK_LIST(snoc_wcnss_a_clk),

	CLK_LIST(bimc_wcnss_a_clk),



	CLK_LIST(qdss_clk),

	CLK_LIST(qdss_a_clk),

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

+3 −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
@@ -261,6 +261,7 @@ 
#define clk_snoc_clk				0x2c341aa0

#define clk_snoc_a_clk				0x8fcef2af

#define clk_snoc_usb_a_clk			0x34b7821b

#define clk_snoc_wcnss_a_clk			0xd3949ebc

#define clk_snoc_usb_clk			0x29f9d73d

#define clk_snoc_msmbus_clk			0xe6900bb6

#define clk_snoc_msmbus_a_clk			0x5d4683bd
@@ -276,6 +277,7 @@ 
#define clk_bimc_msmbus_clk			0xd212feea

#define clk_bimc_msmbus_a_clk			0x71d1a499

#define clk_bimc_usb_a_clk			0xea410834

#define clk_bimc_wcnss_a_clk			0x5a6df715

#define clk_bimc_usb_clk			0x9bd2b2bf

#define clk_bimc_gpu_clk			0xd3e0a327

#define clk_bimc_gpu_a_clk			0x67f0e9a5