Commit 5853e742 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap-fixes' 

* omap-fixes:
  ARM: OMAP2: Register the L4 io bus to boot OMAP2
  ARM: OMAP1: Compile in other 16xx boards to OSK defconfig
  ARM: OMAP1: Refresh H2 defconfig
  ARM: OMAP1: Refresh OSK defconfig
  ARM: OMAP: gpio lockdep updates
  ARM: OMAP1: omap1/pm.c build fix
  ARM: OMAP1: omap h2 regression fix
  ARM: OMAP1: Fix compile for boards depending on old gpio expander
  ARM: OMAP1: omap h3 regression and build fix
  ARM: OMAP: Remove compiler warning when i2c is not set
  ARM: OMAP: fix omap i2c init (regression)
  ARM: OMAP: fix false lockdep warnings
  ARM: OMAP: Fix sleep under spinlock for cpufreq
  ARM: OMAP: Pass logical DMA channel number always to callback handlers
parents 6bb68f88 09f21ed4

arch/arm/configs/omap_h2_1610_defconfig

+49 −22
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc5

# Mon Dec 17 20:04:38 2007

# Linux kernel version: 2.6.25-rc3

# Mon Mar  3 03:39:48 2008

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -21,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_SUPPORTS_AOUT=y

CONFIG_ZONE_DMA=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -40,17 +41,22 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_SYSFS_DEPRECATED is not set

# CONFIG_RELAY is not set

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -64,17 +70,26 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -102,6 +117,8 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_PREEMPT_RCU is not set



#

# System Type
@@ -130,6 +147,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_ORION is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set
@@ -139,6 +157,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_DAVINCI is not set

CONFIG_ARCH_OMAP=y

# CONFIG_ARCH_MSM7X00A is not set



#

# TI OMAP Implementations
@@ -155,6 +174,7 @@ CONFIG_OMAP_MUX=y 
# CONFIG_OMAP_MUX_DEBUG is not set

CONFIG_OMAP_MUX_WARNINGS=y

CONFIG_OMAP_MCBSP=y

# CONFIG_OMAP_MMU_FWK is not set

# CONFIG_OMAP_MPU_TIMER is not set

CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_32K_TIMER_HZ=128
@@ -266,6 +286,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set

# CONFIG_ATAGS_PROC is not set



#

# CPU Frequency scaling
@@ -311,9 +332,10 @@ CONFIG_PM=y 
# CONFIG_PM_LEGACY is not set

# CONFIG_PM_DEBUG is not set

CONFIG_PM_SLEEP=y

CONFIG_SUSPEND_UP_POSSIBLE=y

CONFIG_SUSPEND=y

CONFIG_SUSPEND_FREEZER=y

# CONFIG_APM_EMULATION is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y



#

# Networking
@@ -330,6 +352,7 @@ CONFIG_XFRM=y 
# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_XFRM_STATISTICS is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set
@@ -384,6 +407,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set
@@ -421,11 +445,13 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_BLK_DEV_XIP is not set

# CONFIG_CDROM_PKTCDVD is not set

CONFIG_ATA_OVER_ETH=m

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HAVE_IDE is not set



#

# SCSI device support
@@ -489,6 +515,7 @@ CONFIG_SMC91X=y 
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_B44 is not set

CONFIG_NETDEV_1000=y

# CONFIG_E1000E_ENABLED is not set

CONFIG_NETDEV_10000=y



#
@@ -512,7 +539,6 @@ CONFIG_SLIP_COMPRESSED=y 
CONFIG_SLHC=y

# CONFIG_SLIP_SMART is not set

# CONFIG_SLIP_MODE_SLIP6 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
@@ -616,12 +642,10 @@ CONFIG_I2C_OMAP=y 
#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TPS65010=y
@@ -649,6 +673,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ADT7473 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set
@@ -676,6 +701,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_W83781D is not set
@@ -683,6 +709,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83793 is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83L786NG is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -705,6 +732,7 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_ASIC3 is not set



#

# Multimedia devices
@@ -802,10 +830,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# USB Gadget Support

#

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set

# CONFIG_NEW_LEDS is not set
@@ -826,12 +850,10 @@ CONFIG_EXT2_FS=y 
# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set
@@ -874,8 +896,10 @@ CONFIG_SYSFS=y 
# CONFIG_EFS_FS is not set

CONFIG_CRAMFS=y

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

