mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Here is a collection of fixes (and some intermixed cleanups) that were considered less important and thus not included in the later parts of the 3.9-rc cycle. It's a bit all over the map, contents wise. A series of ux500 fixes and cleanups, a bunch of various fixes for OMAP and tegra, and some for Freescale i.MX and even Qualcomm MSM. Note that there's also a patch on this branch to globally turn off -Wmaybe-uninitialized when building with -Os. It's been posted several times by Arnd and no dissent was raised, but nobody seemed interested to pick it up. So here it is, as the topmost patch. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJRggtQAAoJEIwa5zzehBx3TmYP/i4Kt3JDYEbYyAqNsH3nb0mN 3kLwViUxDdS/aZCXEaNYLwZBUgl1Zyz3oRd39zFCo4dRM2uG1AW+lC73AP3/eW6n 2oHxI43xzwjDNPxRkiipB4NXPyIoIdbRXM6/QIxXzM9zD3MJXj7BpBBpDgGAsLov BQ2r28idxZE6jB4puPjVZCuyG5UMjA0Ko2Fp2em7QXarQBBscDvhAtjqNZ3JPtlN thASsou1B8805J7jf5G8Wz6fNeVJg2wlWMgE9ywJpKFbut4cGM4riS/QvB0fTe6d tmkCae0bw3UD+D+N1gYcZpeGve8oPSHbeyhrSPAfI/wAVBh0J397MgJW5/f0vW8p DffLjQI+S450Kw0Bab41Tn0JnMnXtYUo56yjemdxa/NQJF34ycBFQ3HOm6nFxo7U 6tce2O775uvG0+rJfDbX6M+Mu7QoIi0p8sOdg0/W+pFK08xvaezsOc1NjqTvuYoC s/2LYiIJqVG6tFVU0i/46duQhdp0I/Oj7wXtFXH0ZvZPBz0cDaSU3irB3QA9pNt5 PI6JEBg0FUPUork24gShSUf7un4Itrjlq20HTkC9/z1skx87PbB3Wa7A8jnHeFme tpuPRvmfBWhIhp06AIA8znhDik9xuJ4B7ypsFNM0VyoV/qx+TSIHbViVQuwcOf9b nAidtuhMjE+P2sAu+VGU =bzsu -----END PGP SIGNATURE----- Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC non-critical fixes from Olof Johansson: "Here is a collection of fixes (and some intermixed cleanups) that were considered less important and thus not included in the later parts of the 3.9-rc cycle. It's a bit all over the map, contents wise. A series of ux500 fixes and cleanups, a bunch of various fixes for OMAP and tegra, and some for Freescale i.MX and even Qualcomm MSM. Note that there's also a patch on this branch to globally turn off -Wmaybe-uninitialized when building with -Os. It's been posted several times by Arnd and no dissent was raised, but nobody seemed interested to pick it up. So here it is, as the topmost patch." * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits) Turn off -Wmaybe-uninitialized when building with -Os ARM: orion5x: include linux/cpu.h ARM: tegra: call cpu_do_idle from C code ARM: u300: fix ages old copy/paste bug ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7 ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled ARM: tegra: fix relocation truncated error when THUMB2_KERNEL enabled ARM: tegra: fix build error when THUMB2_KERNEL enabled ARM: msm: Fix uncompess.h tx underrun check ARM: vexpress: Remove A9 PMU compatible values for non-A9 platforms ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS" ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD" ARM: mach-imx: mach-imx6q: Fix sparse warnings ARM: mach-imx: src: Include "common.h ARM: mach-imx: gpc: Include "common.h" ARM: mach-imx: avic: Staticize *avic_base ARM: mach-imx: tzic: Staticize *tzic_base ARM: mach-imx: clk: Include "clk.h" ARM: mach-imx: clk-busy: Staticize clk_busy_mux_ops ...
189 lines
4.4 KiB
C
189 lines
4.4 KiB
C
/*
|
|
* Copyright 2012 Freescale Semiconductor, Inc.
|
|
* Copyright 2012 Linaro Ltd.
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/io.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/err.h>
|
|
#include "clk.h"
|
|
|
|
static int clk_busy_wait(void __iomem *reg, u8 shift)
|
|
{
|
|
unsigned long timeout = jiffies + msecs_to_jiffies(10);
|
|
|
|
while (readl_relaxed(reg) & (1 << shift))
|
|
if (time_after(jiffies, timeout))
|
|
return -ETIMEDOUT;
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct clk_busy_divider {
|
|
struct clk_divider div;
|
|
const struct clk_ops *div_ops;
|
|
void __iomem *reg;
|
|
u8 shift;
|
|
};
|
|
|
|
static inline struct clk_busy_divider *to_clk_busy_divider(struct clk_hw *hw)
|
|
{
|
|
struct clk_divider *div = container_of(hw, struct clk_divider, hw);
|
|
|
|
return container_of(div, struct clk_busy_divider, div);
|
|
}
|
|
|
|
static unsigned long clk_busy_divider_recalc_rate(struct clk_hw *hw,
|
|
unsigned long parent_rate)
|
|
{
|
|
struct clk_busy_divider *busy = to_clk_busy_divider(hw);
|
|
|
|
return busy->div_ops->recalc_rate(&busy->div.hw, parent_rate);
|
|
}
|
|
|
|
static long clk_busy_divider_round_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long *prate)
|
|
{
|
|
struct clk_busy_divider *busy = to_clk_busy_divider(hw);
|
|
|
|
return busy->div_ops->round_rate(&busy->div.hw, rate, prate);
|
|
}
|
|
|
|
static int clk_busy_divider_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long parent_rate)
|
|
{
|
|
struct clk_busy_divider *busy = to_clk_busy_divider(hw);
|
|
int ret;
|
|
|
|
ret = busy->div_ops->set_rate(&busy->div.hw, rate, parent_rate);
|
|
if (!ret)
|
|
ret = clk_busy_wait(busy->reg, busy->shift);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct clk_ops clk_busy_divider_ops = {
|
|
.recalc_rate = clk_busy_divider_recalc_rate,
|
|
.round_rate = clk_busy_divider_round_rate,
|
|
.set_rate = clk_busy_divider_set_rate,
|
|
};
|
|
|
|
struct clk *imx_clk_busy_divider(const char *name, const char *parent_name,
|
|
void __iomem *reg, u8 shift, u8 width,
|
|
void __iomem *busy_reg, u8 busy_shift)
|
|
{
|
|
struct clk_busy_divider *busy;
|
|
struct clk *clk;
|
|
struct clk_init_data init;
|
|
|
|
busy = kzalloc(sizeof(*busy), GFP_KERNEL);
|
|
if (!busy)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
busy->reg = busy_reg;
|
|
busy->shift = busy_shift;
|
|
|
|
busy->div.reg = reg;
|
|
busy->div.shift = shift;
|
|
busy->div.width = width;
|
|
busy->div.lock = &imx_ccm_lock;
|
|
busy->div_ops = &clk_divider_ops;
|
|
|
|
init.name = name;
|
|
init.ops = &clk_busy_divider_ops;
|
|
init.flags = CLK_SET_RATE_PARENT;
|
|
init.parent_names = &parent_name;
|
|
init.num_parents = 1;
|
|
|
|
busy->div.hw.init = &init;
|
|
|
|
clk = clk_register(NULL, &busy->div.hw);
|
|
if (IS_ERR(clk))
|
|
kfree(busy);
|
|
|
|
return clk;
|
|
}
|
|
|
|
struct clk_busy_mux {
|
|
struct clk_mux mux;
|
|
const struct clk_ops *mux_ops;
|
|
void __iomem *reg;
|
|
u8 shift;
|
|
};
|
|
|
|
static inline struct clk_busy_mux *to_clk_busy_mux(struct clk_hw *hw)
|
|
{
|
|
struct clk_mux *mux = container_of(hw, struct clk_mux, hw);
|
|
|
|
return container_of(mux, struct clk_busy_mux, mux);
|
|
}
|
|
|
|
static u8 clk_busy_mux_get_parent(struct clk_hw *hw)
|
|
{
|
|
struct clk_busy_mux *busy = to_clk_busy_mux(hw);
|
|
|
|
return busy->mux_ops->get_parent(&busy->mux.hw);
|
|
}
|
|
|
|
static int clk_busy_mux_set_parent(struct clk_hw *hw, u8 index)
|
|
{
|
|
struct clk_busy_mux *busy = to_clk_busy_mux(hw);
|
|
int ret;
|
|
|
|
ret = busy->mux_ops->set_parent(&busy->mux.hw, index);
|
|
if (!ret)
|
|
ret = clk_busy_wait(busy->reg, busy->shift);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct clk_ops clk_busy_mux_ops = {
|
|
.get_parent = clk_busy_mux_get_parent,
|
|
.set_parent = clk_busy_mux_set_parent,
|
|
};
|
|
|
|
struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
|
|
u8 width, void __iomem *busy_reg, u8 busy_shift,
|
|
const char **parent_names, int num_parents)
|
|
{
|
|
struct clk_busy_mux *busy;
|
|
struct clk *clk;
|
|
struct clk_init_data init;
|
|
|
|
busy = kzalloc(sizeof(*busy), GFP_KERNEL);
|
|
if (!busy)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
busy->reg = busy_reg;
|
|
busy->shift = busy_shift;
|
|
|
|
busy->mux.reg = reg;
|
|
busy->mux.shift = shift;
|
|
busy->mux.mask = BIT(width) - 1;
|
|
busy->mux.lock = &imx_ccm_lock;
|
|
busy->mux_ops = &clk_mux_ops;
|
|
|
|
init.name = name;
|
|
init.ops = &clk_busy_mux_ops;
|
|
init.flags = 0;
|
|
init.parent_names = parent_names;
|
|
init.num_parents = num_parents;
|
|
|
|
busy->mux.hw.init = &init;
|
|
|
|
clk = clk_register(NULL, &busy->mux.hw);
|
|
if (IS_ERR(clk))
|
|
kfree(busy);
|
|
|
|
return clk;
|
|
}
|