Commit a6f03986 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: (113 commits)
  omap4: Add support for i2c init
  omap: Fix i2c platform init code for omap4
  OMAP2 clock: fix recursive spinlock attempt when CONFIG_CPU_FREQ=y
  OMAP powerdomain, hwmod, omap_device: add some credits
  OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains
  OMAP3 clock: add support for setting the divider for sys_clkout2 using clk_set_rate
  OMAP4 powerdomain: Fix pwrsts flags for ALWAYS ON domains
  OMAP: timers: Fix clock source names for OMAP4
  OMAP4 clock: Support clk_set_parent
  OMAP4: PRCM: Add offset defines for all CM registers
  OMAP4: PRCM: Add offset defines for all PRM registers
  OMAP4: PRCM: Remove duplicate definition of base addresses
  OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention
  OMAP4: CM: Remove non-functional registers in ES1.0
  OMAP: hwmod: Replace WARN by pr_warning for clockdomain check
  OMAP: hwmod: Rename hwmod name for the MPU
  OMAP: hwmod: Do not exit the iteration if one clock init failed
  OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed
  OMAP: hwmod: Remove IS_ERR check with omap_clk_get_by_name return value
  OMAP: hwmod: Fix wrong pointer iteration in oh->slaves
  ...
parents e0bc5d4a f6304f58

arch/arm/configs/am3517_evm_defconfig

+87 −5
Original line number Diff line number Diff line
@@ -422,15 +422,29 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

CONFIG_CAN=y

CONFIG_CAN_RAW=y

CONFIG_CAN_BCM=y



#

# CAN Device Drivers

#

CONFIG_CAN_VCAN=y

CONFIG_CAN_DEV=y

CONFIG_CAN_CALC_BITTIMING=y

CONFIG_CAN_TI_HECC=y

# CONFIG_CAN_SJA1000 is not set



#

# CAN USB interfaces

#

# CONFIG_CAN_EMS_USB is not set

CONFIG_CAN_DEBUG_DEVICES=y

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_CFG80211_DEFAULT_PS_VALUE=0

# CONFIG_WIRELESS_OLD_REGULATORY is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_LIB80211 is not set



#
@@ -517,7 +531,75 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_OSD_INITIATOR is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set

# CONFIG_NETDEVICES is not set

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

CONFIG_PHYLIB=y



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

# CONFIG_SMSC_PHY is not set

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

# CONFIG_AX88796 is not set

# CONFIG_SMC91X is not set

CONFIG_TI_DAVINCI_EMAC=y

# CONFIG_DM9000 is not set

# CONFIG_ETHOC is not set

# CONFIG_SMC911X is not set

# CONFIG_SMSC911X is not set

# CONFIG_DNET is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_B44 is not set

# CONFIG_KS8842 is not set

# CONFIG_KS8851_MLL is not set

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers

#



#

# USB Network Adapters

#

# CONFIG_USB_CATC is not set

# CONFIG_USB_KAWETH is not set

# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET is not set

# CONFIG_WAN is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set

arch/arm/configs/ams_delta_defconfig

+6 −4
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_TASKSTATS is not set

# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

CONFIG_TREE_PREEMPT_RCU=y

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED=y
@@ -95,9 +96,8 @@ CONFIG_KMOD=y 
# Block layer

#

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set



#

# IO Schedulers
@@ -699,6 +699,7 @@ CONFIG_SERIO=y 
CONFIG_SERIO_SERPORT=y

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set

CONFIG_SERIO_AMS_DELTA=y

# CONFIG_GAMEPORT is not set



#
@@ -835,7 +836,8 @@ CONFIG_DAB=y 
#

# Graphics support

#

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y



#

# Display device support
@@ -1283,7 +1285,7 @@ CONFIG_DEBUG_PREEMPT=y 
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

arch/arm/configs/devkit8000_defconfig

+91 −66
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc6

# Thu Feb  4 15:42:56 2010

# Linux kernel version: 2.6.34-rc2

# Wed Mar 24 13:27:25 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_HAVE_PROC_CPU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -19,7 +20,9 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_ARCH_HAS_CPUFREQ=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_NEED_DMA_MAP_STATE=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_ARM_L1_CACHE_SHIFT_6=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y
@@ -60,11 +63,6 @@ CONFIG_RCU_FANOUT=32 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set
@@ -96,10 +94,14 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_HAVE_PERF_EVENTS=y

CONFIG_PERF_USE_VMALLOC=y



#

# Kernel Performance Events And Counters

#

# CONFIG_PERF_EVENTS is not set

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_COMPAT_BRK=y

