From b40881738f098e1be5c32e89c2691b688fc00875 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Wed, 7 Dec 2016 16:22:18 +0100 Subject: ARM: davinci: da850: fix da850_set_pll0rate() This function is confusing - its second argument is an index to the freq table, not the requested clock rate in Hz, but it's used as the set_rate callback for the pll0 clock. It leads to an oops when the caller doesn't know the internals and passes the rate in Hz as argument instead of the cpufreq index since this argument isn't bounds checked either. Fix it by iterating over the array of supported frequencies and selecting a one that matches or returning -EINVAL for unsupported rates. Also: update the davinci cpufreq driver. It's the only user of this clock and currently it passes the cpufreq table index to clk_set_rate(), which is confusing. Make it pass the requested clock rate in Hz. Signed-off-by: Bartosz Golaszewski Acked-by: Viresh Kumar [nsekhar@ti.com: commit headline update] Signed-off-by: Sekhar Nori --- drivers/cpufreq/davinci-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c index b95a872800ec..d54a27c99121 100644 --- a/drivers/cpufreq/davinci-cpufreq.c +++ b/drivers/cpufreq/davinci-cpufreq.c @@ -55,7 +55,7 @@ static int davinci_target(struct cpufreq_policy *policy, unsigned int idx) return ret; } - ret = clk_set_rate(armclk, idx); + ret = clk_set_rate(armclk, new_freq * 1000); if (ret) return ret; -- cgit v1.2.3 From 430d7dd448f48f54e79614ca237f44cd543f73da Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Mon, 19 Dec 2016 10:58:11 +0100 Subject: bus: da850-mstpri: fix my e-mail address I noticed my e-mail address is wrong in this one. This patch fixes it. Signed-off-by: Bartosz Golaszewski Signed-off-by: Sekhar Nori --- drivers/bus/da8xx-mstpri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/bus/da8xx-mstpri.c b/drivers/bus/da8xx-mstpri.c index 063397f2c0db..9af9bcc68059 100644 --- a/drivers/bus/da8xx-mstpri.c +++ b/drivers/bus/da8xx-mstpri.c @@ -4,7 +4,7 @@ * Copyright (C) 2016 BayLibre SAS * * Author: - * Bartosz Golaszewski + * Bartosz Golaszewski * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as -- cgit v1.2.3 From 92f3e6ebf6e43fdd5e2f044fc26d973f341b7ef0 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 30 Jan 2017 09:52:01 +0100 Subject: firmware: arm_scpi: Add hardware dependencies With a name like that, I assume that the ARM SCPI protocol is only useful on the ARM architectures. Signed-off-by: Jean Delvare Acked-by: Sudeep Holla Cc: Jon Medhurst (Tixy) Signed-off-by: Olof Johansson --- drivers/firmware/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 1867f0d1389b..6e4ed5a9c6fd 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -21,6 +21,7 @@ config ARM_PSCI_CHECKER config ARM_SCPI_PROTOCOL tristate "ARM System Control and Power Interface (SCPI) Message Protocol" + depends on ARM || ARM64 || COMPILE_TEST depends on MAILBOX help System Control and Power Interface (SCPI) Message Protocol is -- cgit v1.2.3