linux-3.0: fixes

* we now have 64kiB of cache instead of 32kiB
* fix the build failure when disabling omap4
* fix lcd boardfile

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

5 files changed, 220 insertions, 61 deletions

diff --git a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig
index 1942725f..09aafcae 100644
--- a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig
+++ b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig
@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.39 Kernel Configuration
-# Sun Jun  5 11:03:19 2011
+# Linux/arm 3.0.1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -27,7 +26,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 
@@ -46,6 +44,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="beagleboard"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -67,6 +66,7 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_CHIP=y
 # CONFIG_SPARSE_IRQ is not set
 
 #
@@ -81,7 +81,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
@@ -122,7 +121,6 @@ CONFIG_UID16=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -241,7 +239,6 @@ CONFIG_MMU=y
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_STMP3XXX is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
@@ -258,7 +255,6 @@ CONFIG_MMU=y
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_MMP is not set
 # 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_TEGRA is not set
@@ -271,7 +267,6 @@ CONFIG_MMU=y
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
 # CONFIG_ARCH_S5P64X0 is not set
-# CONFIG_ARCH_S5P6442 is not set
 # CONFIG_ARCH_S5PC100 is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS4 is not set
@@ -310,7 +305,6 @@ 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
 
 #
@@ -319,7 +313,7 @@ CONFIG_OMAP_PM_NOOP=y
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
+# CONFIG_ARCH_OMAP4 is not set
 CONFIG_SOC_OMAP3430=y
 # CONFIG_SOC_OMAPTI816X is not set
 CONFIG_OMAP_PACKAGE_CBB=y
@@ -418,6 +412,7 @@ CONFIG_AEABI=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
 # CONFIG_HIGHMEM is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -434,6 +429,7 @@ CONFIG_VIRT_TO_BUS=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_NEED_PER_CPU_KM=y
+# CONFIG_CLEANCACHE is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_LEDS=y
 CONFIG_ALIGNMENT_TRAP=y
@@ -445,9 +441,12 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 # Boot options
 #
+# CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=" debug "
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
@@ -458,9 +457,12 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU Power Management
 #
+
+#
+# CPU Frequency scaling
+#
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
-# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -468,7 +470,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_HOTPLUG is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -507,13 +508,13 @@ CONFIG_PM_SLEEP=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_VERBOSE is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_CAN_PM_TRACE=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
+CONFIG_PM_RUNTIME_CLK=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -888,6 +889,7 @@ CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
+# CONFIG_NET_SCH_QFQ is not set
 
 #
 # Classification
@@ -1045,6 +1047,8 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_REGULATOR is not set
+# CONFIG_RFKILL_GPIO is not set
 CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
 # CONFIG_CAIF is not set
@@ -1073,7 +1077,6 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_TESTS is not set
-CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
@@ -1185,6 +1188,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
+# CONFIG_INTEL_MID_PTI is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_APDS9802ALS is not set
@@ -1317,7 +1321,6 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
-CONFIG_BCM63XX_PHY=m
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
@@ -1348,7 +1351,6 @@ CONFIG_SMSC911X=y
 # 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=m
 CONFIG_KS8851=y
 # CONFIG_KS8851_MLL is not set
 # CONFIG_FTMAC100 is not set
@@ -1396,6 +1398,7 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
+# CONFIG_RTL8192SE is not set
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -1411,6 +1414,7 @@ CONFIG_WL12XX_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_MWIFIEX is not set
 
 #
 # WiMAX Wireless Broadband devices
@@ -1450,6 +1454,7 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=y
 CONFIG_USB_NET_CX82310_ETH=m
+# CONFIG_USB_NET_KALMIA is not set
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_IPHETH=m
@@ -1509,6 +1514,7 @@ CONFIG_INPUT_EVDEV=y
 #
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
@@ -1519,6 +1525,7 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
@@ -1589,6 +1596,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_N_GSM=m
+# CONFIG_TRACE_SINK is not set
 CONFIG_DEVKMEM=y
 
 #
@@ -1617,6 +1625,7 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_SERIAL_IFX6X60=m
+# CONFIG_SERIAL_XILINX_PS_UART is not set
 CONFIG_TTY_PRINTK=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
@@ -1702,6 +1711,14 @@ CONFIG_SPI_SPIDEV=y
 #
 # PPS generators support
 #
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
@@ -1709,7 +1726,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MAX730X=m
 
 #
-# Memory mapped GPIO expanders:
+# Memory mapped GPIO drivers:
 #
 # CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_GPIO_IT8761E is not set
