manual merge for pm-hwmod-uart due to conflicts (69758ab7) · Commits · 戴 / test

arch/arm/mach-omap2/Kconfig

+8 −3

Original line number	Diff line number	Diff line
		@@ -11,9 +11,8 @@ config ARCH_OMAP2PLUS_TYPICAL
		select PM_RUNTIME
		select VFP
		select NEON if ARCH_OMAP3 \|\| ARCH_OMAP4
		select SERIAL_8250
		select SERIAL_CORE_CONSOLE
		select SERIAL_8250_CONSOLE
		select SERIAL_OMAP
		select SERIAL_OMAP_CONSOLE
		select I2C
		select I2C_OMAP
		select MFD
		@@ -222,12 +221,18 @@ config MACH_OMAP_ZOOM2
		depends on ARCH_OMAP3
		default y
		select OMAP_PACKAGE_CBB
		select SERIAL_8250
		select SERIAL_CORE_CONSOLE
		select SERIAL_8250_CONSOLE

		config MACH_OMAP_ZOOM3
		bool "OMAP3630 Zoom3 board"
		depends on ARCH_OMAP3
		default y
		select OMAP_PACKAGE_CBP
		select SERIAL_8250
		select SERIAL_CORE_CONSOLE
		select SERIAL_8250_CONSOLE

		config MACH_CM_T35
		bool "CompuLab CM-T35 module"

arch/arm/mach-omap2/board-3630sdp.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,6 @@ static struct flash_partitions sdp_flash_partitions[] = {
		static void __init omap_sdp_init(void)
		{
		omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
		omap_serial_init();
		zoom_peripherals_init();
		board_smc91x_init();
		board_flash_init(sdp_flash_partitions, chip_sel_sdp);

arch/arm/mach-omap2/board-zoom-peripherals.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -283,4 +283,5 @@ void __init zoom_peripherals_init(void)
		omap_i2c_init();
		usb_musb_init(&musb_board_data);
		enable_board_wakeup_source();
		omap_serial_init();
		}

arch/arm/mach-omap2/clock3xxx_data.c

+22 −0

Original line number	Diff line number	Diff line
		@@ -2465,6 +2465,16 @@ static struct clk uart3_fck = {
		.recalc = &followparent_recalc,
		};

		static struct clk uart4_fck = {
		.name = "uart4_fck",
		.ops = &clkops_omap2_dflt_wait,
		.parent = &per_48m_fck,
		.enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
		.enable_bit = OMAP3630_EN_UART4_SHIFT,
		.clkdm_name = "per_clkdm",
		.recalc = &followparent_recalc,
		};

		static struct clk gpt2_fck = {
		.name = "gpt2_fck",
		.ops = &clkops_omap2_dflt_wait,
		@@ -2715,6 +2725,16 @@ static struct clk uart3_ick = {
		.recalc = &followparent_recalc,
		};

		static struct clk uart4_ick = {
		.name = "uart4_ick",
		.ops = &clkops_omap2_dflt_wait,
		.parent = &per_l4_ick,
		.enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),
		.enable_bit = OMAP3630_EN_UART4_SHIFT,
		.clkdm_name = "per_clkdm",
		.recalc = &followparent_recalc,
		};

		static struct clk gpt9_ick = {
		.name = "gpt9_ick",
		.ops = &clkops_omap2_dflt_wait,
		@@ -3349,6 +3369,7 @@ static struct omap_clk omap3xxx_clks[] = {
		CLK(NULL, "per_96m_fck", &per_96m_fck, CK_3XXX),
		CLK(NULL, "per_48m_fck", &per_48m_fck, CK_3XXX),
		CLK(NULL, "uart3_fck", &uart3_fck, CK_3XXX),
		CLK(NULL, "uart4_fck", &uart4_fck, CK_36XX),
		CLK(NULL, "gpt2_fck", &gpt2_fck, CK_3XXX),
		CLK(NULL, "gpt3_fck", &gpt3_fck, CK_3XXX),
		CLK(NULL, "gpt4_fck", &gpt4_fck, CK_3XXX),
		@@ -3372,6 +3393,7 @@ static struct omap_clk omap3xxx_clks[] = {
		CLK(NULL, "gpio2_ick", &gpio2_ick, CK_3XXX),
		CLK(NULL, "wdt3_ick", &wdt3_ick, CK_3XXX),
		CLK(NULL, "uart3_ick", &uart3_ick, CK_3XXX),
		CLK(NULL, "uart4_ick", &uart4_ick, CK_36XX),
		CLK(NULL, "gpt9_ick", &gpt9_ick, CK_3XXX),
		CLK(NULL, "gpt8_ick", &gpt8_ick, CK_3XXX),
		CLK(NULL, "gpt7_ick", &gpt7_ick, CK_3XXX),

arch/arm/mach-omap2/cm-regbits-34xx.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -649,6 +649,8 @@
		#define OMAP3430_ST_MCBSP2_MASK (1 << 0)

		/* CM_AUTOIDLE_PER */
		#define OMAP3630_AUTO_UART4_MASK (1 << 18)
		#define OMAP3630_AUTO_UART4_SHIFT 18
		#define OMAP3430_AUTO_GPIO6_MASK (1 << 17)
		#define OMAP3430_AUTO_GPIO6_SHIFT 17
		#define OMAP3430_AUTO_GPIO5_MASK (1 << 16)

Admin message