CONFIG_SLAB=y
@@ -170,7 +172,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y 
CONFIG_INLINE_WRITE_UNLOCK_IRQ=y

# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

# CONFIG_MUTEX_SPIN_ON_OWNER is not set

# CONFIG_FREEZER is not set

CONFIG_FREEZER=y



#

# System Type
@@ -181,6 +183,7 @@ CONFIG_MMU=y 
# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set
@@ -190,7 +193,6 @@ CONFIG_MMU=y 
# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -207,21 +209,26 @@ CONFIG_MMU=y 
# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_NUC93X is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_SHMOBILE is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_S5P6440 is not set

# CONFIG_ARCH_S5P6442 is not set

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_S5PV210 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_U300 is not set

# CONFIG_ARCH_U8500 is not set

# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_DAVINCI is not set

CONFIG_ARCH_OMAP=y

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_U8500 is not set



#

# TI OMAP Implementations
@@ -237,16 +244,20 @@ CONFIG_ARCH_OMAP3=y 
# OMAP Feature Selections

#

# CONFIG_OMAP_RESET_CLOCKS is not set

# CONFIG_OMAP_MUX is not set

CONFIG_OMAP_MUX=y

# CONFIG_OMAP_MUX_DEBUG is not set

CONFIG_OMAP_MUX_WARNINGS=y

CONFIG_OMAP_MCBSP=y

# CONFIG_OMAP_MBOX_FWK is not set

# CONFIG_OMAP_MPU_TIMER is not set

CONFIG_OMAP_32K_TIMER=y

# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set

CONFIG_OMAP_32K_TIMER_HZ=128

CONFIG_OMAP_DM_TIMER=y

# CONFIG_OMAP_PM_NONE is not set

CONFIG_OMAP_PM_NOOP=y

CONFIG_ARCH_OMAP3430=y

CONFIG_OMAP_PACKAGE_CUS=y



#

# OMAP Board Type
@@ -295,6 +306,7 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_HAS_TLS_REG=y

CONFIG_ARM_L1_CACHE_SHIFT=6

CONFIG_CPU_HAS_PMU=y

# CONFIG_ARM_ERRATA_430973 is not set

# CONFIG_ARM_ERRATA_458693 is not set

# CONFIG_ARM_ERRATA_460075 is not set
@@ -387,7 +399,14 @@ CONFIG_HAVE_AOUT=y 
#

# Power management options

#

# CONFIG_PM is not set

CONFIG_PM=y

# CONFIG_PM_DEBUG is not set

CONFIG_PM_SLEEP=y

CONFIG_SUSPEND=y

CONFIG_SUSPEND_FREEZER=y

# CONFIG_APM_EMULATION is not set

# CONFIG_PM_RUNTIME is not set

CONFIG_PM_OPS=y

CONFIG_ARCH_SUSPEND_POSSIBLE=y

CONFIG_NET=y
@@ -395,7 +414,6 @@ CONFIG_NET=y 
# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set
@@ -666,6 +684,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

CONFIG_SCSI_DMA=y
@@ -717,6 +736,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_MII=y

# CONFIG_AX88796 is not set

# CONFIG_SMC91X is not set

# CONFIG_TI_DAVINCI_EMAC is not set

CONFIG_DM9000=y

CONFIG_DM9000_DEBUGLEVEL=4

CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
@@ -863,6 +883,7 @@ CONFIG_SERIAL_8250_RSA=y 
# CONFIG_SERIAL_MAX3100 is not set

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_TIMBERDALE is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

# CONFIG_LEGACY_PTYS is not set
@@ -891,6 +912,7 @@ CONFIG_I2C_HELPER_AUTO=y 
# CONFIG_I2C_OCORES is not set

CONFIG_I2C_OMAP=y

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_XILINX is not set



#

# External I2C/SMBus adapter drivers
@@ -904,15 +926,9 @@ CONFIG_I2C_OMAP=y 
#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y
@@ -944,10 +960,12 @@ CONFIG_GPIOLIB=y 
#

# Memory mapped GPIO expanders:

#

# CONFIG_GPIO_IT8761E is not set



#

# I2C GPIO expanders:

#

# CONFIG_GPIO_MAX7300 is not set

# CONFIG_GPIO_MAX732X is not set

# CONFIG_GPIO_PCA953X is not set

# CONFIG_GPIO_PCF857X is not set
@@ -984,10 +1002,12 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

CONFIG_MFD_CORE=y

# CONFIG_MFD_88PM860X is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_ASIC3 is not set

# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_HTC_I2CPLD is not set

# CONFIG_TPS65010 is not set

CONFIG_TWL4030_CORE=y