@@ -1748,12 +1765,14 @@ CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_BQ20Z75 is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_ISP1704=m
+# CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=y
@@ -1809,8 +1828,10 @@ CONFIG_SENSORS_JC42=m
 # CONFIG_SENSORS_LTC4261 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
@@ -1822,6 +1843,7 @@ CONFIG_SENSORS_SMM665=m
 # CONFIG_SENSORS_DME1737 is not set
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_EMC2103=m
+# CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -1873,6 +1895,12 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y
 # CONFIG_SSB_SDIOHOST is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
 CONFIG_MFD_SUPPORT=y
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM860X is not set
@@ -1884,12 +1912,11 @@ CONFIG_MFD_CORE=y
 CONFIG_TPS6105X=m
 # CONFIG_TPS65010 is not set
 CONFIG_TPS6507X=m
+CONFIG_MFD_TPS6586X=y
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
-CONFIG_TWL4030_SCRIPT=y
 CONFIG_TWL4030_CODEC=y
-CONFIG_TWL4030_POWEROFF=y
 CONFIG_TWL6030_PWM=m
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TC3589X is not set
@@ -1911,9 +1938,9 @@ CONFIG_TWL6030_PWM=m
 # CONFIG_MFD_MC13XXX is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_EZX_PCAP is not set
-CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_OMAP_USB_HOST=y
+# CONFIG_MFD_TPS65910 is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_DUMMY=y
@@ -1962,6 +1989,7 @@ CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 # CONFIG_IR_IMON is not set
 # CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_REDRAT3 is not set
 # CONFIG_IR_STREAMZAP is not set
 CONFIG_RC_LOOPBACK=m
 CONFIG_MEDIA_ATTACH=y
@@ -1990,6 +2018,7 @@ CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
 CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEOBUF_GEN=y
 CONFIG_VIDEOBUF_VMALLOC=m
@@ -2008,11 +2037,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
-# Encoders/decoders and other helper chips
+# Encoders, decoders, sensors and other helper chips
 #
 
 #
-# Audio decoders
+# Audio decoders, processors and mixers
 #
 # CONFIG_VIDEO_TVAUDIO is not set
 # CONFIG_VIDEO_TDA7432 is not set
@@ -2022,7 +2051,6 @@ CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_MSP3400=m
 # CONFIG_VIDEO_CS5345 is not set
 CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_WM8775=m
 # CONFIG_VIDEO_WM8739 is not set
@@ -2041,14 +2069,8 @@ CONFIG_VIDEO_ADV7180=m
 # CONFIG_VIDEO_BT856 is not set
 # CONFIG_VIDEO_BT866 is not set
 # CONFIG_VIDEO_KS0127 is not set
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9P031=y
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=y
-# CONFIG_VIDEO_TCM825X is not set
 # CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_SAA717X is not set
 # CONFIG_VIDEO_SAA7191 is not set
 CONFIG_VIDEO_TVP514X=m
 CONFIG_VIDEO_TVP5150=m
@@ -2058,6 +2080,7 @@ CONFIG_VIDEO_TVP7002=m
 #
 # Video and audio decoders
 #
+# CONFIG_VIDEO_SAA717X is not set
 CONFIG_VIDEO_CX25840=m
 
 #
@@ -2072,25 +2095,38 @@ CONFIG_VIDEO_CX2341X=m
 # CONFIG_VIDEO_SAA7185 is not set
 # CONFIG_VIDEO_ADV7170 is not set
 # CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_THS7303 is not set
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_AK881X is not set
 
 #
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=y
+# CONFIG_VIDEO_TCM825X is not set
+
+#
 # Video improvement chips
 #
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set
+
+#
+# Miscelaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_M52790 is not set
 CONFIG_VIDEO_VIVI=m
 CONFIG_VIDEO_VPSS_SYSTEM=m
 CONFIG_VIDEO_VPFE_CAPTURE=y
 CONFIG_VIDEO_DM6446_CCDC=m
 CONFIG_VIDEO_OMAP2_VOUT=y
 # CONFIG_VIDEO_CPIA2 is not set
-CONFIG_VIDEO_TIMBERDALE=m
 # CONFIG_VIDEO_AU0828 is not set
 CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_NOON010PC30=m
+# CONFIG_VIDEO_M5MOLS is not set
 CONFIG_VIDEO_OMAP3=y
 CONFIG_VIDEO_OMAP3_DEBUG=y
 # CONFIG_SOC_CAMERA is not set
