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

Commit 4a76411e authored by Olof Johansson's avatar Olof Johansson
Browse files

ARM: arm-soc: Merge branch 'next/clk' into next/pm 



Merge together a couple of the smaller pm/clock branches into one.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5c1af2a7 fb6842a7

arch/arm/mach-omap1/board-ams-delta.c

+0 −1
Original line number Diff line number Diff line
@@ -625,7 +625,6 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") 
	.atag_offset	= 0x100,

	.map_io		= ams_delta_map_io,

	.init_early	= omap1_init_early,

	.reserve	= omap_reserve,

	.init_irq	= omap1_init_irq,

	.init_machine	= ams_delta_init,

	.init_late	= ams_delta_init_late,

arch/arm/mach-omap1/board-fsample.c

+4 −5
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <plat/tc.h>

#include <mach/tc.h>

#include <mach/mux.h>

#include <mach/flash.h>

#include <plat/fpga.h>

#include <../plat-omap/fpga.h>

#include <linux/platform_data/keypad-omap.h>



#include <mach/hardware.h>
@@ -123,9 +123,9 @@ static struct resource smc91x_resources[] = { 


static void __init fsample_init_smc91x(void)

{

	fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);

	__raw_writeb(1, H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

	fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,

	__raw_writeb(__raw_readb(H2P2_DBG_FPGA_LAN_RESET) & ~1,

		   H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

}
@@ -362,7 +362,6 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") 
	.atag_offset	= 0x100,

	.map_io		= omap_fsample_map_io,

	.init_early	= omap1_init_early,

	.reserve	= omap_reserve,

	.init_irq	= omap1_init_irq,

	.init_machine	= omap_fsample_init,

	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-generic.c

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") 
	.atag_offset	= 0x100,

	.map_io		= omap16xx_map_io,

	.init_early	= omap1_init_early,

	.reserve	= omap_reserve,

	.init_irq	= omap1_init_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-h2-mmc.c

+2 −3
Original line number Diff line number Diff line
@@ -13,12 +13,11 @@ 
 */

#include <linux/gpio.h>

#include <linux/platform_device.h>



#include <linux/platform_data/gpio-omap.h>

#include <linux/i2c/tps65010.h>



#include <plat/mmc.h>



#include "board-h2.h"

#include "mmc.h"



#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

arch/arm/mach-omap1/board-h2.c

+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include <asm/mach/map.h>



#include <mach/mux.h>

#include <plat/dma.h>

#include <plat/tc.h>

#include <plat-omap/dma-omap.h>

#include <mach/tc.h>

#include <mach/irda.h>

#include <linux/platform_data/keypad-omap.h>

#include <mach/flash.h>
@@ -50,6 +50,7 @@ 


#include "common.h"

#include "board-h2.h"

#include "dma.h"



/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

#define OMAP1610_ETHR_START		0x04000300
@@ -458,7 +459,6 @@ MACHINE_START(OMAP_H2, "TI-H2") 
	.atag_offset	= 0x100,

	.map_io		= omap16xx_map_io,

	.init_early     = omap1_init_early,

	.reserve	= omap_reserve,

	.init_irq	= omap1_init_irq,

	.init_machine	= h2_init,

	.init_late	= omap1_init_late,