From: Tony Lindgren <tony@atomide.com>
Date: Tue, 8 Nov 2005 18:41:02 +0000 (-0800)
Subject: Merge with ../linux-2.6
X-Git-Tag: v2.6.15-omap2~103
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9b55cc6af61d3ff73ba746f798c5b765eec580b3;p=linux-2.6-omap-h63xx.git

Merge with ../linux-2.6
---

9b55cc6af61d3ff73ba746f798c5b765eec580b3
diff --cc arch/arm/mach-omap1/board-perseus2.c
index 1670146568d,354b157acb3..bd900b7ab33
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@@ -148,10 -131,15 +148,14 @@@ void omap_perseus2_init_irq(void
  	omap_gpio_init();
  	perseus2_init_smc91x();
  }
 -
  /* Only FPGA needs to be mapped here. All others are done with ioremap */
  static struct map_desc omap_perseus2_io_desc[] __initdata = {
- 	{H2P2_DBG_FPGA_BASE, H2P2_DBG_FPGA_START, H2P2_DBG_FPGA_SIZE,
- 	 MT_DEVICE},
+ 	{
+ 		.virtual	= H2P2_DBG_FPGA_BASE,
+ 		.pfn		= __phys_to_pfn(H2P2_DBG_FPGA_START),
+ 		.length		= H2P2_DBG_FPGA_SIZE,
+ 		.type		= MT_DEVICE
+ 	}
  };
  
  static void __init omap_perseus2_map_io(void)
diff --cc arch/arm/mach-omap1/io.c
index e72d26746e4,79fb86535eb..a7a19f75b9e
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@@ -37,10 -50,19 +51,19 @@@ static struct map_desc omap730_io_desc[
  };
  #endif
  
 -#ifdef CONFIG_ARCH_OMAP1510
 +#ifdef CONFIG_ARCH_OMAP15XX
  static struct map_desc omap1510_io_desc[] __initdata = {
-  { OMAP1510_DSP_BASE,    OMAP1510_DSP_START,    OMAP1510_DSP_SIZE,    MT_DEVICE },
-  { OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_START, OMAP1510_DSPREG_SIZE, MT_DEVICE },
+ 	{
+ 		.virtual	= OMAP1510_DSP_BASE,
+ 		.pfn		= __phys_to_pfn(OMAP1510_DSP_START),
+ 		.length		= OMAP1510_DSP_SIZE,
+ 		.type		= MT_DEVICE
+ 	}, {
+ 		.virtual	= OMAP1510_DSPREG_BASE,
+ 		.pfn		= __phys_to_pfn(OMAP1510_DSPREG_START),
+ 		.length		= OMAP1510_DSPREG_SIZE,
+ 		.type		= MT_DEVICE
+ 	}
  };
  #endif
  
diff --cc drivers/char/Kconfig
index 0c4a062319f,fdf4370db99..da5a65c58d7
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -659,19 -659,9 +659,19 @@@ config HW_RANDO
  
  	  If unsure, say N.
  
 +config OMAP_RNG
 +	tristate "OMAP Random Number Generator support"
 +	depends on ARCH_OMAP16XX || ARCH_OMAP24XX
 +	---help---
 +	  This driver provides kernel-side support for the Random Number
 +	  Generator hardware found on OMAP16xx and OMAP24xx multimedia
 +	  processors.
 +
 +	  If unsure, say N.
 +
  config NVRAM
  	tristate "/dev/nvram support"
- 	depends on ATARI || X86 || X86_64 || ARM || GENERIC_NVRAM
+ 	depends on ATARI || X86 || ARM || GENERIC_NVRAM
  	---help---
  	  If you say Y here and create a character special file /dev/nvram
  	  with major number 10 and minor number 144 using mknod ("man mknod"),
diff --cc drivers/mtd/nand/Kconfig
index 88cc956bcfd,1fc4c134d93..cc3111397f9
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -49,15 -49,9 +49,15 @@@ config MTD_NAND_SPI
  	help
  	  If you had to ask, you don't have one. Say 'N'.
  
 +config MTD_NAND_OMAP
 +        tristate "NAND Flash device on OMAP H3/H2/P2 or NETSTAR boards"
 +	depends on ARM && ARCH_OMAP1 && MTD_NAND && (MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_NETSTAR || MACH_OMAP_PERSEUS2)
 +        help
 +          Support for NAND flash on Texas Instruments H3/H2/P2/NETSTAR platforms.
 +
  config MTD_NAND_TOTO
  	tristate "NAND Flash device on TOTO board"
- 	depends on ARM && ARCH_OMAP && MTD_NAND
+ 	depends on ARCH_OMAP && MTD_NAND
  	help
  	  Support for NAND flash on Texas Instruments Toto platform.
  
diff --cc drivers/usb/host/ohci-omap.c
index 1379b8f9c35,e46cc540cf4..167e95ecc63
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@@ -513,9 -494,9 +499,10 @@@ static int ohci_omap_resume(struct devi
  /*
   * Driver definition to register with the OMAP bus
   */
 +MODULE_ALIAS("ohci");
  static struct device_driver ohci_hcd_omap_driver = {
  	.name		= "ohci",
+ 	.owner		= THIS_MODULE,
  	.bus		= &platform_bus_type,
  	.probe		= ohci_hcd_omap_drv_probe,
  	.remove		= ohci_hcd_omap_drv_remove,