diff options
| author | Olof Johansson <olof@lixom.net> | 2013-09-17 09:08:24 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-17 09:08:24 -0700 |
| commit | ab5c3b6b5199f30a567335e07ede4dc3face7ec1 (patch) | |
| tree | 0e17544e9a44f1b5d13b1e704e8d05794c689b96 /arch/arm/mach-imx/clk-fixup-mux.c | |
| parent | ab5be58833455dd2f942b9e2e5fcc8d9b4c7c9e6 (diff) | |
| parent | 538bcbe251d621aa19c46babafd01ede8fb6ddde (diff) | |
Merge tag 'imx-fixes-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo, imx fixes for 3.12:
* A couple of clock driver and device tree fixes
* A bug fix for clk-fixup-mux to get imx6sl back to boot
* A L2 cache setting fix for imx6q
* One pinctrl macro fix for UART2 DTE entries
* tag 'imx-fixes-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: imx6q: fix the wrong offset of the Pad Mux register
ARM: imx: i.mx6d/q: disable the double linefill feature of PL310
ARM: imx51.dtsi: fix PATA device clock
ARM: mach-imx: clk-imx51-imx53: Fix 'spdif1_pred' clock registration
ARM: imx: initialize clk_init_data.flags for clk-fixup-mux
ARM: imx27.dtsi: fix CSPI PER clock id
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/clk-fixup-mux.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-fixup-mux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clk-fixup-mux.c b/arch/arm/mach-imx/clk-fixup-mux.c index deb4b8093b30..0d40b35c557c 100644 --- a/arch/arm/mach-imx/clk-fixup-mux.c +++ b/arch/arm/mach-imx/clk-fixup-mux.c @@ -90,6 +90,7 @@ struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg, init.ops = &clk_fixup_mux_ops; init.parent_names = parents; init.num_parents = num_parents; + init.flags = 0; fixup_mux->mux.reg = reg; fixup_mux->mux.shift = shift; |