summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clk-imx6sl.c
diff options
context:
space:
mode:
authorShawn Guo2014-09-12 04:40:28 +0200
committerShawn Guo2014-09-16 04:09:40 +0200
commit69d9a3fe06ed4bdb69f0a20cfa031dbcb0ee8dc3 (patch)
tree20264f9f8342f8b2f7c16b7a5a8a6e2eb984719b /arch/arm/mach-imx/clk-imx6sl.c
parentARM: clk-imx6sl: refine clock tree for SSI (diff)
downloadkernel-qcow2-linux-69d9a3fe06ed4bdb69f0a20cfa031dbcb0ee8dc3.tar.gz
kernel-qcow2-linux-69d9a3fe06ed4bdb69f0a20cfa031dbcb0ee8dc3.tar.xz
kernel-qcow2-linux-69d9a3fe06ed4bdb69f0a20cfa031dbcb0ee8dc3.zip
ARM: imx: fix register offset of pll7_usb_host gate clock
There is a copy&paste error on register offset of pll7_usb_host gate clock introduced by i.MX6 PLL bypass support patches. The error breaks the ENET function, because it overwrites the pll6_enet gate bit. Correct the offset for all i.MX6 clock drivers. Thanks to Fugang Duan <B38611@freescale.com> for spotting the error. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/clk-imx6sl.c')
-rw-r--r--arch/arm/mach-imx/clk-imx6sl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c
index c8de87bc617f..e982ebe10814 100644
--- a/arch/arm/mach-imx/clk-imx6sl.c
+++ b/arch/arm/mach-imx/clk-imx6sl.c
@@ -243,7 +243,7 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
clks[IMX6SL_CLK_PLL4_AUDIO] = imx_clk_gate("pll4_audio", "pll4_bypass", base + 0x70, 13);
clks[IMX6SL_CLK_PLL5_VIDEO] = imx_clk_gate("pll5_video", "pll5_bypass", base + 0xa0, 13);
clks[IMX6SL_CLK_PLL6_ENET] = imx_clk_gate("pll6_enet", "pll6_bypass", base + 0xe0, 13);
- clks[IMX6SL_CLK_PLL7_USB_HOST] = imx_clk_gate("pll7_usb_host", "pll7_bypass", base + 0xe0, 13);
+ clks[IMX6SL_CLK_PLL7_USB_HOST] = imx_clk_gate("pll7_usb_host", "pll7_bypass", base + 0x20, 13);
clks[IMX6SL_CLK_LVDS1_SEL] = imx_clk_mux("lvds1_sel", base + 0x160, 0, 5, lvds_sels, ARRAY_SIZE(lvds_sels));
clks[IMX6SL_CLK_LVDS1_OUT] = imx_clk_gate_exclusive("lvds1_out", "lvds1_sel", base + 0x160, 10, BIT(12));