Commit 35b7ac4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 4e149184 61c8c158

arch/arm/common/locomo.c

+101 −0
Original line number Diff line number Diff line
@@ -541,6 +541,103 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info) 
	return ret;

}



#ifdef CONFIG_PM



struct locomo_save_data {

	u16	LCM_GPO;

	u16	LCM_SPICT;

	u16	LCM_GPE;

	u16	LCM_ASD;

	u16	LCM_SPIMD;

};



static int locomo_suspend(struct device *dev, u32 pm_message_t, u32 level)

{

	struct locomo *lchip = dev_get_drvdata(dev);

	struct locomo_save_data *save;

	unsigned long flags;



	if (level != SUSPEND_DISABLE)

		return 0;



	save = kmalloc(sizeof(struct locomo_save_data), GFP_KERNEL);

	if (!save)

		return -ENOMEM;



	dev->power.saved_state = (void *) save;



	spin_lock_irqsave(&lchip->lock, flags);



	save->LCM_GPO     = locomo_readl(lchip->base + LOCOMO_GPO);	/* GPIO */

	locomo_writel(0x00, lchip->base + LOCOMO_GPO);

	save->LCM_SPICT   = locomo_readl(lchip->base + LOCOMO_SPICT);	/* SPI */

	locomo_writel(0x40, lchip->base + LOCOMO_SPICT);

	save->LCM_GPE     = locomo_readl(lchip->base + LOCOMO_GPE);	/* GPIO */

	locomo_writel(0x00, lchip->base + LOCOMO_GPE);

	save->LCM_ASD     = locomo_readl(lchip->base + LOCOMO_ASD);	/* ADSTART */

	locomo_writel(0x00, lchip->base + LOCOMO_ASD);

	save->LCM_SPIMD   = locomo_readl(lchip->base + LOCOMO_SPIMD);	/* SPI */

	locomo_writel(0x3C14, lchip->base + LOCOMO_SPIMD);



	locomo_writel(0x00, lchip->base + LOCOMO_PAIF);

	locomo_writel(0x00, lchip->base + LOCOMO_DAC);

	locomo_writel(0x00, lchip->base + LOCOMO_BACKLIGHT + LOCOMO_TC);



	if ( (locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT0) & 0x88) && (locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT1) & 0x88) )

		locomo_writel(0x00, lchip->base + LOCOMO_C32K); 	/* CLK32 off */

	else

		/* 18MHz already enabled, so no wait */

		locomo_writel(0xc1, lchip->base + LOCOMO_C32K); 	/* CLK32 on */



	locomo_writel(0x00, lchip->base + LOCOMO_TADC);		/* 18MHz clock off*/

	locomo_writel(0x00, lchip->base + LOCOMO_AUDIO + LOCOMO_ACC);			/* 22MHz/24MHz clock off */

	locomo_writel(0x00, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);			/* FL */



	spin_unlock_irqrestore(&lchip->lock, flags);



	return 0;

}



static int locomo_resume(struct device *dev, u32 level)

{

	struct locomo *lchip = dev_get_drvdata(dev);

	struct locomo_save_data *save;

	unsigned long r;

	unsigned long flags;

	

	if (level != RESUME_ENABLE)

		return 0;



	save = (struct locomo_save_data *) dev->power.saved_state;

	if (!save)

		return 0;



	spin_lock_irqsave(&lchip->lock, flags);



	locomo_writel(save->LCM_GPO, lchip->base + LOCOMO_GPO);

	locomo_writel(save->LCM_SPICT, lchip->base + LOCOMO_SPICT);

	locomo_writel(save->LCM_GPE, lchip->base + LOCOMO_GPE);

	locomo_writel(save->LCM_ASD, lchip->base + LOCOMO_ASD);

	locomo_writel(save->LCM_SPIMD, lchip->base + LOCOMO_SPIMD);



	locomo_writel(0x00, lchip->base + LOCOMO_C32K);

	locomo_writel(0x90, lchip->base + LOCOMO_TADC);



	locomo_writel(0, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KSC);

	r = locomo_readl(lchip->base + LOCOMO_KEYBOARD + LOCOMO_KIC);

	r &= 0xFEFF;

	locomo_writel(r, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KIC);

	locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD);



	spin_unlock_irqrestore(&lchip->lock, flags);



	dev->power.saved_state = NULL;

	kfree(save);



	return 0;

}

#endif



