Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6181e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-for-linus' of... 

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
  omap: complete removal of machine_desc.io_pg_offst and .phys_io
  omap: UART: fix wakeup registers for OMAP24xx UART2
  omap: Fix spotty MMC voltages
  ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
  serial: omap-serial: fix signess error
  OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
  omap: dma: Fix buffering disable bit setting for omap24xx
  omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
  OMAP3: PM: fix scratchpad memory accesses for off-mode
  omap4: pandaboard: enable the ehci port on pandaboard
  omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
  omap4: pandaboard: remove unused hsmmc definition
  OMAP: McBSP: Remove null omap44xx ops comment
  OMAP: McBSP: Swap CLKS source definition
  OMAP: McBSP: Fix CLKR and FSR signal muxing
  OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
  OMAP: control: move plat-omap/control.h to mach-omap2/control.h
  OMAP: split plat-omap/common.c
  OMAP: McBSP: implement functional clock switching via clock framework
  OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
  ...

Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony
parents 72e58063 bc487fb3

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ config ARCH_OMAP 
	select GENERIC_CLOCKEVENTS

	select ARCH_HAS_HOLES_MEMORYMODEL

	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).

	  Support for TI's OMAP platform (OMAP1/2/3/4).



config PLAT_SPEAR

	bool "ST SPEAr"

arch/arm/configs/n8x0_defconfig

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP2=y

CONFIG_OMAP_RESET_CLOCKS=y

# CONFIG_OMAP_MUX is not set

# CONFIG_OMAP_MCBSP is not set

CONFIG_OMAP_MBOX_FWK=y

CONFIG_OMAP_32K_TIMER=y

CONFIG_ARCH_OMAP2420=y

CONFIG_MACH_NOKIA_N8X0=y

CONFIG_AEABI=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x10C08000

CONFIG_ZBOOT_ROM_BSS=0x10200000

CONFIG_CMDLINE="root=/dev/mmcblk0p2 console=ttyS2,115200n8 debug earlyprintk rootwait"

CONFIG_FPE_NWFPE=y

CONFIG_VFP=y

CONFIG_PM=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_ONENAND=y

CONFIG_MTD_ONENAND_OMAP2=y

CONFIG_MTD_ONENAND_OTP=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_OMAP=y

CONFIG_SPI=y

CONFIG_SPI_OMAP24XX=y

# CONFIG_HWMON is not set

CONFIG_MENELAUS=y

CONFIG_REGULATOR=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_SUSPEND=y

# CONFIG_USB_OTG_WHITELIST is not set

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_MUSB_OTG=y

CONFIG_USB_GADGET_MUSB_HDRC=y

# CONFIG_MUSB_PIO_ONLY is not set

CONFIG_USB_MUSB_DEBUG=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_DEBUG=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_ETH=m

CONFIG_USB_ETH_EEM=y

CONFIG_MMC=y

CONFIG_MMC_OMAP=y

CONFIG_EXT3_FS=y

CONFIG_INOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_JFFS2_LZO=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_CRC_CCITT=y

arch/arm/configs/omap3_defconfig→arch/arm/configs/omap2plus_defconfig

+26 −25
Original line number Diff line number Diff line
@@ -53,18 +53,18 @@ CONFIG_MACH_SBC3530=y 
CONFIG_MACH_OMAP_3630SDP=y

CONFIG_MACH_OMAP_4430SDP=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_ERRATA_411920=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

# CONFIG_LOCAL_TIMERS is not set

CONFIG_AEABI=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyS2,115200"

CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"

CONFIG_KEXEC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_FPE_NWFPE=y

CONFIG_VFP=y

CONFIG_NEON=y
@@ -87,23 +87,23 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_BT=y

CONFIG_BT_L2CAP=y

CONFIG_BT_SCO=y

CONFIG_BT=m

CONFIG_BT_L2CAP=m

CONFIG_BT_SCO=m

CONFIG_BT_RFCOMM=y

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=y

CONFIG_BT_BNEP=m

CONFIG_BT_BNEP_MC_FILTER=y

CONFIG_BT_BNEP_PROTO_FILTER=y

CONFIG_BT_HIDP=y

CONFIG_BT_HCIUART=y

CONFIG_BT_HIDP=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_H4=y

CONFIG_BT_HCIUART_BCSP=y

CONFIG_BT_HCIUART_LL=y

CONFIG_BT_HCIBCM203X=y

CONFIG_BT_HCIBPA10X=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_BT_HCIBCM203X=m

CONFIG_BT_HCIBPA10X=m

CONFIG_CFG80211=m

CONFIG_MAC80211=m

CONFIG_MAC80211_RC_PID=y

CONFIG_MAC80211_RC_DEFAULT_PID=y

CONFIG_MAC80211_LEDS=y
@@ -137,9 +137,11 @@ CONFIG_SMSC_PHY=y 
CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

CONFIG_SMSC911X=y

CONFIG_LIBERTAS=y

CONFIG_LIBERTAS_USB=y

CONFIG_LIBERTAS_SDIO=y

CONFIG_KS8851=y

CONFIG_KS8851_MLL=y

CONFIG_LIBERTAS=m

CONFIG_LIBERTAS_USB=m

CONFIG_LIBERTAS_SDIO=m

CONFIG_LIBERTAS_DEBUG=y

CONFIG_USB_USBNET=y

CONFIG_USB_ALI_M5632=y
@@ -201,8 +203,8 @@ CONFIG_FONTS=y 
CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

CONFIG_SND_VERBOSE_PRINTK=y
@@ -218,9 +220,9 @@ CONFIG_USB_DEVICEFS=y 
CONFIG_USB_SUSPEND=y

# CONFIG_USB_OTG_WHITELIST is not set

CONFIG_USB_MON=y

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_MUSB_OTG=y

CONFIG_USB_GADGET_MUSB_HDRC=y

# CONFIG_USB_MUSB_HDRC is not set

# CONFIG_USB_MUSB_OTG is not set

# CONFIG_USB_GADGET_MUSB_HDRC is not set

CONFIG_USB_MUSB_DEBUG=y

CONFIG_USB_WDM=y

CONFIG_USB_STORAGE=y
@@ -276,12 +278,11 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y

# CONFIG_LOCK_STAT is not set

CONFIG_DEBUG_SPINLOCK_SLEEP=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_LL=y

CONFIG_SECURITY=y

CONFIG_CRYPTO_MICHAEL_MIC=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/omap_4430sdp_defconfig

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_ELF_CORE is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP4=y

# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set

# CONFIG_ARCH_OMAP2 is not set

# CONFIG_ARCH_OMAP3 is not set

# CONFIG_OMAP_MUX is not set

CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_DM_TIMER=y

CONFIG_MACH_OMAP_4430SDP=y

# CONFIG_ARM_THUMB is not set

CONFIG_PL310_ERRATA_588369=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

# CONFIG_LOCAL_TIMERS is not set

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS2,115200n8 initrd=0x81600000,20M ramdisk_size=20480"

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_BINFMT_MISC=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_KS8851=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_DETECT_IRQ=y

CONFIG_SERIAL_8250_RSA=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_OMAP=y

CONFIG_SPI=y

CONFIG_SPI_OMAP24XX=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_OMAP_WATCHDOG=y

CONFIG_TWL4030_CORE=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TWL4030=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_OMAP_HS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_TWL4030=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_INOTIFY=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DETECT_SOFTLOCKUP is not set

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

# CONFIG_ARM_UNWIND is not set

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=y

CONFIG_CRC_T10DIF=y

CONFIG_LIBCRC32C=y

arch/arm/configs/omap_generic_2420_defconfig

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP2=y

# CONFIG_OMAP_MUX is not set

CONFIG_MACH_OMAP_GENERIC=y

CONFIG_ARCH_OMAP2420=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x10C08000

CONFIG_ZBOOT_ROM_BSS=0x10200000

CONFIG_FPE_NWFPE=y

CONFIG_BLK_DEV_RAM=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_VIDEO_OUTPUT_CONTROL=m

# CONFIG_VGA_CONSOLE is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_INOTIFY=y

CONFIG_ROMFS_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_CRC_CCITT=y