CONFIG_TWL4030_POWER=y
@@ -998,22 +1018,25 @@ CONFIG_TWL4030_CODEC=y 
# CONFIG_MFD_TC6393XB is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_MAX8925 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_WM8994 is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_MFD_MC13783 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_EZX_PCAP is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_AB4500_CORE is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_DUMMY is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

# CONFIG_REGULATOR_MAX8649 is not set

# CONFIG_REGULATOR_MAX8660 is not set

CONFIG_REGULATOR_TWL4030=y

# CONFIG_REGULATOR_LP3971 is not set
@@ -1072,7 +1095,6 @@ CONFIG_OMAP2_DSS_VENC=y 
CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0

CONFIG_FB_OMAP2=y

CONFIG_FB_OMAP2_DEBUG_SUPPORT=y

# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set

CONFIG_FB_OMAP2_NUM_FBS=3



#
@@ -1080,7 +1102,9 @@ CONFIG_FB_OMAP2_NUM_FBS=3 
#

CONFIG_PANEL_GENERIC=y

# CONFIG_PANEL_SHARP_LS037V7DW01 is not set

CONFIG_PANEL_INNOLUX_AT070TN83=y

# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set

# CONFIG_PANEL_TOPPOLY_TDO35S is not set

# CONFIG_PANEL_TPO_TD043MTEA1 is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -1136,6 +1160,7 @@ CONFIG_SND_ARM=y 
CONFIG_SND_SPI=y

CONFIG_SND_USB=y

# CONFIG_SND_USB_AUDIO is not set

# CONFIG_SND_USB_UA101 is not set

# CONFIG_SND_USB_CAIAQ is not set

CONFIG_SND_SOC=y

CONFIG_SND_OMAP_SOC=y
@@ -1147,42 +1172,44 @@ CONFIG_SND_SOC_TWL4030=y 
# CONFIG_SOUND_PRIME is not set

CONFIG_HID_SUPPORT=y

CONFIG_HID=y

CONFIG_HIDRAW=y

# CONFIG_HIDRAW is not set



#

# USB Input Devices

#

CONFIG_USB_HID=y

# CONFIG_HID_PID is not set

CONFIG_USB_HIDDEV=y

# CONFIG_USB_HIDDEV is not set



#

# Special HID drivers

#

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

# CONFIG_HID_3M_PCT is not set

# CONFIG_HID_A4TECH is not set

# CONFIG_HID_APPLE is not set

# CONFIG_HID_BELKIN is not set

# CONFIG_HID_CHERRY is not set

# CONFIG_HID_CHICONY is not set

# CONFIG_HID_CYPRESS is not set

# CONFIG_HID_DRAGONRISE is not set

CONFIG_HID_EZKEY=y

# CONFIG_HID_EZKEY is not set

# CONFIG_HID_KYE is not set

CONFIG_HID_GYRATION=y

# CONFIG_HID_GYRATION is not set

# CONFIG_HID_TWINHAN is not set

# CONFIG_HID_KENSINGTON is not set

CONFIG_HID_LOGITECH=y

# CONFIG_LOGITECH_FF is not set

# CONFIG_LOGIRUMBLEPAD2_FF is not set

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MONTEREY=y

# CONFIG_HID_LOGITECH is not set

# CONFIG_HID_MICROSOFT is not set

# CONFIG_HID_MOSART is not set

# CONFIG_HID_MONTEREY is not set

# CONFIG_HID_NTRIG is not set

CONFIG_HID_PANTHERLORD=y

# CONFIG_PANTHERLORD_FF is not set

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

# CONFIG_HID_ORTEK is not set

# CONFIG_HID_PANTHERLORD is not set

# CONFIG_HID_PETALYNX is not set

# CONFIG_HID_QUANTA is not set

# CONFIG_HID_SAMSUNG is not set

# CONFIG_HID_SONY is not set

# CONFIG_HID_STANTUM is not set

# CONFIG_HID_SUNPLUS is not set

# CONFIG_HID_GREENASIA is not set

# CONFIG_HID_SMARTJOYPLUS is not set

# CONFIG_HID_TOPSEED is not set
@@ -1193,7 +1220,7 @@ CONFIG_USB_ARCH_HAS_HCD=y 
CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set

CONFIG_USB_DEBUG=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y



#
@@ -1202,7 +1229,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 
# CONFIG_USB_DEVICEFS is not set

# CONFIG_USB_DEVICE_CLASS is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_OTG is not set

CONFIG_USB_OTG=y

# CONFIG_USB_OTG_WHITELIST is not set

# CONFIG_USB_OTG_BLACKLIST_HUB is not set

CONFIG_USB_MON=y
@@ -1230,15 +1257,15 @@ CONFIG_USB_MUSB_SOC=y 
#