@@ -2107,6 +2143,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 # CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_KINECT is not set
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
 # CONFIG_USB_GSPCA_MR97310A is not set
@@ -2266,6 +2303,7 @@ CONFIG_DVB_DS3000=m
 # DVB-T (terrestrial) frontends
 #
 CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
@@ -2276,6 +2314,7 @@ CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
+CONFIG_DVB_CXD2820R=m
 
 #
 # DVB-C (cable) frontends
@@ -2312,6 +2351,7 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_IX2505V=m
@@ -2356,7 +2396,6 @@ CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_UDL=m
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 CONFIG_OMAP2_VRAM=y
@@ -2370,9 +2409,10 @@ CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_VENC=y
 # CONFIG_OMAP2_DSS_SDI is not set
 CONFIG_OMAP2_DSS_DSI=y
-CONFIG_OMAP2_DSS_USE_DSI_PLL=y
 # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
+CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y
+CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 CONFIG_FB_OMAP2=y
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=2
@@ -2384,6 +2424,7 @@ CONFIG_PANEL_GENERIC_DPI=y
 # CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
 CONFIG_PANEL_SHARP_LS037V7DW01=y
 CONFIG_PANEL_NEC_NL8048HL11_01B=y
+CONFIG_PANEL_TFCS9700RTWV35TR01B=y
 # CONFIG_PANEL_TAAL is not set
 CONFIG_PANEL_TPO_TD043MTEA1=m
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
@@ -2481,13 +2522,11 @@ CONFIG_USB_HID=y
 #
 # Special HID drivers
 #
-# CONFIG_HID_3M_PCT is not set
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=m
 # CONFIG_HID_ACRUX_FF is not set
 CONFIG_HID_APPLE=y
 CONFIG_HID_BELKIN=y
-# CONFIG_HID_CANDO is not set
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
 # CONFIG_HID_PRODIKEYS is not set
@@ -2511,7 +2550,6 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_LOGIWII_FF is not set
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=y
-# CONFIG_HID_MOSART is not set
 CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=y
@@ -2533,7 +2571,6 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 # CONFIG_HID_ROCCAT_PYRA is not set
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
-CONFIG_HID_STANTUM=m
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
@@ -2591,9 +2628,9 @@ 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_UX500_DMA is not set
 CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_TI_CPPI_DMA is not set
-# CONFIG_USB_MUSB_DEBUG is not set
 
 #
 # USB Device Class drivers
@@ -2688,7 +2725,6 @@ CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SAMBA=m
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 # CONFIG_USB_SERIAL_SYMBOL is not set
@@ -2777,7 +2813,7 @@ CONFIG_USB_GPIO_VBUS=y
 # CONFIG_ISP1301_OMAP is not set
 # CONFIG_USB_ULPI is not set
 CONFIG_TWL4030_USB=y
-CONFIG_TWL6030_USB=m
+CONFIG_TWL6030_USB=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
@@ -2801,6 +2837,7 @@ CONFIG_SDIO_UART=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_SPI=m
 # CONFIG_MMC_DW is not set
+# CONFIG_MMC_VUB300 is not set
 CONFIG_MMC_USHC=m
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -2875,10 +2912,13 @@ CONFIG_RTC_DRV_TWL4030=m
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
 
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T93 is not set
 # CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_DS1305 is not set
 # CONFIG_RTC_DRV_DS1390 is not set
@@ -2909,24 +2949,17 @@ CONFIG_RTC_DRV_TWL4030=m
 # on-CPU RTC drivers
 #
 # CONFIG_DMADEVICES is not set
-CONFIG_TIMB_DMA=m
-CONFIG_DMA_ENGINE=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_VIDEO_TM6000 is not set
-# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USBIP_CORE is not set
 CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
-CONFIG_BRCM80211=m
-CONFIG_BRCMFMAC=y
-# CONFIG_BRCMDBG is not set
-CONFIG_RT2870=m
-# CONFIG_COMEDI is not set
+# CONFIG_BRCMUTIL is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
@@ -3077,6 +3110,7 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y
@@ -3084,9 +3118,6 @@ CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
 # CONFIG_ECRYPT_FS is not set
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-# CONFIG_UNION_FS_DEBUG is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -3175,7 +3206,6 @@ CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CIFS_ACL=y
-CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -3277,6 +3307,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_LOCKUP_DETECTOR is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
@@ -3295,6 +3326,7 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_INFO is not set
@@ -3346,7 +3378,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_LL is not set
 # CONFIG_OC_ETM is not set
 
