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

Commit 7f760f1a authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.3/uart/runtime-pm' of... 

Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart

Conflicts:
	arch/arm/mach-omap2/pm34xx.c
parents 9d297f5e da274686

arch/arm/mach-omap2/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -76,8 +76,13 @@ config SOC_OMAP3430 
	default y

	select ARCH_OMAP_OTG



config SOC_OMAPTI816X

	bool "TI816X support"

config SOC_OMAPTI81XX

	bool "TI81XX support"

	depends on ARCH_OMAP3

	default y



config SOC_OMAPAM33XX

	bool "AM33XX support"

	depends on ARCH_OMAP3

	default y
@@ -314,7 +319,7 @@ config MACH_OMAP_3630SDP 


config MACH_TI8168EVM

	bool "TI8168 Evaluation Module"

	depends on SOC_OMAPTI816X

	depends on SOC_OMAPTI81XX

	default y



config MACH_OMAP_4430SDP

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

+1 −99
Original line number Diff line number Diff line
@@ -475,106 +475,8 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = { 
static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};



static struct omap_device_pad serial1_pads[] __initdata = {

	/*

	 * Note that off output enable is an active low

	 * signal. So setting this means pin is a

	 * input enabled in off mode

	 */

	OMAP_MUX_STATIC("uart1_cts.uart1_cts",

			 OMAP_PIN_INPUT |

			 OMAP_PIN_OFF_INPUT_PULLDOWN |

			 OMAP_OFFOUT_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart1_rts.uart1_rts",

			 OMAP_PIN_OUTPUT |

			 OMAP_OFF_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart1_rx.uart1_rx",

			 OMAP_PIN_INPUT |

			 OMAP_PIN_OFF_INPUT_PULLDOWN |

			 OMAP_OFFOUT_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart1_tx.uart1_tx",

			 OMAP_PIN_OUTPUT |

			 OMAP_OFF_EN |

			 OMAP_MUX_MODE0),

};



static struct omap_device_pad serial2_pads[] __initdata = {

	OMAP_MUX_STATIC("uart2_cts.uart2_cts",

			 OMAP_PIN_INPUT_PULLUP |

			 OMAP_PIN_OFF_INPUT_PULLDOWN |

			 OMAP_OFFOUT_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_rts.uart2_rts",

			 OMAP_PIN_OUTPUT |

			 OMAP_OFF_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_rx.uart2_rx",

			 OMAP_PIN_INPUT |

			 OMAP_PIN_OFF_INPUT_PULLDOWN |

			 OMAP_OFFOUT_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_tx.uart2_tx",

			 OMAP_PIN_OUTPUT |

			 OMAP_OFF_EN |

			 OMAP_MUX_MODE0),

};



static struct omap_device_pad serial3_pads[] __initdata = {

	OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",

			 OMAP_PIN_INPUT_PULLDOWN |

			 OMAP_PIN_OFF_INPUT_PULLDOWN |

			 OMAP_OFFOUT_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",

			 OMAP_PIN_OUTPUT |

			 OMAP_OFF_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",

			 OMAP_PIN_INPUT |

			 OMAP_PIN_OFF_INPUT_PULLDOWN |

			 OMAP_OFFOUT_EN |

			 OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",

			 OMAP_PIN_OUTPUT |

			 OMAP_OFF_EN |

			 OMAP_MUX_MODE0),

};



static struct omap_board_data serial1_data __initdata = {

	.id		= 0,

	.pads		= serial1_pads,

	.pads_cnt	= ARRAY_SIZE(serial1_pads),

};



static struct omap_board_data serial2_data __initdata = {

	.id		= 1,

	.pads		= serial2_pads,

	.pads_cnt	= ARRAY_SIZE(serial2_pads),

};



static struct omap_board_data serial3_data __initdata = {

	.id		= 2,

	.pads		= serial3_pads,

	.pads_cnt	= ARRAY_SIZE(serial3_pads),

};



static inline void board_serial_init(void)

{

	omap_serial_init_port(&serial1_data);

	omap_serial_init_port(&serial2_data);

	omap_serial_init_port(&serial3_data);

}

#else

#define board_mux	NULL



static inline void board_serial_init(void)

{

	omap_serial_init();

}

#endif



