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

Commit 8f6a80c0 authored by Taniya Das's avatar Taniya Das Committed by Gerrit - the friendly Code Review server
Browse files

qcom: clk: Add clock and ramdump driver snapshot 



This is a snapshot of ramdump of subsystem and clock driver as of msm-3.10
commit: 56e34ba71ff9ea525bdb2e69e1fdcbabab015c76
(clk: qcom: Add NOC sleep clocks for USB client to vote)

Change-Id: I0658f626042702e96789ec7295fc16b96be0bce1
Signed-off-by: default avatarTaniya Das <tdas@codeaurora.org>
parent a85bd71a

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

+3 −3
Original line number Diff line number Diff line
@@ -1027,9 +1027,9 @@ 
		clocks = <&clock_gcc clk_gcc_usb_hs_ahb_clk>,

			 <&clock_gcc clk_gcc_usb_hs_system_clk>,

			 <&clock_gcc clk_gcc_usb2a_phy_sleep_clk>,

			 <&clock_gcc clk_bimc_usb_a_clk>,

			 <&clock_gcc clk_snoc_usb_a_clk>,

			 <&clock_gcc clk_pnoc_usb_a_clk>,

			 <&clock_gcc clk_bimc_usb_clk>,

			 <&clock_gcc clk_snoc_usb_clk>,

			 <&clock_gcc clk_pnoc_usb_clk>,

			 <&clock_gcc clk_gcc_qusb2_phy_clk>,

			 <&clock_gcc clk_gcc_usb2_hs_phy_only_clk>,

			 <&clock_gcc clk_gcc_usb_hs_phy_cfg_ahb_clk>,

drivers/clk/msm/clock-a7.c

+1 −1
Original line number Diff line number Diff line
@@ -289,8 +289,8 @@ static void get_speed_bin_b(struct platform_device *pdev, int *bin, 


			*version = (pte_efuse >> 18) & 0x3;

			if (!(*version)) {

				if (*bin) {

				*bin = (pte_efuse >> 23) & 0x3;

				if (*bin) {

					dev_info(&pdev->dev, "Speed bin: %d PVS Version: %d\n",

						*bin, *version);

					return;

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

+10 −1
Original line number Diff line number Diff line
@@ -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);
@@ -343,6 +347,7 @@ static struct pll_freq_tbl apcs_c1_pll_freq[] = { 
	F_APCS_PLL(1497600000, 78, 0x0, 0x1, 0x0, 0x0, 0x0),

	F_APCS_PLL(1516800000, 79, 0x0, 0x1, 0x0, 0x0, 0x0),

	F_APCS_PLL(1536000000, 80, 0x0, 0x1, 0x0, 0x0, 0x0),

	F_APCS_PLL(1651200000, 86, 0x0, 0x1, 0x0, 0x0, 0x0),

};



static struct pll_clk a53ss_c1_pll = {
@@ -1413,7 +1418,7 @@ static struct rcg_clk sdcc1_apps_clk_src = { 
	.c = {

		.dbg_name = "sdcc1_apps_clk_src",

		.ops = &clk_ops_rcg_mnd,

		VDD_DIG_FMAX_MAP2(LOWER, 200000000, NOMINAL, 384000000),

		VDD_DIG_FMAX_MAP2(LOWER, 50000000, NOMINAL, 384000000),

		CLK_INIT(sdcc1_apps_clk_src.c),

	},

};
@@ -2318,6 +2323,7 @@ static struct local_vote_clk gcc_crypto_ahb_clk = { 
	.base = &virt_bases[GCC_BASE],

	.c = {

		.dbg_name = "gcc_crypto_ahb_clk",

		.parent = &crypto_clk_src.c,

		.ops = &clk_ops_vote,

		CLK_INIT(gcc_crypto_ahb_clk.c),

	},
@@ -3204,6 +3210,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),

drivers/soc/qcom/ramdump.c

+14 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2015, 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
@@ -25,7 +25,7 @@ 
#include <linux/elf.h>

#include <linux/wait.h>

#include <soc/qcom/ramdump.h>



#include <linux/dma-mapping.h>



#define RAMDUMP_WAIT_MSECS	120000
@@ -44,6 +44,7 @@ struct ramdump_device { 
	struct ramdump_segment *segments;

	size_t elfcore_size;

	char *elfcore_buf;

	struct dma_attrs attrs;

};



static int ramdump_open(struct inode *inode, struct file *filep)
@@ -148,7 +149,11 @@ static ssize_t ramdump_read(struct file *filep, char __user *buf, size_t count, 


	copy_size = min(count, (size_t)MAX_IOREMAP_SIZE);

	copy_size = min((unsigned long)copy_size, data_left);

	device_mem = vaddr ?: ioremap_nocache(addr, copy_size);



	init_dma_attrs(&rd_dev->attrs);

	dma_set_attr(DMA_ATTR_SKIP_ZEROING, &rd_dev->attrs);

	device_mem = vaddr ?: dma_remap(rd_dev->device.parent, NULL, addr,

						copy_size, &rd_dev->attrs);

	origdevice_mem = device_mem;



	if (device_mem == NULL) {
@@ -198,8 +203,9 @@ static ssize_t ramdump_read(struct file *filep, char __user *buf, size_t count, 
	}



	kfree(finalbuf);

	if (!vaddr)

		iounmap(origdevice_mem);

	if (!vaddr && origdevice_mem)

		dma_unremap(rd_dev->device.parent, origdevice_mem, copy_size);



	*pos += copy_size;



	pr_debug("Ramdump(%s): Read %zd bytes from address %lx.",
@@ -208,8 +214,9 @@ static ssize_t ramdump_read(struct file *filep, char __user *buf, size_t count, 
	return *pos - orig_pos;



ramdump_done:

	if (!vaddr)

		iounmap(origdevice_mem);

	if (!vaddr && origdevice_mem)

		dma_unremap(rd_dev->device.parent, origdevice_mem, copy_size);



	kfree(finalbuf);

	rd_dev->data_ready = 0;

	*pos = 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -231,9 +231,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
@@ -248,6 +250,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