@@ -3479,7 +3510,6 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/recipes-kernel/linux/linux-3.0/omap4/0001-OMAP-Fix-linking-error-in-twl-common.c-for-OMAP2-3-4.patch b/recipes-kernel/linux/linux-3.0/omap4/0001-OMAP-Fix-linking-error-in-twl-common.c-for-OMAP2-3-4.patch
new file mode 100644
index 00000000..b8c61fe7
--- /dev/null
+++ b/recipes-kernel/linux/linux-3.0/omap4/0001-OMAP-Fix-linking-error-in-twl-common.c-for-OMAP2-3-4.patch
@@ -0,0 +1,129 @@
+From 7c2058baa279fd309e2773858bc6f176f884ef5c Mon Sep 17 00:00:00 2001
+From: Peter Ujfalusi <peter.ujfalusi@ti.com>
+Date: Wed, 17 Aug 2011 16:02:55 +0200
+Subject: [PATCH] OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only builds
+
+Commit b22f954 (OMAP4: Move common twl6030 configuration to twl-common)
+caused compile failures for code for OMAP arch which is not selected by
+the config.
+
+Fixes issues like:
+With CONFIG_ARCH_OMAP3=y and CONFIG_ARCH_OMAP4=n, I'm getting this:
+
+arch/arm/mach-omap2/built-in.o:(.data+0xf99c): undefined reference to `omap4430_phy_init'
+arch/arm/mach-omap2/built-in.o:(.data+0xf9a0): undefined reference to `omap4430_phy_exit'
+arch/arm/mach-omap2/built-in.o:(.data+0xf9a4): undefined reference to `omap4430_phy_power'
+arch/arm/mach-omap2/built-in.o:(.data+0xf9a8): undefined reference to `omap4430_phy_set_clk'
+arch/arm/mach-omap2/built-in.o:(.data+0xf9ac): undefined reference to `omap4430_phy_suspend'
+
+Fix the problem by moving the code to ifdef sections for omap3 and omap4.
+
+Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
+[tony@atomide.com: updated comments]
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+---
+ arch/arm/mach-omap2/twl-common.c |   77 ++++++++++++++++++++------------------
+ 1 files changed, 41 insertions(+), 36 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
+index 3aaa46f..58409c0 100644
+--- a/arch/arm/mach-omap2/twl-common.c
++++ b/arch/arm/mach-omap2/twl-common.c
+@@ -48,14 +48,7 @@ void __init omap_pmic_init(int bus, u32 clkrate,
+        omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);
+ }
+ 
+-static struct twl4030_usb_data omap4_usb_pdata = {
+-       .phy_init       = omap4430_phy_init,
+-       .phy_exit       = omap4430_phy_exit,
+-       .phy_power      = omap4430_phy_power,
+-       .phy_set_clock  = omap4430_phy_set_clk,
+-       .phy_suspend    = omap4430_phy_suspend,
+-};
+-
++#if defined(CONFIG_ARCH_OMAP3)
+ static struct twl4030_usb_data omap3_usb_pdata = {
+        .usb_mode       = T2_USB_MODE_ULPI,
+ };
+@@ -122,6 +115,45 @@ static struct regulator_init_data omap3_vpll2_idata = {
+        .consumer_supplies              = omap3_vpll2_supplies,
+ };
+ 
++void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
++                                 u32 pdata_flags, u32 regulators_flags)
++{
++       if (!pmic_data->irq_base)
++               pmic_data->irq_base = TWL4030_IRQ_BASE;
++       if (!pmic_data->irq_end)
++               pmic_data->irq_end = TWL4030_IRQ_END;
++
++       /* Common platform data configurations */
++       if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
++               pmic_data->usb = &omap3_usb_pdata;
++
++       if (pdata_flags & TWL_COMMON_PDATA_BCI && !pmic_data->bci)
++               pmic_data->bci = &omap3_bci_pdata;
++
++       if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc)
++               pmic_data->madc = &omap3_madc_pdata;
++
++       if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->codec)
++               pmic_data->codec = &omap3_codec_pdata;
++
++       /* Common regulator configurations */
++       if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)
++               pmic_data->vdac = &omap3_vdac_idata;
++
++       if (regulators_flags & TWL_COMMON_REGULATOR_VPLL2 && !pmic_data->vpll2)
++               pmic_data->vpll2 = &omap3_vpll2_idata;
++}
++#endif /* CONFIG_ARCH_OMAP3 */
++
++#if defined(CONFIG_ARCH_OMAP4)
++static struct twl4030_usb_data omap4_usb_pdata = {
++       .phy_init       = omap4430_phy_init,
++       .phy_exit       = omap4430_phy_exit,
++       .phy_power      = omap4430_phy_power,
++       .phy_set_clock  = omap4430_phy_set_clk,
++       .phy_suspend    = omap4430_phy_suspend,
++};
++
+ static struct regulator_init_data omap4_vdac_idata = {
+        .constraints = {
+                .min_uV                 = 1800000,
+@@ -274,31 +306,4 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
+                pmic_data->clk32kg = &omap4_clk32kg_idata;
+ }
+ 
+-void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
+-                                 u32 pdata_flags, u32 regulators_flags)
+-{
+-       if (!pmic_data->irq_base)
+-               pmic_data->irq_base = TWL4030_IRQ_BASE;
+-       if (!pmic_data->irq_end)
+-               pmic_data->irq_end = TWL4030_IRQ_END;
+-
+-       /* Common platform data configurations */
+-       if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
+-               pmic_data->usb = &omap3_usb_pdata;
+-
+-       if (pdata_flags & TWL_COMMON_PDATA_BCI && !pmic_data->bci)
+-               pmic_data->bci = &omap3_bci_pdata;
+-
+-       if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc)
+-               pmic_data->madc = &omap3_madc_pdata;
+-
+-       if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->codec)
+-               pmic_data->codec = &omap3_codec_pdata;
+-
+-       /* Common regulator configurations */
+-       if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)
+-               pmic_data->vdac = &omap3_vdac_idata;
+-
+-       if (regulators_flags & TWL_COMMON_REGULATOR_VPLL2 && !pmic_data->vpll2)
+-               pmic_data->vpll2 = &omap3_vpll2_idata;
+-}
++#endif /* CONFIG_ARCH_OMAP4 */
+-- 
+1.6.6.1
+
diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch b/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch
index 0662d514..6912aa21 100644
--- a/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch
+++ b/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch
@@ -1,4 +1,4 @@
-From 79f2013a573226d43a9d07760f81c297ba93b3c0 Mon Sep 17 00:00:00 2001
+From 1890f67c9114d6fdf7696d6fa4eef62b1d7f74c4 Mon Sep 17 00:00:00 2001
 From: Roger Monk <r-monk@ti.com>
 Date: Wed, 10 Aug 2011 16:54:34 +0200
 Subject: [PATCH 1/3] omap2-displays: Add support for ThreeFiveCorp S9700 Display
@@ -43,7 +43,7 @@ index 0f601ab..8abdf50 100644
  obj-$(CONFIG_PANEL_ACX565AKM) += panel-acx565akm.o
 diff --git a/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c
 new file mode 100644
-index 0000000..796393d
+index 0000000..c2a1a19
 --- /dev/null
 +++ b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c
 @@ -0,0 +1,118 @@
@@ -72,7 +72,7 @@ index 0000000..796393d
 +#include <linux/device.h>
 +#include <linux/err.h>
 +
-+#include <plat/display.h>
++#include <video/omapdss.h>
 +
 +static struct omap_video_timings tfc_timings = {
 +       .x_res          = 800,
diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch b/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch
index fce43004..8eea97df 100644
--- a/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch
+++ b/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch
@@ -1,4 +1,4 @@
-From 1fc2bd36acf09d22db63b59985eab1a663855581 Mon Sep 17 00:00:00 2001
+From 807d261326e06903007c95457d6934588a483be0 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Fri, 5 Aug 2011 18:07:09 +0000
 Subject: [PATCH 2/3] omap3: beagle: added lcd driver
diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch b/recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch
index a4d51f57..e362c595 100644
--- a/recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch
+++ b/recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch
@@ -1,4 +1,4 @@
-From a2fa8fa573f44d60d812779cf55e546303dcd6cb Mon Sep 17 00:00:00 2001
+From cddc76248e1bec4d8cd345c72fcb0ff7c0e22054 Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <agnel.joel@gmail.com>
 Date: Wed, 17 Aug 2011 00:28:49 -0500
 Subject: [PATCH 3/3] Make fbset show correct timing values
@@ -10,7 +10,7 @@ Cc: "Monk, Roger" <r-monk@ti.com>
  1 files changed, 7 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c
-index 796393d..9689a2c 100644
+index c2a1a19..6afd4e3 100644
 --- a/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c
 +++ b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c
 @@ -88,6 +88,12 @@ static int tfc_panel_resume(struct omap_dss_device *dssdev)