/*
@@ -711,7 +613,7 @@ static void __init omap_3430sdp_init(void) 
	else

		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	board_serial_init();

	omap_serial_init();

	omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);

	usb_musb_init(NULL);

	board_smc91x_init();

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

+1 −67
Original line number Diff line number Diff line
@@ -837,74 +837,8 @@ static struct omap_board_mux board_mux[] __initdata = { 
	{ .reg_offset = OMAP_MUX_TERMINATOR },

};



static struct omap_device_pad serial2_pads[] __initdata = {

	OMAP_MUX_STATIC("uart2_cts.uart2_cts",

			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_rts.uart2_rts",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_rx.uart2_rx",

			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_tx.uart2_tx",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

};



static struct omap_device_pad serial3_pads[] __initdata = {

	OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",

			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",

			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

};



static struct omap_device_pad serial4_pads[] __initdata = {

	OMAP_MUX_STATIC("uart4_rx.uart4_rx",

			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart4_tx.uart4_tx",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

};



static struct omap_board_data serial2_data __initdata = {

	.id		= 1,

	.pads		= serial2_pads,

	.pads_cnt	= ARRAY_SIZE(serial2_pads),

};



static struct omap_board_data serial3_data __initdata = {

	.id		= 2,

	.pads		= serial3_pads,

	.pads_cnt	= ARRAY_SIZE(serial3_pads),

};



static struct omap_board_data serial4_data __initdata = {

	.id		= 3,

	.pads		= serial4_pads,

	.pads_cnt	= ARRAY_SIZE(serial4_pads),

};



static inline void board_serial_init(void)

{

	struct omap_board_data bdata;

	bdata.flags	= 0;

	bdata.pads	= NULL;

	bdata.pads_cnt	= 0;

	bdata.id	= 0;

	/* pass dummy data for UART1 */

	omap_serial_init_port(&bdata);



	omap_serial_init_port(&serial2_data);

	omap_serial_init_port(&serial3_data);

	omap_serial_init_port(&serial4_data);

}

#else

#define board_mux	NULL



static inline void board_serial_init(void)

{

	omap_serial_init();

}

 #endif



static void omap4_sdp4430_wifi_mux_init(void)
@@ -954,7 +888,7 @@ static void __init omap_4430sdp_init(void) 
	omap4_i2c_init();

	omap_sfh7741prox_init();

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

	board_serial_init();

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap4_sdp4430_wifi_init();

	omap4_twl6030_hsmmc_init(mmc);

arch/arm/mach-omap2/board-n8x0.c

+3 −3
Original line number Diff line number Diff line
@@ -644,15 +644,15 @@ static inline void board_serial_init(void) 
	bdata.pads_cnt = 0;



	bdata.id = 0;

	omap_serial_init_port(&bdata);

	omap_serial_init_port(&bdata, NULL);



	bdata.id = 1;

	omap_serial_init_port(&bdata);

	omap_serial_init_port(&bdata, NULL);



	bdata.id = 2;

	bdata.pads = serial2_pads;

	bdata.pads_cnt = ARRAY_SIZE(serial2_pads);

	omap_serial_init_port(&bdata);

	omap_serial_init_port(&bdata, NULL);

}



#else

arch/arm/mach-omap2/board-omap4panda.c

+1 −67
Original line number Diff line number Diff line
@@ -364,74 +364,8 @@ static struct omap_board_mux board_mux[] __initdata = { 
	{ .reg_offset = OMAP_MUX_TERMINATOR },

};



static struct omap_device_pad serial2_pads[] __initdata = {

	OMAP_MUX_STATIC("uart2_cts.uart2_cts",

			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_rts.uart2_rts",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_rx.uart2_rx",

			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart2_tx.uart2_tx",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

};



static struct omap_device_pad serial3_pads[] __initdata = {

	OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",

			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",

			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

};



static struct omap_device_pad serial4_pads[] __initdata = {

	OMAP_MUX_STATIC("uart4_rx.uart4_rx",

			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),

	OMAP_MUX_STATIC("uart4_tx.uart4_tx",

			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

};



static struct omap_board_data serial2_data __initdata = {

	.id             = 1,

	.pads           = serial2_pads,

	.pads_cnt       = ARRAY_SIZE(serial2_pads),

};



static struct omap_board_data serial3_data __initdata = {

	.id             = 2,

	.pads           = serial3_pads,

	.pads_cnt       = ARRAY_SIZE(serial3_pads),

};



static struct omap_board_data serial4_data __initdata = {

	.id             = 3,

	.pads           = serial4_pads,

	.pads_cnt       = ARRAY_SIZE(serial4_pads),

};



static inline void board_serial_init(void)

{

	struct omap_board_data bdata;

	bdata.flags     = 0;

	bdata.pads      = NULL;

	bdata.pads_cnt  = 0;

	bdata.id        = 0;

	/* pass dummy data for UART1 */

	omap_serial_init_port(&bdata);



	omap_serial_init_port(&serial2_data);

	omap_serial_init_port(&serial3_data);

	omap_serial_init_port(&serial4_data);

}

#else

#define board_mux	NULL



static inline void board_serial_init(void)

{

	omap_serial_init();

}

#endif



/* Display DVI */
@@ -562,7 +496,7 @@ static void __init omap4_panda_init(void) 
	omap4_panda_i2c_init();

	platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));

	platform_device_register(&omap_vwlan_device);

	board_serial_init();

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap4_twl6030_hsmmc_init(mmc);

	omap4_ehci_init();