Merge with mainline to remove plat-omap/Kconfig conflict
Tony Lindgren [Mon, 1 Mar 2010 22:19:05 +0000 (14:19 -0800)]
Conflicts:
arch/arm/plat-omap/Kconfig

1  2 
arch/arm/configs/omap_4430sdp_defconfig
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/include/plat/omap44xx.h
arch/arm/plat-omap/io.c
drivers/char/hw_random/Kconfig
drivers/mfd/Kconfig
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/spi/Kconfig
sound/soc/omap/omap-mcbsp.c

@@@ -28,8 -27,8 +28,9 @@@
  #include <plat/common.h>
  #include <plat/control.h>
  #include <plat/timer-gp.h>
 +#include <plat/usb.h>
  #include <asm/hardware/gic.h>
+ #include <asm/hardware/cache-l2x0.h>
  
  static struct platform_device sdp4430_lcd_device = {
        .name           = "sdp4430_lcd",
@@@ -28,9 -19,10 +28,10 @@@ config ARCH_OMAP
  
  config ARCH_OMAP3
        bool "TI OMAP3"
 +      depends on ARCH_OMAP2PLUS
        select CPU_V7
 -      select COMMON_CLKDEV
 +      select USB_ARCH_HAS_EHCI
+       select ARM_L1_CACHE_SHIFT_6
  
  config ARCH_OMAP4
        bool "TI OMAP4"
  #define OMAP44XX_GIC_CPU_BASE         0x48240100
  #define OMAP44XX_SCU_BASE             0x48240000
  #define OMAP44XX_LOCAL_TWD_BASE               0x48240600
+ #define OMAP44XX_L2CACHE_BASE         0x48242000
  #define OMAP44XX_WKUPGEN_BASE         0x48281000
 +#define OMAP44XX_MCPDM_BASE           0x40132000
 +#define OMAP44XX_MCPDM_L3_BASE                0x49032000
  
  #define OMAP44XX_MAILBOX_BASE         (L4_44XX_BASE + 0xF4000)
 +#define OMAP44XX_HSUSB_OTG_BASE               (L4_44XX_BASE + 0xAB000)
  
  #endif /* __ASM_ARCH_OMAP44XX_H */
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge