From: Tony Lindgren <tony@atomide.com>
Date: Tue, 8 May 2007 21:32:06 +0000 (-0700)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.22-omap1~165
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ea589e4a5070c6c7fdacd43d66987d53b5d45152;p=linux-2.6-omap-h63xx.git

Merge omap-drivers

Merge branches 'master' and 'omap-drivers'

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-audio.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/pm.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	drivers/Makefile
	drivers/i2c/chips/gpio_expander_omap.c
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/i2c/chips/twl4030_core.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/eac.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/omap24xx.h
	include/asm-arm/arch-omap/onenand.h
	include/asm-arm/arch-omap/pm.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/Kconfig
---

ea589e4a5070c6c7fdacd43d66987d53b5d45152
diff --cc arch/arm/mach-omap2/io.c
index 9e660296e3e,2769171147b..41e5011c83b
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -42,58 -42,50 +42,96 @@@ static struct map_desc omap2_io_desc[] 
  		.length		= L3_24XX_SIZE,
  		.type		= MT_DEVICE
  	},
+ #ifdef CONFIG_ARCH_OMAP2430
+ 	{
+ 		.virtual	= L4_WK_243X_VIRT,
+ 		.pfn		= __phys_to_pfn(L4_WK_243X_PHYS),
+ 		.length		= L4_WK_243X_SIZE,
+ 		.type		= MT_DEVICE
+ 	},
+ 	{
+ 		.virtual	= OMAP243X_GPMC_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP243X_GPMC_PHYS),
+ 		.length		= OMAP243X_GPMC_SIZE,
+ 		.type		= MT_DEVICE
+ 	},
+ 	{
+ 		.virtual	= OMAP243X_SDRC_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP243X_SDRC_PHYS),
+ 		.length		= OMAP243X_SDRC_SIZE,
+ 		.type		= MT_DEVICE
+ 	},
+ 	{
+ 		.virtual	= OMAP243X_SMS_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP243X_SMS_PHYS),
+ 		.length		= OMAP243X_SMS_SIZE,
+ 		.type		= MT_DEVICE
+ 	},
+ #endif
+ 	{
+ 		.virtual	= DSP_MEM_24XX_VIRT,
+ 		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),
+ 		.length		= DSP_MEM_24XX_SIZE,
+ 		.type		= MT_DEVICE
+ 	},
+ 	{
+ 		.virtual	= DSP_IPI_24XX_VIRT,
+ 		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),
+ 		.length		= DSP_IPI_24XX_SIZE,
+ 		.type		= MT_DEVICE
+ 	},
  	{
- 		.virtual	= L4_24XX_VIRT,
- 		.pfn		= __phys_to_pfn(L4_24XX_PHYS),
- 		.length		= L4_24XX_SIZE,
+ 		.virtual	= DSP_MMU_24XX_VIRT,
+ 		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),
+ 		.length		= DSP_MMU_24XX_SIZE,
  		.type		= MT_DEVICE
 -	}
 +	},
 +#ifdef CONFIG_ARCH_OMAP2430
 +	{
 +		.virtual	= L4_WK_243X_VIRT,
 +		.pfn		= __phys_to_pfn(L4_WK_243X_PHYS),
 +		.length		= L4_WK_243X_SIZE,
 +		.type		= MT_DEVICE
 +	},
 +	{
 +		.virtual	= OMAP243X_GPMC_VIRT,
 +		.pfn		= __phys_to_pfn(OMAP243X_GPMC_PHYS),
 +		.length		= OMAP243X_GPMC_SIZE,
 +		.type		= MT_DEVICE
 +	},
 +	{
 +		.virtual	= OMAP243X_SDRC_VIRT,
 +		.pfn		= __phys_to_pfn(OMAP243X_SDRC_PHYS),
 +		.length		= OMAP243X_SDRC_SIZE,
 +		.type		= MT_DEVICE
 +	},
 +	{
 +		.virtual	= OMAP243X_SMS_VIRT,
 +		.pfn		= __phys_to_pfn(OMAP243X_SMS_PHYS),
 +		.length		= OMAP243X_SMS_SIZE,
 +		.type		= MT_DEVICE
 +	},
 +#endif
 +	{
 +		.virtual	= DSP_MEM_24XX_VIRT,
 +		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),
 +		.length		= DSP_MEM_24XX_SIZE,
 +		.type		= MT_DEVICE
 +	},
 +#ifdef CONFIG_ARCH_OMAP2420
 +	{
 +		.virtual	= DSP_IPI_24XX_VIRT,
 +		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),
 +		.length		= DSP_IPI_24XX_SIZE,
 +		.type		= MT_DEVICE
 +	},
 +#endif
 +	{
 +		.virtual	= DSP_MMU_24XX_VIRT,
 +		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),
 +		.length		= DSP_MMU_24XX_SIZE,
 +		.type		= MT_DEVICE
 +	},
  };
  
  void __init omap2_map_common_io(void)
diff --cc arch/arm/plat-omap/Makefile
index d17ca1a211a,86d1ce2ad43..282ea007013
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@@ -14,24 -14,13 +14,25 @@@ obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32
  # OCPI interconnect support for 1710, 1610 and 5912
  obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
  
+ obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
+ 
 +# STI support
 +obj-$(CONFIG_OMAP_STI) += sti/
 +
- obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
- 
  obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
  obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 +obj-$(CONFIG_OMAP_BOOT_REASON) += bootreason.o
 +obj-$(CONFIG_OMAP_COMPONENT_VERSION) += component-version.o
 +obj-$(CONFIG_OMAP_GPIO_SWITCH) += gpio-switch.o
  obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
  obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
  
 +# OMAP MMU framework
 +obj-$(CONFIG_OMAP_MMU_FWK) += mmu.o
 +
 +# OMAP mailbox framework
 +obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
 +
  # DSP subsystem
  obj-y += dsp/
+ obj-$(CONFIG_OMAP_DSP) += mailbox.o
diff --cc include/asm-arm/arch-omap/gpio.h
index 6ed8074d203,c2ae7d867dd..bb782943a52
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/include/asm-arm/arch-omap/gpio.h
@@@ -5,7 -5,7 +5,7 @@@
   *
   * Copyright (C) 2003-2005 Nokia Corporation
   *
-- * Written by Juha Yrjölä <juha.yrjola@nokia.com>
++ * Written by Juha Yrj�l� <juha.yrjola@nokia.com>
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by