CONFIG_ROMFS_FS=y

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y
@@ -946,9 +970,6 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking
@@ -975,6 +996,7 @@ CONFIG_FRAME_POINTER=y 
CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=y

# CONFIG_CRYPTO_SEQIV is not set

CONFIG_CRYPTO_MANAGER=y

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set
@@ -992,6 +1014,9 @@ CONFIG_CRYPTO_CBC=y 
CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set
@@ -1006,12 +1031,14 @@ CONFIG_CRYPTO_DES=y 
# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SALSA20 is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y



#

arch/arm/configs/omap_osk_5912_defconfig

+94 −29
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc5

# Mon Dec 17 21:12:45 2007

# Linux kernel version: 2.6.25-rc3

# Mon Mar  3 03:35:17 2008

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -21,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_SUPPORTS_AOUT=y

CONFIG_ZONE_DMA=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -39,17 +40,22 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_SYSFS_DEPRECATED is not set

# CONFIG_RELAY is not set

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -63,17 +69,26 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -101,6 +116,8 @@ CONFIG_IOSCHED_CFQ=y 
CONFIG_DEFAULT_CFQ=y

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="cfq"

CONFIG_CLASSIC_RCU=y

# CONFIG_PREEMPT_RCU is not set



#

# System Type
@@ -129,6 +146,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" 
# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_ORION is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set
@@ -138,6 +156,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" 
# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_DAVINCI is not set

CONFIG_ARCH_OMAP=y

# CONFIG_ARCH_MSM7X00A is not set



#

# TI OMAP Implementations
@@ -154,6 +173,7 @@ CONFIG_OMAP_MUX=y 
# CONFIG_OMAP_MUX_DEBUG is not set

CONFIG_OMAP_MUX_WARNINGS=y

CONFIG_OMAP_MCBSP=y

# CONFIG_OMAP_MMU_FWK is not set

# CONFIG_OMAP_MPU_TIMER is not set

CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_32K_TIMER_HZ=128
@@ -173,13 +193,13 @@ CONFIG_ARCH_OMAP16XX=y 
#

# OMAP Board Type

#

# CONFIG_MACH_OMAP_INNOVATOR is not set

# CONFIG_MACH_OMAP_H2 is not set

# CONFIG_MACH_OMAP_H3 is not set

CONFIG_MACH_OMAP_INNOVATOR=y

CONFIG_MACH_OMAP_H2=y

CONFIG_MACH_OMAP_H3=y

CONFIG_MACH_OMAP_OSK=y

# CONFIG_OMAP_OSK_MISTRAL is not set

# CONFIG_MACH_NOKIA770 is not set

# CONFIG_MACH_OMAP_GENERIC is not set

CONFIG_MACH_NOKIA770=y

CONFIG_MACH_OMAP_GENERIC=y



#

# OMAP CPU Speed
@@ -275,6 +295,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set

# CONFIG_ATAGS_PROC is not set



#

# CPU Frequency scaling
@@ -307,9 +328,10 @@ CONFIG_PM=y 
# CONFIG_PM_LEGACY is not set

# CONFIG_PM_DEBUG is not set

CONFIG_PM_SLEEP=y

CONFIG_SUSPEND_UP_POSSIBLE=y

CONFIG_SUSPEND=y

CONFIG_SUSPEND_FREEZER=y

# CONFIG_APM_EMULATION is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y



#

# Networking
@@ -326,6 +348,7 @@ CONFIG_XFRM=y 
# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_XFRM_STATISTICS is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -381,6 +404,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set
@@ -493,11 +517,13 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_BLK_DEV_XIP is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

CONFIG_HAVE_IDE=y

CONFIG_IDE=m

CONFIG_BLK_DEV_IDE=m
@@ -519,7 +545,6 @@ CONFIG_IDE_PROC_FS=y 
#

# CONFIG_IDE_GENERIC is not set

# CONFIG_BLK_DEV_PLATFORM is not set

# CONFIG_IDE_ARM is not set

# CONFIG_BLK_DEV_IDEDMA is not set

CONFIG_IDE_ARCH_OBSOLETE_INIT=y

# CONFIG_BLK_DEV_HD is not set
@@ -553,6 +578,7 @@ CONFIG_SMC91X=y 
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_B44 is not set

CONFIG_NETDEV_1000=y

# CONFIG_E1000E_ENABLED is not set

CONFIG_NETDEV_10000=y



