Commit a7c88751 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus

parents 4415beb6 4367260c

arch/arm/mach-omap2/Kconfig

+3 −3
Original line number Original line Diff line number Diff line
@@ -100,20 +100,20 @@ config MACH_OMAP2_TUSB6010 




config MACH_OMAP_H4

config MACH_OMAP_H4

	bool "OMAP 2420 H4 board"

	bool "OMAP 2420 H4 board"

	depends on ARCH_OMAP2

	depends on ARCH_OMAP2420

	default y

	default y

	select OMAP_PACKAGE_ZAF

	select OMAP_PACKAGE_ZAF

	select OMAP_DEBUG_DEVICES

	select OMAP_DEBUG_DEVICES





config MACH_OMAP_APOLLON

config MACH_OMAP_APOLLON

	bool "OMAP 2420 Apollon board"

	bool "OMAP 2420 Apollon board"

	depends on ARCH_OMAP2

	depends on ARCH_OMAP2420

	default y

	default y

	select OMAP_PACKAGE_ZAC

	select OMAP_PACKAGE_ZAC





config MACH_OMAP_2430SDP

config MACH_OMAP_2430SDP

	bool "OMAP 2430 SDP board"

	bool "OMAP 2430 SDP board"

	depends on ARCH_OMAP2

	depends on ARCH_OMAP2430

	default y

	default y

	select OMAP_PACKAGE_ZAC

	select OMAP_PACKAGE_ZAC

arch/arm/mach-omap2/Makefile

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

#





# Common support

# Common support

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \

	 common.o





omap-2-3-common				= irq.o sdrc.o prm2xxx_3xxx.o

omap-2-3-common				= irq.o sdrc.o prm2xxx_3xxx.o

hwmod-common				= omap_hwmod.o \

hwmod-common				= omap_hwmod.o \

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <plat/gpmc.h>

#include <plat/gpmc.h>

#include <plat/display.h>

#include <plat/display.h>





#include <plat/control.h>

#include <plat/gpmc-smc91x.h>

#include <plat/gpmc-smc91x.h>





#include "board-flash.h"

#include "board-flash.h"
@@ -47,6 +46,7 @@ 
#include "sdram-qimonda-hyb18m512160af-6.h"

#include "sdram-qimonda-hyb18m512160af-6.h"

#include "hsmmc.h"

#include "hsmmc.h"

#include "pm.h"

#include "pm.h"

#include "control.h"





#define CONFIG_DISABLE_HFCLK 1

#define CONFIG_DISABLE_HFCLK 1

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,12 +32,12 @@ 




#include <plat/board.h>

#include <plat/board.h>

#include <plat/common.h>

#include <plat/common.h>

#include <plat/control.h>

#include <plat/usb.h>

#include <plat/usb.h>

#include <plat/mmc.h>

#include <plat/mmc.h>





#include "hsmmc.h"

#include "hsmmc.h"

#include "timer-gp.h"

#include "timer-gp.h"

#include "control.h"





#define ETH_KS8851_IRQ			34

#define ETH_KS8851_IRQ			34

#define ETH_KS8851_POWER_ON		48

#define ETH_KS8851_POWER_ON		48

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,11 +32,11 @@ 




#include <plat/board.h>

#include <plat/board.h>

#include <plat/common.h>

#include <plat/common.h>

#include <plat/control.h>

#include <plat/usb.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/display.h>





#include "mux.h"

#include "mux.h"

#include "control.h"





#define AM35XX_EVM_PHY_MASK		(0xF)

#define AM35XX_EVM_PHY_MASK		(0xF)

#define AM35XX_EVM_MDIO_FREQUENCY	(1000000)

#define AM35XX_EVM_MDIO_FREQUENCY	(1000000)