diff options
| author | Jiada Wang | 2013-05-17 10:40:45 +0200 |
|---|---|---|
| committer | Shawn Guo | 2013-06-17 09:45:12 +0200 |
| commit | 71ed547743e27fdccbdd107e8ef98f942eef15fd (patch) | |
| tree | 6adca5668b32318dfbf24035fbedbeed3e024c10 /arch/arm/mach-imx | |
| parent | ARM: imx: disable pll8_mlb in mx6q_clks (diff) | |
| download | kernel-qcow2-linux-71ed547743e27fdccbdd107e8ef98f942eef15fd.tar.gz kernel-qcow2-linux-71ed547743e27fdccbdd107e8ef98f942eef15fd.tar.xz kernel-qcow2-linux-71ed547743e27fdccbdd107e8ef98f942eef15fd.zip | |
ARM: imx: remove MLB PLL from pllv3
MLB PLL should be handled internally in MLB driver,
so remove it from pllv3.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
CC: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/clk-pllv3.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk.h | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-imx/clk-pllv3.c b/arch/arm/mach-imx/clk-pllv3.c index d09bc3df9a7a..a9fad5f8d340 100644 --- a/arch/arm/mach-imx/clk-pllv3.c +++ b/arch/arm/mach-imx/clk-pllv3.c @@ -296,13 +296,6 @@ static const struct clk_ops clk_pllv3_enet_ops = { .recalc_rate = clk_pllv3_enet_recalc_rate, }; -static const struct clk_ops clk_pllv3_mlb_ops = { - .prepare = clk_pllv3_prepare, - .unprepare = clk_pllv3_unprepare, - .enable = clk_pllv3_enable, - .disable = clk_pllv3_disable, -}; - struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, const char *parent_name, void __iomem *base, u32 div_mask) @@ -330,9 +323,6 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, case IMX_PLLV3_ENET: ops = &clk_pllv3_enet_ops; break; - case IMX_PLLV3_MLB: - ops = &clk_pllv3_mlb_ops; - break; default: ops = &clk_pllv3_ops; } diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h index a2432c6960db..0e4e8bb261b9 100644 --- a/arch/arm/mach-imx/clk.h +++ b/arch/arm/mach-imx/clk.h @@ -18,7 +18,6 @@ enum imx_pllv3_type { IMX_PLLV3_USB, IMX_PLLV3_AV, IMX_PLLV3_ENET, - IMX_PLLV3_MLB, }; struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, |