#
@@ -574,7 +600,6 @@ CONFIG_PPP_MULTILINK=y 
# CONFIG_PPPOL2TP is not set

# CONFIG_SLIP is not set

CONFIG_SLHC=y

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set
@@ -671,6 +696,7 @@ CONFIG_HW_RANDOM_OMAP=m 
# CONFIG_SYNCLINK_CS is not set

# CONFIG_CARDMAN_4000 is not set

# CONFIG_CARDMAN_4040 is not set

# CONFIG_IPWIRELESS is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

CONFIG_I2C=y
@@ -698,12 +724,10 @@ CONFIG_I2C_OMAP=y 
#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TPS65010=y
@@ -731,6 +755,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ADT7473 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set
@@ -758,6 +783,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_W83781D is not set
@@ -765,6 +791,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83793 is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83L786NG is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -780,6 +807,7 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_ASIC3 is not set



#

# Multimedia devices
@@ -865,10 +893,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# USB Gadget Support

#

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set

# CONFIG_NEW_LEDS is not set
@@ -889,12 +913,10 @@ CONFIG_EXT2_FS=y 
# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

CONFIG_AUTOFS_FS=y

CONFIG_AUTOFS4_FS=y

# CONFIG_FUSE_FS is not set
@@ -948,8 +970,10 @@ CONFIG_JFFS2_RTIME=y 
# CONFIG_JFFS2_RUBIN is not set

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y
@@ -1019,9 +1043,6 @@ CONFIG_NLS_ISO8859_1=m 
# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking
@@ -1045,7 +1066,51 @@ CONFIG_FRAME_POINTER=y 
# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_SEQIV is not set

# CONFIG_CRYPTO_MANAGER is not set

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

# CONFIG_CRYPTO_MD5 is not set

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_ECB is not set

# CONFIG_CRYPTO_CBC is not set

# CONFIG_CRYPTO_PCBC is not set

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_DES is not set

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SALSA20 is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y



#

# Library routines

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

+4 −0
Original line number Diff line number Diff line
@@ -350,6 +350,10 @@ static void __init h2_init_smc91x(void) 


static struct i2c_board_info __initdata h2_i2c_board_info[] = {

	{

		I2C_BOARD_INFO("tps65010", 0x48),

		.type           = "tps65010",

		.irq            = OMAP_GPIO_IRQ(58),

	}, {

		I2C_BOARD_INFO("isp1301_omap", 0x2d),

		.type		= "isp1301_omap",

		.irq		= OMAP_GPIO_IRQ(2),

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

+22 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/input.h>

#include <linux/spi/spi.h>

#include <linux/i2c/tps65010.h>



#include <asm/setup.h>
@@ -51,6 +52,8 @@ 
#include <asm/arch/mcbsp.h>

#include <asm/arch/omap-alsa.h>



#define H3_TS_GPIO	48



static int h3_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),
@@ -373,6 +376,17 @@ static struct platform_device h3_lcd_device = { 
	.id		= -1,

};



static struct spi_board_info h3_spi_board_info[] __initdata = {

	[0] = {

		.modalias	= "tsc2101",

		.bus_num	= 2,

		.chip_select	= 0,

		.irq		= OMAP_GPIO_IRQ(H3_TS_GPIO),

		.max_speed_hz	= 16000000,

		/* .platform_data	= &tsc_platform_data, */

	},

};



static struct omap_mcbsp_reg_cfg mcbsp_regs = {

	.spcr2 = FREE | FRST | GRST | XRST | XINTM(3),

	.spcr1 = RINTM(3) | RRST,
@@ -457,6 +471,14 @@ static struct omap_board_config_kernel h3_config[] __initdata = { 
	{ OMAP_TAG_LCD,		&h3_lcd_config },

};



static struct i2c_board_info __initdata h3_i2c_board_info[] = {

       {

               I2C_BOARD_INFO("tps65010", 0x48),

               .type           = "tps65013",

               /* .irq         = OMAP_GPIO_IRQ(??), */

       },

};



static struct omap_gpio_switch h3_gpio_switches[] __initdata = {

	{

		.name			= "mmc_slot",

arch/arm/mach-omap1/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static int __init omap_pm_init(void) 
#endif



#ifdef CONFIG_OMAP_32K_TIMER

	error = sysfs_create_file(power_kobj, &sleep_while_idle_attr);

	error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr);

	if (error)

		printk(KERN_ERR "sysfs_create_file failed: %d\n", error);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE