Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

power management changes for omap and imx A significant part of the changes for these two platforms went into power management, so they are split out into a separate branch. * tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits) ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1 ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation ARM: imx6q: resume PL310 only when CACHE_L2X0 defined ARM: imx6q: build pm code only when CONFIG_PM selected ARM: mx5: use generic irq chip pm interface for pm functions on ARM: omap: pass minimal SoC/board data for UART from dt arm/dts: Add minimal device tree support for omap2420 and omap2430 omap-serial: Add minimal device tree support omap-serial: Use default clock speed (48Mhz) if not specified omap-serial: Get rid of all pdev->id usage ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init ARM: OMAP4: PRM: use PRCM interrupt handler ARM: OMAP3: pm: use prcm chain handler ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad ARM: OMAP2+: mux: add support for PAD wakeup interrupts ARM: OMAP: PRCM: add suspend prepare / finish support ARM: OMAP: PRCM: add support for chain interrupt handler ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-09 17:39:59 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-09 17:39:59 -0500
commit: b3c37522928b5452588fc202eaa0f11f6e339256 (patch)
tree: 37bfe21d9977b15271903d1a4b304289a232e364 /arch/arm/mach-omap2/board-3430sdp.c
parent: 2ac9d7aaccbd598b5bd19ac40761b723bb675442 (diff)
parent: 6d0a5636fba5a3f82ec80ab124dd4748344549c3 (diff)
1 files changed, 1 insertions, 99 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 9996334cb687..383717ba63b9 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -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();
author	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-09 17:39:59 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-09 17:39:59 -0500
commit	b3c37522928b5452588fc202eaa0f11f6e339256 (patch)
tree	37bfe21d9977b15271903d1a4b304289a232e364 /arch/arm/mach-omap2/board-3430sdp.c
parent	2ac9d7aaccbd598b5bd19ac40761b723bb675442 (diff)
parent	6d0a5636fba5a3f82ec80ab124dd4748344549c3 (diff)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 9996334cb687..383717ba63b9 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -475,106 +475,8 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
475	static struct omap_board_mux board_mux[] __initdata = {	475	static struct omap_board_mux board_mux[] __initdata = {
476	{ .reg_offset = OMAP_MUX_TERMINATOR },	476	{ .reg_offset = OMAP_MUX_TERMINATOR },
477	};	477	};
478
479	static struct omap_device_pad serial1_pads[] __initdata = {
480	/*
481	* Note that off output enable is an active low
482	* signal. So setting this means pin is a
483	* input enabled in off mode
484	*/
485	OMAP_MUX_STATIC("uart1_cts.uart1_cts",
486	OMAP_PIN_INPUT \|
487	OMAP_PIN_OFF_INPUT_PULLDOWN \|
488	OMAP_OFFOUT_EN \|
489	OMAP_MUX_MODE0),
490	OMAP_MUX_STATIC("uart1_rts.uart1_rts",
491	OMAP_PIN_OUTPUT \|
492	OMAP_OFF_EN \|
493	OMAP_MUX_MODE0),
494	OMAP_MUX_STATIC("uart1_rx.uart1_rx",
495	OMAP_PIN_INPUT \|
496	OMAP_PIN_OFF_INPUT_PULLDOWN \|
497	OMAP_OFFOUT_EN \|
498	OMAP_MUX_MODE0),
499	OMAP_MUX_STATIC("uart1_tx.uart1_tx",
500	OMAP_PIN_OUTPUT \|
501	OMAP_OFF_EN \|
502	OMAP_MUX_MODE0),
503	};
504
505	static struct omap_device_pad serial2_pads[] __initdata = {
506	OMAP_MUX_STATIC("uart2_cts.uart2_cts",
507	OMAP_PIN_INPUT_PULLUP \|
508	OMAP_PIN_OFF_INPUT_PULLDOWN \|
509	OMAP_OFFOUT_EN \|
510	OMAP_MUX_MODE0),
511	OMAP_MUX_STATIC("uart2_rts.uart2_rts",
512	OMAP_PIN_OUTPUT \|
513	OMAP_OFF_EN \|
514	OMAP_MUX_MODE0),
515	OMAP_MUX_STATIC("uart2_rx.uart2_rx",
516	OMAP_PIN_INPUT \|
517	OMAP_PIN_OFF_INPUT_PULLDOWN \|
518	OMAP_OFFOUT_EN \|
519	OMAP_MUX_MODE0),
520	OMAP_MUX_STATIC("uart2_tx.uart2_tx",
521	OMAP_PIN_OUTPUT \|
522	OMAP_OFF_EN \|
523	OMAP_MUX_MODE0),
524	};
525
526	static struct omap_device_pad serial3_pads[] __initdata = {
527	OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",
528	OMAP_PIN_INPUT_PULLDOWN \|
529	OMAP_PIN_OFF_INPUT_PULLDOWN \|
530	OMAP_OFFOUT_EN \|
531	OMAP_MUX_MODE0),
532	OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",
533	OMAP_PIN_OUTPUT \|
534	OMAP_OFF_EN \|
535	OMAP_MUX_MODE0),
536	OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",
537	OMAP_PIN_INPUT \|
538	OMAP_PIN_OFF_INPUT_PULLDOWN \|
539	OMAP_OFFOUT_EN \|
540	OMAP_MUX_MODE0),
541	OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",
542	OMAP_PIN_OUTPUT \|
543	OMAP_OFF_EN \|
544	OMAP_MUX_MODE0),
545	};
546
547	static struct omap_board_data serial1_data __initdata = {
548	.id = 0,
549	.pads = serial1_pads,
550	.pads_cnt = ARRAY_SIZE(serial1_pads),
551	};
552
553	static struct omap_board_data serial2_data __initdata = {
554	.id = 1,
555	.pads = serial2_pads,
556	.pads_cnt = ARRAY_SIZE(serial2_pads),
557	};
558
559	static struct omap_board_data serial3_data __initdata = {
560	.id = 2,
561	.pads = serial3_pads,
562	.pads_cnt = ARRAY_SIZE(serial3_pads),
563	};
564
565	static inline void board_serial_init(void)
566	{
567	omap_serial_init_port(&serial1_data);
568	omap_serial_init_port(&serial2_data);
569	omap_serial_init_port(&serial3_data);
570	}
571	#else	478	#else
572	#define board_mux NULL	479	#define board_mux NULL
573
574	static inline void board_serial_init(void)
575	{
576	omap_serial_init();
577	}
578	#endif	480	#endif
579		481
580	/*	482	/*
@@ -711,7 +613,7 @@ static void __init omap_3430sdp_init(void)
711	else	613	else
712	gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;	614	gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;
713	omap_ads7846_init(1, gpio_pendown, 310, NULL);	615	omap_ads7846_init(1, gpio_pendown, 310, NULL);
714	board_serial_init();	616	omap_serial_init();
715	omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);	617	omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);
716	usb_musb_init(NULL);	618	usb_musb_init(NULL);
717	board_smc91x_init();	619	board_smc91x_init();