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

Commit cf1fb2df authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap/headers4' into next/drivers 



This avoids merge conflicts between the omap header changes and the gpmc
updates.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c9b1c7b3 6ba54ab4

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -937,7 +937,6 @@ config ARCH_OMAP 
	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select NEED_MACH_GPIO_H

	help

	  Support for TI's OMAP platform (OMAP1/2/3/4).

arch/arm/mach-omap1/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#



# Common support

obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o

obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \

	 serial.o devices.o dma.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o



ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

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,16 +27,16 @@ 
#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 <linux/platform_data/keypad-omap.h>



#include <mach/hardware.h>



#include "iomap.h"

#include "common.h"

#include "fpga.h"



/* fsample is pretty close to p2-sample */
@@ -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,