diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-16 19:15:39 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-16 19:15:39 +0300 |
| commit | af1d09eefa72089300ddde13bbaf9af1a82c6be1 (patch) | |
| tree | 001a2680400ab2ae8cfb99b72c0dfa41c0e79f25 /drivers | |
| parent | c6057e101a2d09d24d84a3d2d701fd5e71f5e26a (diff) | |
| parent | a3035886852cd859e371550fe726da08b85c67d0 (diff) | |
| download | linux-af1d09eefa72089300ddde13bbaf9af1a82c6be1.tar.xz | |
Merge tag 'davinci-for-v4.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "SoC updates needed for SATA support on DA850" from Sekhar Nori:
This includes a merge of non-critical-fixes
branch already queued for v4.11 because
SATA clock addition conflicts with the fix-up
done earlier.
* tag 'davinci-for-v4.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: remove BUG_ON() from da850_register_sata()
ARM: davinci: da850: model the SATA refclk
ARM: davinci: da850: add con_id for the SATA clock
ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for SATA
ARM: davinci: add skeleton for pdata-quirks
bus: da850-mstpri: fix my e-mail address
ARM: davinci: da850: fix da850_set_pll0rate()
ARM: davinci: da850: coding style fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/da8xx-mstpri.c | 2 | ||||
| -rw-r--r-- | drivers/cpufreq/davinci-cpufreq.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 <bgolaszewski@baylibre.com.com> + * Bartosz Golaszewski <bgolaszewski@baylibre.com> * * 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 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; |