# OMAP 343x high speed USB support

#

CONFIG_USB_MUSB_HOST=y

# CONFIG_USB_MUSB_HOST is not set

# CONFIG_USB_MUSB_PERIPHERAL is not set

# CONFIG_USB_MUSB_OTG is not set

# CONFIG_USB_GADGET_MUSB_HDRC is not set

CONFIG_USB_MUSB_OTG=y

CONFIG_USB_GADGET_MUSB_HDRC=y

CONFIG_USB_MUSB_HDRC_HCD=y

# CONFIG_MUSB_PIO_ONLY is not set

CONFIG_USB_INVENTRA_DMA=y

# CONFIG_USB_TI_CPPI_DMA is not set

# CONFIG_USB_MUSB_DEBUG is not set

CONFIG_USB_MUSB_DEBUG=y



#

# USB Device Class drivers
@@ -1291,7 +1318,6 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_BERRY_CHARGE is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set
@@ -1304,9 +1330,8 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG is not set

CONFIG_USB_GADGET_DEBUG=y

# CONFIG_USB_GADGET_DEBUG_FILES is not set

CONFIG_USB_GADGET_VBUS_DRAW=2

CONFIG_USB_GADGET_SELECTED=y
@@ -1314,8 +1339,7 @@ CONFIG_USB_GADGET_SELECTED=y 
# CONFIG_USB_GADGET_ATMEL_USBA is not set

# CONFIG_USB_GADGET_FSL_USB2 is not set

# CONFIG_USB_GADGET_LH7A40X is not set

CONFIG_USB_GADGET_OMAP=y

CONFIG_USB_OMAP=y

# CONFIG_USB_GADGET_OMAP is not set

# CONFIG_USB_GADGET_PXA25X is not set

# CONFIG_USB_GADGET_R8A66597 is not set

# CONFIG_USB_GADGET_PXA27X is not set
@@ -1330,19 +1354,20 @@ CONFIG_USB_OMAP=y 
# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LANGWELL is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set

# CONFIG_USB_GADGET_DUALSPEED is not set

CONFIG_USB_GADGET_DUALSPEED=y

# CONFIG_USB_ZERO is not set

CONFIG_USB_AUDIO=m

CONFIG_USB_ETH=m

CONFIG_USB_ETH_RNDIS=y

CONFIG_USB_ETH_EEM=y

CONFIG_USB_GADGETFS=m

# CONFIG_USB_AUDIO is not set

CONFIG_USB_ETH=y

# CONFIG_USB_ETH_RNDIS is not set

# CONFIG_USB_ETH_EEM is not set

# CONFIG_USB_GADGETFS is not set

# CONFIG_USB_FILE_STORAGE is not set

# CONFIG_USB_MASS_STORAGE is not set

CONFIG_USB_G_SERIAL=m

# CONFIG_USB_G_SERIAL is not set

# CONFIG_USB_MIDI_GADGET is not set

CONFIG_USB_G_PRINTER=m

# CONFIG_USB_G_PRINTER is not set

# CONFIG_USB_CDC_COMPOSITE is not set

# CONFIG_USB_G_NOKIA is not set

# CONFIG_USB_G_MULTI is not set



#
@@ -1373,8 +1398,6 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=m

# CONFIG_MMC_OMAP is not set

CONFIG_MMC_OMAP_HS=y

# CONFIG_MMC_AT91 is not set

# CONFIG_MMC_ATMELMCI is not set

CONFIG_MMC_SPI=m

# CONFIG_MEMSTICK is not set

CONFIG_NEW_LEDS=y
@@ -1392,11 +1415,11 @@ CONFIG_LEDS_GPIO_PLATFORM=y 
# CONFIG_LEDS_REGULATOR is not set

# CONFIG_LEDS_BD2802 is not set

# CONFIG_LEDS_LT3593 is not set

CONFIG_LEDS_TRIGGERS=y



#

# LED Triggers

#

CONFIG_LEDS_TRIGGERS=y

# CONFIG_LEDS_TRIGGER_TIMER is not set

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
@@ -1580,6 +1603,7 @@ CONFIG_UBIFS_FS=y 
CONFIG_UBIFS_FS_LZO=y

CONFIG_UBIFS_FS_ZLIB=y

# CONFIG_UBIFS_FS_DEBUG is not set

# CONFIG_LOGFS is not set

CONFIG_CRAMFS=y

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -1606,6 +1630,7 @@ CONFIG_SUNRPC_GSS=y 
CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CEPH_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

arch/arm/configs/omap3_defconfig

+94 −57

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/omap3_stalker_lks_defconfig

0 → 100644
+1691 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE