Merge "coresight-hwevent: Change naming convention for clock" into msm-4.9 (1f55fba1) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/hwtracing/coresight/coresight-hwevent.c

+2 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-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
		@@ -216,14 +216,10 @@ static int hwevent_probe(struct platform_device *pdev)

		mutex_init(&drvdata->mutex);

		drvdata->clk = devm_clk_get(dev, "core_clk");
		drvdata->clk = devm_clk_get(dev, "apb_pclk");
		if (IS_ERR(drvdata->clk))
		return PTR_ERR(drvdata->clk);

		ret = clk_set_rate(drvdata->clk, CORESIGHT_CLK_RATE_TRACE);
		if (ret)
		return ret;

		drvdata->nr_hclk = of_property_count_strings(pdev->dev.of_node,
		"qcom,hwevent-clks");
		drvdata->nr_hreg = of_property_count_strings(pdev->dev.of_node,

+0 −7

Original line number	Diff line number	Diff line
		@@ -41,13 +41,6 @@

		extern struct bus_type coresight_bustype;

		enum coresight_clk_rate {
		CORESIGHT_CLK_RATE_OFF,
		CORESIGHT_CLK_RATE_TRACE = 1000,
		CORESIGHT_CLK_RATE_HSTRACE = 2000,
		CORESIGHT_CLK_RATE_FIXED = 3000,
		};

		enum coresight_dev_type {
		CORESIGHT_DEV_TYPE_NONE,
		CORESIGHT_DEV_TYPE_SINK,