/**

 *	locomo_probe - probe for a single LoCoMo chip.

 *	@phys_addr: physical address of device.
@@ -707,6 +804,10 @@ static struct device_driver locomo_device_driver = { 
	.bus		= &platform_bus_type,

	.probe		= locomo_probe,

	.remove		= locomo_remove,

#ifdef CONFIG_PM

	.suspend	= locomo_suspend,

	.resume		= locomo_resume,

#endif

};



/*

arch/arm/configs/s3c2410_defconfig

+130 −88
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-git4

# Wed Jun 22 15:56:42 2005

# Linux kernel version: 2.6.13-git8

# Thu Sep  8 19:24:02 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -22,6 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
# General setup

#

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_POSIX_MQUEUE is not set
@@ -31,6 +32,7 @@ CONFIG_SYSCTL=y 
# CONFIG_HOTPLUG is not set

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set
@@ -88,7 +90,9 @@ CONFIG_ARCH_S3C2410=y 
#

# S3C24XX Implementations

#

CONFIG_MACH_ANUBIS=y

CONFIG_ARCH_BAST=y

CONFIG_BAST_PC104_IRQ=y

CONFIG_ARCH_H1940=y

CONFIG_MACH_N30=y

CONFIG_ARCH_SMDK2410=y
@@ -112,6 +116,7 @@ CONFIG_S3C2410_DMA=y 
# CONFIG_S3C2410_DMA_DEBUG is not set

# CONFIG_S3C2410_PM_DEBUG is not set

# CONFIG_S3C2410_PM_CHECK is not set

CONFIG_PM_SIMTEC=y

CONFIG_S3C2410_LOWLEVEL_UART_PORT=0



#
@@ -149,7 +154,15 @@ CONFIG_ISA_DMA_API=y 
#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

# CONFIG_DISCONTIGMEM is not set

# CONFIG_NO_IDLE_HZ is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_ALIGNMENT_TRAP=y



#
@@ -185,6 +198,74 @@ CONFIG_BINFMT_AOUT=y 
CONFIG_PM=y

CONFIG_APM=y



#

# Networking

#

CONFIG_NET=y



#

# Networking options

#

# CONFIG_PACKET is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

# CONFIG_IP_PNP_DHCP is not set

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IP_PNP_RARP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set



#

# DCCP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_DCCP is not set



#

# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_IEEE80211 is not set



#

# Device Drivers

#
@@ -258,6 +339,7 @@ CONFIG_MTD_ROM=y 
# CONFIG_MTD_IMPA7 is not set

CONFIG_MTD_BAST=y

CONFIG_MTD_BAST_MAXSIZE=4

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers
@@ -312,7 +394,6 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_CDROM_PKTCDVD is not set



#
@@ -354,6 +435,7 @@ CONFIG_BLK_DEV_IDE_BAST=y 
#

# SCSI device support

#

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set



#
@@ -376,76 +458,19 @@ CONFIG_BLK_DEV_IDE_BAST=y 
#



#

# Networking support

#

CONFIG_NET=y



#

# Networking options

# Network device support

#

# CONFIG_PACKET is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_FIB_TRIE is not set

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_PNP=y

# CONFIG_IP_PNP_DHCP is not set

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IP_PNP_RARP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_IP_TCPDIAG=y

# CONFIG_IP_TCPDIAG_IPV6 is not set

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set



#

# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set



#

# PHY device support

#

# CONFIG_PHYLIB is not set



#

# Ethernet (10 or 100Mbit)

#
@@ -480,6 +505,8 @@ CONFIG_DM9000=m 
# CONFIG_SLIP is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem
@@ -562,7 +589,6 @@ CONFIG_SERIAL_8250_EXTENDED=y 
CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_SERIAL_8250_DETECT_IRQ is not set

# CONFIG_SERIAL_8250_MULTIPORT is not set

# CONFIG_SERIAL_8250_RSA is not set



#
@@ -605,7 +631,6 @@ CONFIG_S3C2410_RTC=y 
#

# Ftape, the floppy tape device driver

#

# CONFIG_DRM is not set

# CONFIG_RAW_DRIVER is not set



#
@@ -628,7 +653,7 @@ CONFIG_I2C_ALGOBIT=m 
#

# I2C Hardware Bus support

#

# CONFIG_I2C_ISA is not set

CONFIG_I2C_ISA=m

# CONFIG_I2C_PARPORT is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

CONFIG_I2C_S3C2410=y
@@ -636,14 +661,33 @@ CONFIG_I2C_S3C2410=y 
# CONFIG_I2C_PCA_ISA is not set



#

# Hardware Sensors Chip support

# Miscellaneous I2C Chip support

#

CONFIG_I2C_SENSOR=m

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

CONFIG_SENSORS_EEPROM=m

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

CONFIG_HWMON_VID=m

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set
@@ -662,27 +706,21 @@ CONFIG_SENSORS_LM85=m 
# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Other I2C Chip support

# Misc devices

#

# CONFIG_SENSORS_DS1337 is not set

CONFIG_SENSORS_EEPROM=m

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# Misc devices

# Multimedia Capabilities Port drivers

#



#
@@ -731,7 +769,7 @@ CONFIG_DUMMY_CONSOLE=y 
# USB support

#

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set

CONFIG_USB_ARCH_HAS_OHCI=y

# CONFIG_USB is not set



#
@@ -749,6 +787,7 @@ CONFIG_USB_ARCH_HAS_HCD=y 
#

CONFIG_EXT2_FS=y

# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set
@@ -758,6 +797,7 @@ CONFIG_JBD=y 
CONFIG_FS_MBCACHE=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set



#

# XFS support
@@ -765,6 +805,7 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y

CONFIG_INOTIFY=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set
@@ -791,11 +832,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 
#

CONFIG_PROC_FS=y

CONFIG_SYSFS=y

# CONFIG_DEVPTS_FS_XATTR is not set

# CONFIG_TMPFS is not set

# CONFIG_HUGETLBFS is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set



#

# Miscellaneous filesystems
@@ -812,8 +853,7 @@ CONFIG_JFFS_FS_VERBOSE=0 
# CONFIG_JFFS_PROC_FS is not set

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=0

# CONFIG_JFFS2_FS_NAND is not set

# CONFIG_JFFS2_FS_NOR_ECC is not set

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y
@@ -835,6 +875,7 @@ CONFIG_NFS_FS=y 
# CONFIG_NFSD is not set

CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -920,6 +961,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" 
CONFIG_DEBUG_KERNEL=y

# CONFIG_MAGIC_SYSRQ is not set

CONFIG_LOG_BUF_SHIFT=16

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SPINLOCK is not set

arch/arm/mach-omap1/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,14 @@ config MACH_OMAP_OSK 
	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here

          if you have such a board.



config OMAP_OSK_MISTRAL

	bool "Mistral QVGA board Support"

	depends on MACH_OMAP_OSK

    	help

	  The OSK supports an optional add-on board with a Quarter-VGA

	  touchscreen, PDA-ish buttons, a resume button, bicolor LED,

	  and camera connector.  Say Y here if you have this board.



config MACH_OMAP_PERSEUS2

	bool "TI Perseus2"

	depends on ARCH_OMAP1 && ARCH_OMAP730

arch/arm/mach-omap1/Makefile

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



# Common support

obj-y := io.o id.o irq.o time.o serial.o

obj-y := io.o id.o irq.o time.o serial.o devices.o

led-y := leds.o



# Specific board support
@@ -23,6 +23,7 @@ endif 


# LEDs support

led-$(CONFIG_MACH_OMAP_H2)		+= leds-h2p2-debug.o

led-$(CONFIG_MACH_OMAP_H3)		+= leds-h2p2-debug.o

led-$(CONFIG_MACH_OMAP_INNOVATOR)	+= leds-innovator.o

led-$(CONFIG_MACH_OMAP_PERSEUS2)	+= leds-h2p2-debug.o

led-$(CONFIG_MACH_OMAP_OSK)		+= leds-osk.o

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

+37 −1
Original line number Diff line number Diff line
@@ -48,19 +48,43 @@ static struct omap_usb_config generic1510_usb_config __initdata = { 


#if defined(CONFIG_ARCH_OMAP16XX)

static struct omap_usb_config generic1610_usb_config __initdata = {

#ifdef CONFIG_USB_OTG

	.otg		= 1,

#endif

	.register_host	= 1,

	.register_dev	= 1,

	.hmc_mode	= 16,

	.pins[0]	= 6,

};



static struct omap_mmc_config generic_mmc_config __initdata = {

	.mmc [0] = {

		.enabled 	= 0,

		.wire4		= 0,

		.wp_pin		= -1,

		.power_pin	= -1,

		.switch_pin	= -1,

	},

	.mmc [1] = {

		.enabled 	= 0,

		.wire4		= 0,

		.wp_pin		= -1,

		.power_pin	= -1,

		.switch_pin	= -1,

	},

};



#endif



static struct omap_board_config_kernel generic_config[] = {

	{ OMAP_TAG_USB,           NULL },

	{ OMAP_TAG_MMC,           &generic_mmc_config },

};



static void __init omap_generic_init(void)

{

	const struct omap_uart_config *uart_conf;



	/*

	 * Make sure the serial ports are muxed on at this point.

	 * You have to mux them off in device drivers later on
@@ -76,6 +100,18 @@ static void __init omap_generic_init(void) 
		generic_config[0].data = &generic1610_usb_config;

	}

#endif



	uart_conf = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);

	if (uart_conf != NULL) {

		unsigned int enabled_ports, i;



		enabled_ports = uart_conf->enabled_uarts;

		for (i = 0; i < 3; i++) {

			if (!(enabled_ports & (1 << i)))

				generic_serial_ports[i] = 0;

		}

	}



	omap_board_config = generic_config;

	omap_board_config_size = ARRAY_SIZE(generic_config);

	omap_serial_init(generic_serial_ports);
@@ -83,7 +119,7 @@ static void __init omap_generic_init(void) 


static void __init omap_generic_map_io(void)

{

	omap_map_common_io()

	omap_map_common_io();

}



MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")