Merge fixes fixes-non-critical cleanup soc hwmod pm dt omap1 omap4 driver i2c board...

Merge branches 'fixes', 'fixes-non-critical', 'cleanup', 'soc', 'hwmod', 'pm', 'dt', 'omap1', 'omap4', 'driver', 'i2c', 'board', 'testing-board', 'testing-misc' and 'cbus' into tmp-rebuild-1327076785

diff --cc arch/arm/mach-omap2/Kconfig
index c726108,b662513,a8ba7b9,a8ba7b9,bdd5b68,a8ba7b9,e1293aa,044e44d,a8ba7b9..1b4b5f3
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
--- 3/arch/arm/mach-omap2/Kconfig
--- 4/arch/arm/mach-omap2/Kconfig
--- 5/arch/arm/mach-omap2/Kconfig
--- 6/arch/arm/mach-omap2/Kconfig
--- 7/arch/arm/mach-omap2/Kconfig
--- 8/arch/arm/mach-omap2/Kconfig
--- 9/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@@@@@@@@ -342,8 -331,8 -343,8 -343,8 -330,8 -343,8 -329,8 -349,14 -343,8 +347,14 @@@@@@@@@@ config MACH_OMAP4_PAND
                depends on ARCH_OMAP4
                select OMAP_PACKAGE_CBL
                select OMAP_PACKAGE_CBS
 --------       select REGULATOR_FIXED_VOLTAGE
 ++++++++       select REGULATOR_FIXED_VOLTAGE if REGULATOR
 ++++++ +
+++++++ +config MACH_PCM049
+++++++ +       bool "OMAP4 based phyCORE OMAP4"
+++++++ +       depends on ARCH_OMAP4
+++++++ +       default y
+++++++ +       select OMAP_PACKAGE_CBS
+        
         config OMAP3_EMU
                bool "OMAP3 debugging peripherals"
                depends on ARCH_OMAP3

diff --cc arch/arm/mach-omap2/board-cm-t35.c
index e921e3b,7a52fea,e921e3b,e921e3b,510b6a2,e921e3b,bd1bcac,e921e3b,e921e3b..d839c05
--- 1/arch/arm/mach-omap2/board-cm-t35.c
--- 2/arch/arm/mach-omap2/board-cm-t35.c
--- 3/arch/arm/mach-omap2/board-cm-t35.c
--- 4/arch/arm/mach-omap2/board-cm-t35.c
--- 5/arch/arm/mach-omap2/board-cm-t35.c
--- 6/arch/arm/mach-omap2/board-cm-t35.c
--- 7/arch/arm/mach-omap2/board-cm-t35.c
--- 8/arch/arm/mach-omap2/board-cm-t35.c
--- 9/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@@@@@@@@@ -668,10 -633,9 -668,10 -668,10 -634,9 -668,10 -634,8 -668,10 -668,10 +667,10 @@@@@@@@@@ MACHINE_START(CM_T35, "Compulab CM-T35"
                .map_io         = omap3_map_io,
                .init_early     = omap35xx_init_early,
                .init_irq       = omap3_init_irq,
      +         .handle_irq     = omap3_intc_handle_irq,
                .init_machine   = cm_t35_init,
                .timer          = &omap3_timer,
 +  + +         .restart        = omap_prcm_restart,
         MACHINE_END
         
         MACHINE_START(CM_T3730, "Compulab CM-T3730")
@@@@@@@@@@ -680,8 -644,7 -680,8 -680,8 -645,7 -680,8 -644,6 -680,8 -680,8 +679,8 @@@@@@@@@@
                .map_io         = omap3_map_io,
                .init_early     = omap3630_init_early,
                .init_irq       = omap3_init_irq,
      +         .handle_irq     = omap3_intc_handle_irq,
                .init_machine   = cm_t3730_init,
                .timer          = &omap3_timer,
 +  + +         .restart        = omap_prcm_restart,
         MACHINE_END

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/board-n8x0.c
index 42a4d11,2cb99d1,42a4d11,42a4d11,bebd3d8,42a4d11,e9d5f4a,42a4d11,71965b7..02774a2
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
--- 3/arch/arm/mach-omap2/board-n8x0.c
--- 4/arch/arm/mach-omap2/board-n8x0.c
--- 5/arch/arm/mach-omap2/board-n8x0.c
--- 6/arch/arm/mach-omap2/board-n8x0.c
--- 7/arch/arm/mach-omap2/board-n8x0.c
--- 8/arch/arm/mach-omap2/board-n8x0.c
--- 9/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@@@@@@@@ -689,10 -688,9 -689,10 -689,10 -689,9 -689,10 -689,8 -689,10 -793,10 +792,10 @@@@@@@@@@ MACHINE_START(NOKIA_N800, "Nokia N800"
                .map_io         = omap242x_map_io,
                .init_early     = omap2420_init_early,
                .init_irq       = omap2_init_irq,
      +         .handle_irq     = omap2_intc_handle_irq,
                .init_machine   = n8x0_init_machine,
                .timer          = &omap2_timer,
 +  + +         .restart        = omap_prcm_restart,
         MACHINE_END
         
         MACHINE_START(NOKIA_N810, "Nokia N810")
@@@@@@@@@@ -701,10 -699,9 -701,10 -701,10 -700,9 -701,10 -699,8 -701,10 -805,10 +804,10 @@@@@@@@@@
                .map_io         = omap242x_map_io,
                .init_early     = omap2420_init_early,
                .init_irq       = omap2_init_irq,
      +         .handle_irq     = omap2_intc_handle_irq,
                .init_machine   = n8x0_init_machine,
                .timer          = &omap2_timer,
 +  + +         .restart        = omap_prcm_restart,
         MACHINE_END
         
         MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
@@@@@@@@@@ -713,8 -710,7 -713,8 -713,8 -711,7 -713,8 -709,6 -713,8 -817,8 +816,8 @@@@@@@@@@
                .map_io         = omap242x_map_io,
                .init_early     = omap2420_init_early,
                .init_irq       = omap2_init_irq,
      +         .handle_irq     = omap2_intc_handle_irq,
                .init_machine   = n8x0_init_machine,
                .timer          = &omap2_timer,
 +  + +         .restart        = omap_prcm_restart,
         MACHINE_END

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/omap_device.h
Simple merge

diff --cc arch/arm/plat-omap/omap_device.c
Simple merge