Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 769aca03 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

From Shawn Guo <shawn.guo@linaro.org>:

The 2nd take of imx fixes for 3.9:
 - Fix pll1_sys clk initial status
 - Fix a typo in imx DEBUG_LL Kconfig

* tag 'imx-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: imx: fix typo "DEBUG_IMX50_IMX53_UART"
  ARM: imx: pll1_sys should be an initial on clk

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fc77b0e9 0c52db7e

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ config DEBUG_IMX_UART_PORT 
						DEBUG_IMX31_UART || \

						DEBUG_IMX35_UART || \

						DEBUG_IMX51_UART || \

						DEBUG_IMX50_IMX53_UART || \

						DEBUG_IMX53_UART || \

						DEBUG_IMX6Q_UART

	default 1

	help

arch/arm/mach-imx/clk-imx6q.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static struct clk *clk[clk_max]; 
static struct clk_onecell_data clk_data;



static enum mx6q_clks const clks_init_on[] __initconst = {

	mmdc_ch0_axi, rom,

	mmdc_ch0_axi, rom, pll1_sys,

};



static struct clk_div_table clk_enet_ref_table[] = {