[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-279-g21cb6bf
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-279-g21cb6bf
|
From: Julien B a. A. <ar...@us...> - 2011-02-04 17:18:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 21cb6bf7af62f31deec11afbafd7a5c546e37234 (commit)
via 64b8e50d9d9982af5dbe5e442fbbf48ca73a8ce8 (commit)
from a040ebfe4a8727d12244c1acbe94ad4a6a80e93b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 21cb6bf7af62f31deec11afbafd7a5c546e37234
Merge: 64b8e50d9d9982af5dbe5e442fbbf48ca73a8ce8 a040ebfe4a8727d12244c1acbe94ad4a6a80e93b
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 4 18:17:29 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 64b8e50d9d9982af5dbe5e442fbbf48ca73a8ce8
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 4 18:17:01 2011 +0100
[LINUX] Moves APF51 to 2.6.38-rc3
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 6 +-
...-alpha.config => apf51-linux-2.6.38-rc3.config} | 0
.../armadeus/apf51/apf51-linux-2.6.38.config | 103 ++++++++---
.../kernel-patches/{2.6.38-alpha => 2.6.38-rc3} | 0
...pengutronix-1-iMX51-add_ipu_clock_support.patch | 187 --------------------
...12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch | 20 --
...2-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch | 12 +-
...-pengutronix-4-fb-export_fb_mode_fb_table.patch | 16 +-
...engutronix-6-iMX51-Add_IPU_device_support.patch | 8 +-
...-7-iMX51-Allow_to_increase_max_zone_order.patch | 2 +-
...rease_dma_consistent_size_for_IPU_support.patch | 2 +-
...x-9-iMX51-babbage_add_framebuffer_support.patch | 6 +-
.../2.6.38/400-armadeus-add_apf51_module.patch | 135 +++++++--------
.../2.6.38/401-armadeus-fix_clock_tree.patch | 31 ++--
...deus-iomux-mx51-add_USBH2_pins_definition.patch | 56 ------
...ct_some_mx5_regiter_settings_and_comments.patch | 17 +--
...-mx5-devices-add_USBH2_to_list_of_devices.patch | 134 --------------
.../408-armadeus-add_apf51-dev_baseboard.patch | 22 ++--
.../408b-armadeus-add_apf51-proto_baseboard.patch | 28 ++--
...adeus-iomux-mx51-add_I2C2_pins_definition.patch | 22 ---
...fson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch | 37 ----
..._configuration_of_IRQ_output_in_CMOS_mode.patch | 4 +-
...cknowledgement-of-WM831x-touchscreen-IRQs.patch | 2 +-
.../417-armadeus-input-wm831x-driver_hacks.patch | 10 +-
...ux-mx51-fixes_UART2_TXD_pad_configuration.patch | 15 ++
25 files changed, 228 insertions(+), 647 deletions(-)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-2.6.38-alpha.config => apf51-linux-2.6.38-rc3.config} (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.38-alpha => 2.6.38-rc3} (100%)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-iomux-mx51-add_I2C2_pins_definition.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-wolfson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/418-armadeus-iomux-mx51-fixes_UART2_TXD_pad_configuration.patch
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index ca497c7..1a1bdce 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jan 27 17:13:40 2011
+# Thu Feb 3 14:38:43 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -863,8 +863,8 @@ BR2_LINUX_KERNEL=y
# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38-alpha"
-BR2_LINUX_KERNEL_VERSION="2.6.38-alpha"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38-rc3"
+BR2_LINUX_KERNEL_VERSION="2.6.38-rc3"
BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-alpha.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-alpha.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-rc3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index c4084d2..61b5e1f 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 2.6.37-rc4 Kernel Configuration
-# Thu Jan 6 20:07:42 2011
+# Linux/arm 2.6.38-rc3 Kernel Configuration
+# Thu Feb 3 22:16:23 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -9,7 +9,6 @@ CONFIG_GENERIC_GPIO=y
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_HAVE_PROC_CPU=y
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_LOCKDEP_SUPPORT=y
@@ -17,11 +16,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_FIQ=y
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -53,7 +53,17 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
-# CONFIG_HAVE_GENERIC_HARDIRQS is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+# CONFIG_GENERIC_PENDING_IRQ is not set
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
# CONFIG_SPARSE_IRQ is not set
#
@@ -71,12 +81,14 @@ CONFIG_RCU_FANOUT=32
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+CONFIG_EXPERT=y
CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
@@ -115,6 +127,7 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
#
@@ -194,6 +207,7 @@ CONFIG_MMU=y
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_STMP3XXX is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
@@ -237,6 +251,8 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_PLAT_SPEAR is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
CONFIG_IMX_HAVE_PLATFORM_FEC=y
CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS=y
CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
@@ -266,6 +282,9 @@ CONFIG_SOC_IMX51=y
# CONFIG_MACH_EUKREA_CPUIMX51 is not set
# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
# CONFIG_MACH_MX51_EFIKAMX is not set
+# CONFIG_MACH_MX53_EVK is not set
+# CONFIG_MACH_MX53_SMD is not set
+# CONFIG_MACH_MX53_LOCO is not set
CONFIG_MACH_APF51=y
CONFIG_MACH_APF51_HAS_BASEBOARD=y
# CONFIG_MACH_APF51_DEV is not set
@@ -299,6 +318,7 @@ CONFIG_CPU_CP15_MMU=y
#
CONFIG_ARM_THUMB=y
CONFIG_ARM_THUMBEE=y
+# CONFIG_SWP_EMULATE is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -309,7 +329,6 @@ CONFIG_CPU_HAS_PMU=y
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
# CONFIG_ARM_ERRATA_743622 is not set
-CONFIG_COMMON_CLKDEV=y
#
# Bus support
@@ -340,7 +359,6 @@ CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_HIGHMEM is not set
CONFIG_HW_PERF_EVENTS=y
-# CONFIG_SPARSE_IRQ is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
@@ -348,6 +366,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y
@@ -369,6 +388,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
# CONFIG_AUTO_ZRELADDR is not set
#
@@ -410,7 +430,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_VERBOSE=y
CONFIG_CAN_PM_TRACE=y
CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
CONFIG_SUSPEND=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
@@ -503,6 +522,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
#
# Network testing
@@ -563,7 +583,6 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_LEDS is not set
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_WIMAX is not set
@@ -673,10 +692,6 @@ CONFIG_MTD_NAND_MXC=y
# LPDDR flash memory drivers
#
# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -780,6 +795,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_OSD_INITIATOR is not set
# CONFIG_ATA is not set
# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
@@ -830,7 +846,6 @@ CONFIG_NET_ETHERNET=y
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL is not set
CONFIG_FEC=y
-# CONFIG_FEC2 is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
@@ -861,8 +876,9 @@ CONFIG_RT2X00_LIB=m
CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_RT2X00_DEBUG is not set
+# CONFIG_RTL8192CE is not set
# CONFIG_WL1251 is not set
-# CONFIG_WL12XX is not set
+# CONFIG_WL12XX_MENU is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
@@ -974,6 +990,7 @@ CONFIG_TOUCHSCREEN_WM831X=m
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
# CONFIG_TOUCHSCREEN_TPS6507X is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_AD714X is not set
@@ -988,6 +1005,7 @@ CONFIG_INPUT_UINPUT=m
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_INPUT_WM831X_ON is not set
# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_CMA3000 is not set
#
# Hardware I/O ports
@@ -1029,10 +1047,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_R3964 is not set
@@ -1086,6 +1106,7 @@ CONFIG_SPI_BITBANG=y
CONFIG_SPI_IMX_VER_0_7=y
CONFIG_SPI_IMX_VER_2_3=y
CONFIG_SPI_IMX=y
+# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set
@@ -1099,6 +1120,10 @@ CONFIG_SPI_SPIDEV=m
# PPS support
#
# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
# CONFIG_GPIO_SYSFS is not set
@@ -1108,14 +1133,12 @@ CONFIG_GPIOLIB=y
#
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_VX855 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
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_WM831X is not set
@@ -1151,7 +1174,9 @@ CONFIG_WM831X_POWER=m
# CONFIG_BATTERY_BQ20Z75 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_GPIO is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1174,6 +1199,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_ASC7621 is not set
# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_F71882FG is not set
@@ -1208,6 +1234,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not set
@@ -1270,7 +1297,7 @@ CONFIG_MFD_CORE=y
# CONFIG_TPS6507X is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_TC35892 is not set
+# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC6387XB is not set
@@ -1290,6 +1317,7 @@ CONFIG_MFD_WM831X_I2C=y
# CONFIG_ABX500_CORE is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_WL1273_CORE is not set
CONFIG_MFD_IMX_IPU_V3=y
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -1313,6 +1341,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_SYS_IMAGEBLIT is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
@@ -1324,6 +1353,7 @@ CONFIG_FB_MODE_HELPERS=y
#
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_TMIO is not set
+# CONFIG_FB_UDL is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
@@ -1370,7 +1400,6 @@ CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_ARMADEUS_CLUT224=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -1404,6 +1433,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_SPI is not set
# CONFIG_SND_USB is not set
CONFIG_SND_SOC=m
+# CONFIG_SND_SOC_CACHE_LZO is not set
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_IMX_SOC=m
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -1435,6 +1465,7 @@ CONFIG_USB_HID=y
# CONFIG_HID_PRODIKEYS is not set
# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
# CONFIG_HID_EGALAX is not set
# CONFIG_HID_ELECOM is not set
# CONFIG_HID_EZKEY is not set
@@ -1449,6 +1480,7 @@ CONFIG_USB_HID=y
# CONFIG_HID_MICROSOFT is not set
# CONFIG_HID_MOSART is not set
# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not set
# CONFIG_HID_PANTHERLORD is not set
@@ -1457,6 +1489,7 @@ CONFIG_USB_HID=y
# CONFIG_HID_QUANTA is not set
# CONFIG_HID_ROCCAT is not set
# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
# CONFIG_HID_ROCCAT_PYRA is not set
# CONFIG_HID_SAMSUNG is not set
# CONFIG_HID_SONY is not set
@@ -1572,33 +1605,34 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_YUREX is not set
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_FSL_USB2=y
CONFIG_USB_FSL_USB2=y
# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
# CONFIG_USB_AUDIO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FUNCTIONFS is not set
# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_CDC_COMPOSITE=m
# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_HID is not set
+CONFIG_USB_G_HID=m
# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
#
# OTG and related infrastructure
@@ -1610,6 +1644,7 @@ CONFIG_USB_ULPI=y
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
#
# MMC/SD/SDIO Card Drivers
@@ -1629,9 +1664,11 @@ CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
# CONFIG_MMC_MXC is not set
CONFIG_MMC_SPI=m
+# CONFIG_MMC_DW is not set
# CONFIG_MMC_USHC is not set
# CONFIG_MEMSTICK is not set
# CONFIG_NEW_LEDS is not set
+# CONFIG_NFC_DEVICES is not set
# CONFIG_ACCESSIBILITY is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
@@ -1645,7 +1682,6 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_RTC_DRV_TEST is not set
#
@@ -1707,6 +1743,7 @@ CONFIG_RTC_DRV_WM831X=m
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
+CONFIG_CLKDEV_LOOKUP=y
#
# File systems
@@ -1728,12 +1765,11 @@ CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
@@ -1903,7 +1939,6 @@ CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
-# CONFIG_DLM is not set
#
# Kernel hacking
@@ -1927,13 +1962,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_LKDTM is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_RING_BUFFER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
@@ -2049,6 +2087,8 @@ CONFIG_CRYPTO_LZO=y
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
# CONFIG_CRYPTO_HW is not set
# CONFIG_BINARY_PRINTF is not set
@@ -2069,7 +2109,10 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+# CONFIG_XZ_DEC is not set
+# CONFIG_XZ_DEC_BCJ is not set
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
+CONFIG_AVERAGE=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-alpha b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-alpha
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch
deleted file mode 100644
index 4b1856b..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Signed-off-by: Sascha Hauer <s....@pe...>
----
- arch/arm/mach-mx5/clock-mx51-mx53.c | 140 +++++++++++++++++++++++++++++++++++
- 1 files changed, 140 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
-index 9fc65bb..f550d02 100644
---- a/arch/arm/mach-mx5/clock-mx51-mx53.c
-+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
-@@ -39,6 +39,9 @@ static struct clk periph_apm_clk;
- static struct clk ahb_clk;
- static struct clk ipg_clk;
- static struct clk usboh3_clk;
-+static struct clk emi_fast_clk;
-+static struct clk ipu_clk;
-+static struct clk mipi_hsc1_clk;
-
- #define MAX_DPLL_WAIT_TRIES 1000 /* 1000 * udelay(1) = 1ms */
-
-@@ -688,6 +691,19 @@ static unsigned long clk_emi_slow_get_rate(struct clk *clk)
- return clk_get_rate(clk->parent) / div;
- }
-
-+static unsigned long _clk_ddr_hf_get_rate(struct clk *clk)
-+{
-+ unsigned long rate;
-+ u32 reg, div;
-+
-+ reg = __raw_readl(MXC_CCM_CBCDR);
-+ div = ((reg & MXC_CCM_CBCDR_DDR_PODF_MASK) >>
-+ MXC_CCM_CBCDR_DDR_PODF_OFFSET) + 1;
-+ rate = clk_get_rate(clk->parent) / div;
-+
-+ return rate;
-+}
-+
- /* External high frequency clock */
- static struct clk ckih_clk = {
- .get_rate = get_high_reference_clock_rate,
-@@ -846,6 +862,109 @@ static struct clk emi_slow_clk = {
- .get_rate = clk_emi_slow_get_rate,
- };
-
-+static int clk_ipu_enable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_enable(clk);
-+
-+ /* Enable handshake with IPU when certain clock rates are changed */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg &= ~MXC_CCM_CCDR_IPU_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ /* Enable handshake with IPU when LPM is entered */
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg &= ~MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+
-+ return 0;
-+}
-+
-+static void clk_ipu_disable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_disable(clk);
-+
-+ /* Disable handshake with IPU whe dividers are changed */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg |= MXC_CCM_CCDR_IPU_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ /* Disable handshake with IPU when LPM is entered */
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg |= MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+}
-+
-+static struct clk ahbmux1_clk = {
-+ .parent = &ahb_clk,
-+ .secondary = &ahb_max_clk,
-+ .enable_reg = MXC_CCM_CCGR0,
-+ .enable_shift = MXC_CCM_CCGRx_CG8_OFFSET,
-+ .enable = _clk_ccgr_enable,
-+ .disable = _clk_ccgr_disable_inwait,
-+};
-+
-+static struct clk ipu_sec_clk = {
-+ .parent = &emi_fast_clk,
-+ .secondary = &ahbmux1_clk,
-+};
-+
-+static struct clk ddr_hf_clk = {
-+ .parent = &pll1_sw_clk,
-+ .get_rate = _clk_ddr_hf_get_rate,
-+};
-+
-+static struct clk ddr_clk = {
-+ .parent = &ddr_hf_clk,
-+};
-+
-+/* clock definitions for MIPI HSC unit which has been removed
-+ * from documentation, but not from hardware
-+ */
-+static int _clk_hsc_enable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_enable(clk);
-+ /* Handshake with IPU when certain clock rates are changed. */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg &= ~MXC_CCM_CCDR_HSC_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg &= ~MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+
-+ return 0;
-+}
-+
-+static void _clk_hsc_disable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_disable(clk);
-+ /* No handshake with HSC as its not enabled. */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg |= MXC_CCM_CCDR_HSC_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg |= MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+}
-+
-+static struct clk mipi_hsp_clk = {
-+ .parent = &ipu_clk,
-+ .enable_reg = MXC_CCM_CCGR4,
-+ .enable_shift = MXC_CCM_CCGRx_CG6_OFFSET,
-+ .enable = _clk_hsc_enable,
-+ .disable = _clk_hsc_disable,
-+ .secondary = &mipi_hsc1_clk,
-+};
-+
- #define DEFINE_CLOCK_CCGR(name, i, er, es, pfx, p, s) \
- static struct clk name = { \
- .id = i, \
-@@ -1077,6 +1196,23 @@ DEFINE_CLOCK_FULL(esdhc2_ipg_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG2_OFFSET,
- DEFINE_CLOCK_MAX(esdhc2_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG3_OFFSET,
- clk_esdhc2, &pll2_sw_clk, &esdhc2_ipg_clk);
-
-+DEFINE_CLOCK(mipi_esc_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG5_OFFSET, NULL, NULL, NULL, &pll2_sw_clk);
-+DEFINE_CLOCK(mipi_hsc2_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG4_OFFSET, NULL, NULL, &mipi_esc_clk, &pll2_sw_clk);
-+DEFINE_CLOCK(mipi_hsc1_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG3_OFFSET, NULL, NULL, &mipi_hsc2_clk, &pll2_sw_clk);
-+
-+/* IPU */
-+DEFINE_CLOCK_FULL(ipu_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG5_OFFSET,
-+ NULL, NULL, clk_ipu_enable, clk_ipu_disable, &ahb_clk, &ipu_sec_clk);
-+
-+DEFINE_CLOCK_FULL(emi_fast_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG7_OFFSET,
-+ NULL, NULL, _clk_ccgr_enable, _clk_ccgr_disable_inwait,
-+ &ddr_clk, NULL);
-+
-+DEFINE_CLOCK(ipu_di0_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG5_OFFSET,
-+ NULL, NULL, &pll3_sw_clk, NULL);
-+DEFINE_CLOCK(ipu_di1_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG6_OFFSET,
-+ NULL, NULL, &pll3_sw_clk, NULL);
-+
- #define _REGISTER_CLOCK(d, n, c) \
- { \
- .dev_id = d, \
-@@ -1117,6 +1253,10 @@ static struct clk_lookup mx51_lookups[] = {
- _REGISTER_CLOCK(NULL, "iim_clk", iim_clk)
- _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk)
- _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk)
-+ _REGISTER_CLOCK(NULL, "mipi_hsp", mipi_hsp_clk)
-+ _REGISTER_CLOCK("imx-ipuv3", NULL, ipu_clk)
-+ _REGISTER_CLOCK("imx-ipuv3", "di0", ipu_di0_clk)
-+ _REGISTER_CLOCK("imx-ipuv3", "di1", ipu_di1_clk)
- };
-
- static struct clk_lookup mx53_lookups[] = {
---
-1.7.2.3
-
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch
deleted file mode 100644
index f7e6edb..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Signed-off-by: Sascha Hauer <s....@pe...>
----
- arch/arm/plat-mxc/include/mach/mx51.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
-index fa3a2a5..873807f 100644
---- a/arch/arm/plat-mxc/include/mach/mx51.h
-+++ b/arch/arm/plat-mxc/include/mach/mx51.h
-@@ -251,8 +251,8 @@
- #define MX51_MXC_INT_IOMUX 7
- #define MX51_INT_NFC 8
- #define MX51_MXC_INT_VPU 9
--#define MX51_MXC_INT_IPU_ERR 10
--#define MX51_MXC_INT_IPU_SYN 11
-+#define MX51_INT_IPU_ERR 10
-+#define MX51_INT_IPU_SYN 11
- #define MX51_MXC_INT_GPU 12
- #define MX51_MXC_INT_RESV13 13
- #define MX51_MXC_INT_USB_H1 14
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch
index 68429d6..49bcd3d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch
@@ -111,9 +111,9 @@ diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 3a1493b..3c81879 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
-@@ -606,6 +606,13 @@ config MFD_VX855
- VIA VX855/VX875 south bridge. You will need to enable the vx855_spi
- and/or vx855_gpio drivers for this to do anything useful.
+@@ -624,6 +624,13 @@ config MFD_VX855
+ driver connects the radio-wl1273 V4L2 module and the wl1273
+ audio codec.
+config MFD_IMX_IPU_V3
+ tristate "Support the Image Processing Unit (IPU) found on the i.MX51"
@@ -129,10 +129,10 @@ diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index f54b365..7873b13 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
-@@ -81,3 +81,4 @@ obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
- obj-$(CONFIG_MFD_JZ4740_ADC) += jz4740-adc.o
- obj-$(CONFIG_MFD_TPS6586X) += tps6586x.o
+@@ -83,3 +83,4 @@ obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
obj-$(CONFIG_MFD_VX855) += vx855.o
+ obj-$(CONFIG_MFD_WL1273_CORE) += wl1273-core.o
+ obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.o
+obj-$(CONFIG_MFD_IMX_IPU_V3) += imx-ipu-v3/
diff --git a/drivers/mfd/imx-ipu-v3/Makefile b/drivers/mfd/imx-ipu-v3/Makefile
new file mode 100644
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch
index 449243c..fc64be1 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch
@@ -17,11 +17,11 @@ index 0a4dbdc..82122a9 100644
-static const struct fb_videomode modedb[] = {
+const struct fb_videomode modedb[] = {
- {
+
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
- NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2,
-@@ -277,6 +277,11 @@ static const struct fb_videomode modedb[] = {
- },
+ { NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, 0,
+@@ -291,6 +291,11 @@ static const struct fb_videomode modedb[] = {
+ 0, FB_VMODE_NONINTERLACED },
};
+const struct fb_videomode *fb_modes = modedb;
@@ -30,15 +30,15 @@ index 0a4dbdc..82122a9 100644
+EXPORT_SYMBOL(num_fb_modes);
+
#ifdef CONFIG_FB_MODE_HELPERS
- const struct fb_videomode vesa_modes[] = {
- /* 0 640x350-85 VESA */
+ const struct fb_videomode cea_modes[64] = {
+ /* #1: 640x480p@59.94/60Hz */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d1631d3..e006172 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
-@@ -1151,6 +1151,9 @@ struct fb_videomode {
- extern const char *fb_mode_option;
+@@ -1154,6 +1154,9 @@ struct fb_videomode {
extern const struct fb_videomode vesa_modes[];
+ extern const struct fb_videomode cea_modes[64];
+extern const struct fb_videomode *fb_modes;
+extern const int num_fb_modes;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch
index 59251fb..9985a4a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch
@@ -12,10 +12,10 @@ diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51
index 6302e46..851c114 100644
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-mx5/devices-imx51.h
-@@ -47,3 +47,7 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
- extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data[] __initconst;
- #define imx51_add_imx2_wdt(id, pdata) \
- imx_add_imx2_wdt(&imx51_imx2_wdt_data[id])
+@@ -55,3 +55,7 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
+ extern const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst;
+ #define imx51_add_imx_keypad(pdata) \
+ imx_add_imx_keypad(&imx51_imx_keypad_data, pdata)
+
+extern const struct imx_ipuv3_data imx51_ipuv3_data __initconst;
+#define imx51_add_ipuv3(pdata) \
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch
index 6b36b41..c7a946c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch
@@ -12,7 +12,7 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db524e7..b3e070e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1410,8 +1410,8 @@ config SPARSE_IRQ
+@@ -1451,8 +1451,8 @@ config SPARSE_IRQ
source "mm/Kconfig"
config FORCE_MAX_ZONEORDER
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch
index 94115e7..18d74ba 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch
@@ -7,7 +7,7 @@ diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include
index 9a9a000..987b42a 100644
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
-@@ -40,7 +40,8 @@
+@@ -43,7 +43,8 @@
# endif
#endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch
index 93f438e..9f715c9 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch
@@ -8,7 +8,7 @@ diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 5011f42..2a936b7 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
-@@ -22,6 +22,7 @@ config MACH_MX51_BABBAGE
+@@ -42,6 +42,7 @@ config MACH_MX51_BABBAGE
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
select IMX_HAVE_PLATFORM_SPI_IMX
@@ -36,8 +36,8 @@ index 368a315..6c1576c 100644
#include <asm/setup.h>
@@ -158,6 +160,41 @@ static iomux_v3_cfg_t mx51babbage_pads[] = {
MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK,
- MX51_PAD_CSPI1_SS0__GPIO_4_24,
- MX51_PAD_CSPI1_SS1__GPIO_4_25,
+ MX51_PAD_CSPI1_SS0__GPIO4_24,
+ MX51_PAD_CSPI1_SS1__GPIO4_25,
+
+ /* Display */
+ MX51_PAD_DISPB2_SER_DIN__GPIO_3_5,
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index df005d8..1b5bde5 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,10 +1,10 @@
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-21 09:27:13.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-21 09:58:04.000000000 +0100
-@@ -101,4 +101,17 @@
- Include support for Genesi Efika MX nettop. This includes specific
- configurations for the board and its peripherals.
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-03 17:17:35.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-02-04 09:33:17.000000000 +0100
+@@ -162,4 +162,17 @@
+ Include support for MX50 reference design platform (RDP) board. This
+ includes specific configurations for the board and its peripherals.
+config MACH_APF51
+ bool "Support Armadeus APF51"
@@ -20,23 +20,23 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
+ includes specific configurations for the board and its peripherals.
+
endif
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-21 09:58:04.000000000 +0100
-@@ -6,6 +6,7 @@
- obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-02-04 09:33:17.000000000 +0100
+@@ -7,6 +7,7 @@
+ obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
+obj-$(CONFIG_MACH_APF51) += board-apf51.o
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
- obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-21 09:43:53.000000000 +0100
-@@ -0,0 +1,423 @@
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c 2011-02-04 09:23:58.000000000 +0100
+@@ -0,0 +1,418 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems
@@ -121,55 +121,46 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ MX51_PAD_EIM_D23__USBH2_DATA7,
+
+ /* FEC */
-+ MX51_PAD_EIM_EB2__FEC_MDIO,
-+ MX51_PAD_EIM_EB3__FEC_RDAT1,
-+ MX51_PAD_EIM_CS2__FEC_RDAT2,
-+ MX51_PAD_EIM_CS3__FEC_RDAT3,
-+ MX51_PAD_EIM_CS4__FEC_RX_ER,
-+ MX51_PAD_EIM_CS5__FEC_CRS,
-+ MX51_PAD_NANDF_RB2__FEC_COL,
-+ MX51_PAD_NANDF_RB3__FEC_RXCLK,
-+ MX51_PAD_NANDF_RB6__FEC_RDAT0,
-+ MX51_PAD_NANDF_RB7__FEC_TDAT0,
-+ MX51_PAD_NANDF_CS2__FEC_TX_ER,
-+ MX51_PAD_NANDF_CS3__FEC_MDC,
-+ MX51_PAD_NANDF_CS4__FEC_TDAT1,
-+ MX51_PAD_NANDF_CS5__FEC_TDAT2,
-+ MX51_PAD_NANDF_CS6__FEC_TDAT3,
-+ MX51_PAD_NANDF_CS7__FEC_TX_EN,
-+ MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK,
++ MX51_PAD_DI_GP3__FEC_TX_ER,
++ MX51_PAD_DI2_PIN4__FEC_CRS,
++ MX51_PAD_DI2_PIN2__FEC_MDC,
++ MX51_PAD_DI2_PIN3__FEC_MDIO,
++ MX51_PAD_DI2_DISP_CLK__FEC_RDATA1,
++ MX51_PAD_DI_GP4__FEC_RDATA2,
++ MX51_PAD_DISP2_DAT0__FEC_RDATA3,
++ MX51_PAD_DISP2_DAT1__FEC_RX_ER,
++ MX51_PAD_DISP2_DAT6__FEC_TDATA1,
++ MX51_PAD_DISP2_DAT7__FEC_TDATA2,
++ MX51_PAD_DISP2_DAT8__FEC_TDATA3,
++ MX51_PAD_DISP2_DAT9__FEC_TX_EN,
++ MX51_PAD_DISP2_DAT10__FEC_COL,
++ MX51_PAD_DISP2_DAT11__FEC_RX_CLK,
++ MX51_PAD_DISP2_DAT12__FEC_RX_DV,
++ MX51_PAD_DISP2_DAT13__FEC_TX_CLK,
++ MX51_PAD_DISP2_DAT14__FEC_RDATA0,
++ MX51_PAD_DISP2_DAT15__FEC_TDATA0,
+
+ /* FEC PHY reset line */
-+ MX51_PAD_DI1_PIN11__GPIO_3_0,
++ MX51_PAD_DI1_PIN11__GPIO3_0,
+
+ /* I2C2 */
+ MX51_PAD_EIM_D24__I2C2_SDA,
+ MX51_PAD_EIM_D27__I2C2_SCL,
+
+ /* WM8311 IRQ */
-+ MX51_PAD_GPIO_1_7__GPIO_1_7,
++ MX51_PAD_GPIO1_7__GPIO1_7,
+ /* WM8311 TOUCH_DETECT */
-+ MX51_PAD_GPIO_1_4__GPIO_1_4,
++ MX51_PAD_GPIO1_4__GPIO1_4,
+ /* WM8311 TOUCH_EOC */
-+ MX51_PAD_GPIO_1_6__GPIO_1_6,
++ MX51_PAD_GPIO1_6__GPIO1_6,
+};
+
++
+/* Serial ports */
-+#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
+static struct imxuart_platform_data uart_pdata = {
-+// .flags = IMXUART_HAVE_RTSCTS,
++ .flags = 0, /*IMXUART_HAVE_RTSCTS,*/
+};
+
-+static inline void apf51_init_imx_uart(void)
-+{
-+ imx51_add_imx_uart(1, &uart_pdata);
-+}
-+#else /* !SERIAL_IMX */
-+static inline void apf51_init_imx_uart(void)
-+{
-+}
-+#endif /* SERIAL_IMX */
-+
+
+/* APF51 has a 512MB+ 3,3V Micron NAND flash, 8 bits width */
+static const struct mxc_nand_platform_data apf51_nand_board_info __initconst = {
@@ -232,17 +223,17 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+
+static int apf51_usbh1_usbh2_active(void)
+{
-+ iomux_v3_cfg_t phyreset_gpio = MX51_PAD_DI1_PIN12__GPIO_3_1;
++ iomux_v3_cfg_t phyreset_gpio = MX51_PAD_DI1_PIN12__GPIO3_1;
+ int ret;
+#if 0
-+ iomux_v3_cfg_t usbh1stp_gpio = MX51_PAD_USBH1_STP__GPIO_1_27;
++ iomux_v3_cfg_t usbh1stp_gpio = MX51_PAD_USBH1_STP__GPIO1_27;
+
+ /* Set USBH1_STP to GPIO and toggle it */
+ mxc_iomux_v3_setup_pad(&usbh1stp_gpio);
+ ret = gpio_request(APF51_USBH1_STP, "usbh1_stp");
+
+ if (ret) {
-+ pr_debug("failed to get MX51_PAD_USBH1_STP__GPIO_1_27: %d\n", ret);
++ pr_debug("failed to get MX51_PAD_USBH1_STP__GPIO1_27: %d\n", ret);
+ return ret;
+ }
+ gpio_direction_output(APF51_USBH1_STP, 0);
@@ -252,11 +243,11 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+#endif
+
+ /* De-assert USB PHY RESETB */
-+ mxc_iomux_v3_setup_pad(&phyreset_gpio);
++ mxc_iomux_v3_setup_pad(phyreset_gpio);
+ ret = gpio_request(APF51_USB_HOST_PHY_RESET, "phy_reset");
+
+ if (ret) {
-+ pr_debug("failed to get MX51_PAD_DI1_PIN12__GPIO_3_1: %d\n", ret);
++ pr_debug("failed to get MX51_PAD_DI1_PIN12__GPIO3_1: %d\n", ret);
+ return ret;
+ }
+ gpio_direction_output(APF51_USB_HOST_PHY_RESET, 1);
@@ -290,6 +281,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ __raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+ iounmap(usb_base);
+
++ printk("--- initialize_otg_port\n");
+ return 0;
+}
+
@@ -321,7 +313,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+
+#if 0
+/* Done in U-Boot, kept here just in case... ;-) */
-+#define APF51_FEC_PHY_RESET (2*32+0) /* GPIO_3_0 */
++#define APF51_FEC_PHY_RESET (2*32+0) /* GPIO3_0 */
+static inline void apf51_fec_reset(void)
+{
+ int ret;
@@ -344,9 +336,9 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ .bitrate = 400000,
+};
+
-+#define APF51_WM8311_IRQ_GPIO (0*32 + 7) /* GPIO_1_7 */
-+#define APF51_WM8311_TOUCH_DETECT_GPIO (0*32 + 4) /* GPIO_1_4 */
-+#define APF51_WM8311_TOUCH_EOC_GPIO (0*32 + 6) /* GPIO_1_6 */
++#define APF51_WM8311_IRQ_GPIO (0*32 + 7) /* GPIO1_7 */
++#define APF51_WM8311_TOUCH_DETECT_GPIO (0*32 + 4) /* GPIO1_4 */
++#define APF51_WM8311_TOUCH_EOC_GPIO (0*32 + 6) /* GPIO1_6 */
+
+static int apf51_wm8311_pre_init(struct wm831x *wm831x)
+{
@@ -417,7 +409,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ mxc_iomux_v3_setup_multiple_pads(apf51_pads,
+ ARRAY_SIZE(apf51_pads));
+
-+ apf51_init_imx_uart();
++ imx51_add_imx_uart(1, &uart_pdata);
+
+ imx51_add_imx_i2c(1, &apf51_i2c_data);
+ i2c_register_board_info(1, apf51_i2c1_devices, ARRAY_SIZE(apf51_i2c1_devices));
@@ -430,12 +422,15 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ apf51_usbh1_usbh2_active();
+ mxc_register_device(&mxc_usbh1_device, &usbh1_config);
+ mxc_register_device(&mxc_usbh2_device, &usbh2_config);
++#if 0
++ /* Currently system boot freezes when OTG is activated :-( */
+ if (otg_mode_host)
+ mxc_register_device(&mxc_usbdr_host_device, &apf51_usbdr_host_config);
+ else {
+ initialize_otg_port(NULL);
+ mxc_register_device(&mxc_usbdr_udc_device, &apf51_usbdr_device_pdata);
+ }
++#endif
+
+#ifdef CONFIG_MACH_APF51_HAS_BASEBOARD
+ apf51_baseboard_init();
@@ -460,21 +455,21 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ .timer = &apf51_timer,
+MACHINE_END
+
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-21 09:27:13.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-03 17:17:35.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
#define MX51_UART1_BASE_ADDR 0x73fbc000
+#define MX51_UART2_BASE_ADDR 0x73fc0000
+ #define MX50_UART1_BASE_ADDR 0x53fbc000
+ #define MX53_UART1_BASE_ADDR 0x53fbc000
- static __inline__ void __arch_decomp_setup(unsigned long arch_id)
- {
-@@ -102,6 +103,9 @@
- case MACH_TYPE_EUKREA_CPUIMX51SD:
- uart_base = MX51_UART1_BASE_ADDR;
+@@ -110,6 +111,9 @@
+ case MACH_TYPE_MX53_EVK:
+ uart_base = MX53_UART1_BASE_ADDR;
break;
+ case MACH_TYPE_APF51:
+ uart_base = MX51_UART2_BASE_ADDR;
@@ -482,11 +477,11 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
default:
break;
}
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-21 09:27:13.000000000 +0100
-@@ -47,6 +47,8 @@
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-03 17:17:35.000000000 +0100
+@@ -51,6 +51,8 @@
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
#define MXC_BOARD_IRQS 80
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch
index e3f2636..81abdcf 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch
@@ -5,11 +5,11 @@ Patch has to be reworked to dynamically do that switch.
Signed-off-by: Nicolas Colombain <nic...@ar...>
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/clock-mx51-mx53.c
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:34:04.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:35:10.000000000 +0100
-@@ -1322,7 +1322,7 @@
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-02-03 17:38:54.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-02-03 17:39:05.000000000 +0100
+@@ -1399,7 +1399,7 @@
clk_set_rate(&esdhc2_clk, 166250000);
/* System timer */
@@ -18,10 +18,10 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c
MX51_MXC_INT_GPT);
return 0;
}
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/time.c
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/time.c
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/time.c 2010-12-29 10:33:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/time.c 2010-12-29 10:35:10.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/time.c 2011-02-03 17:38:54.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/time.c 2011-02-03 17:39:06.000000000 +0100
@@ -56,6 +56,7 @@
/* MX31, MX35, MX25, MXC91231, MX5 */
#define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
@@ -30,25 +30,16 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/time.c
#define V2_TCTL_FRR (1 << 9)
#define V2_IR 0x0c
#define V2_TSTAT 0x08
-@@ -120,7 +121,7 @@
- .rating = 200,
- .read = mx1_2_get_cycles,
- .mask = CLOCKSOURCE_MASK(32),
-- .shift = 20,
-+ .shift = 10, /* kHz */
- .flags = CLOCK_SOURCE_IS_CONTINUOUS,
- };
+@@ -132,6 +133,8 @@
-@@ -135,6 +136,8 @@
- clocksource_mxc.shift);
- clocksource_register(&clocksource_mxc);
+ clocksource_register_hz(&clocksource_mxc, c);
+ printk("___%s %dkHz mult=%d\n", __func__, c, clocksource_mxc.mult);
+
return 0;
}
-@@ -285,6 +288,7 @@
+@@ -282,6 +285,7 @@
clockevent_mxc.min_delta_ns =
clockevent_delta2ns(0xff, &clockevent_mxc);
@@ -56,7 +47,7 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/time.c
clockevent_mxc.cpumask = cpumask_of(0);
clockevents_register_device(&clockevent_mxc);
-@@ -308,7 +312,8 @@
+@@ -305,7 +309,8 @@
__raw_writel(0, timer_base + MXC_TPRER); /* see datasheet note */
if (timer_is_v2())
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
deleted file mode 100644
index bb78777..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Declare USBH2 pins in IOMUX.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/iomux-mx51.h
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/iomux-mx51.h 2010-12-29 10:33:52.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/iomux-mx51.h 2010-12-29 10:35:31.000000000 +0100
-@@ -45,6 +45,7 @@
- #define MX51_USBH1_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \
- PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \
- PAD_CTL_PKE | PAD_CTL_HYS)
-+#define MX51_USBH2_PAD_CTRL MX51_USBH1_PAD_CTRL
- #define MX51_GPIO_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | \
- PAD_CTL_SRE_FAST)
- #define MX51_GPIO_PAD_CTRL_2 (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \
-@@ -86,17 +87,25 @@
- #define MX51_PAD_EIM_DA14__EIM_DA14 IOMUX_PAD(0x7bc, 0x054, 0, 0x0, 0, NO_PAD_CTRL)
- #define MX51_PAD_EIM_DA15__EIM_DA15 IOMUX_PAD(0x7bc, 0x058, 0, 0x0, 0, NO_PAD_CTRL)
- #define MX51_PAD_EIM_D16__GPIO_2_0 IOMUX_PAD(0x3f0, 0x05c, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_D16__USBH2_DATA0 IOMUX_PAD(0x3f0, 0x05c, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D16__I2C1_SDA IOMUX_PAD(0x3f0, 0x05c, (4 | IOMUX_CONFIG_SION), \
- 0x09b4, 0, MX51_I2C_PAD_CTRL)
- #define MX51_PAD_EIM_D17__GPIO_2_1 IOMUX_PAD(0x3f4, 0x060, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_D17__USBH2_DATA1 IOMUX_PAD(0x3f4, 0x060, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D18__GPIO_2_2 IOMUX_PAD(0x3f8, 0x064, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_D18__USBH2_DATA2 IOMUX_PAD(0x3f8, 0x064, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D19__GPIO_2_3 IOMUX_PAD(0x3fc, 0x068, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_D19__USBH2_DATA3 IOMUX_PAD(0x3fc, 0x068, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D19__I2C1_SCL IOMUX_PAD(0x3fc, 0x068, (4 | IOMUX_CONFIG_SION), \
- 0x09b0, 0, MX51_I2C_PAD_CTRL)
- #define MX51_PAD_EIM_D20__GPIO_2_4 IOMUX_PAD(0x400, 0x06c, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_D20__USBH2_DATA4 IOMUX_PAD(0x400, 0x06c, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D21__GPIO_2_5 IOMUX_PAD(0x404, 0x070, 1, 0x0, 0, MX51_GPIO_PAD_CTRL)
-+#define MX51_PAD_EIM_D21__USBH2_DATA5 IOMUX_PAD(0x404, 0x070, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D22__GPIO_2_6 IOMUX_PAD(0x408, 0x074, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_D22__USBH2_DATA6 IOMUX_PAD(0x408, 0x074, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D23__GPIO_2_7 IOMUX_PAD(0x40c, 0x078, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_D23__USBH2_DATA7 IOMUX_PAD(0x40c, 0x078, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_D24__UART3_CTS IOMUX_PAD(0x410, 0x07c, 3, 0x0, 0, MX51_UART3_PAD_CTRL)
- #define MX51_PAD_EIM_D25__UART3_RXD IOMUX_PAD(0x414, 0x080, 3, 0x9f4, 0, MX51_UART3_PAD_CTRL)
- #define MX51_PAD_EIM_D25__UART2_CTS IOMUX_PAD(0x414, 0x080, 4, 0x0, 0, MX51_UART2_PAD_CTRL)
-@@ -116,9 +125,13 @@
- #define MX51_PAD_EIM_A22__GPIO_2_16 IOMUX_PAD(0x448, 0x0b4, 1, 0x0, 0, NO_PAD_CTRL)
- #define MX51_PAD_EIM_A23__GPIO_2_17 IOMUX_PAD(0x44c, 0x0b8, 1, 0x0, 0, NO_PAD_CTRL)
- #define MX51_PAD_EIM_A24__GPIO_2_18 IOMUX_PAD(0x450, 0x0bc, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_A24__USBH2_CLK IOMUX_PAD(0x450, 0x0bc, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_A25__GPIO_2_19 IOMUX_PAD(0x454, 0x0c0, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_A25__USBH2_DIR IOMUX_PAD(0x454, 0x0c0, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_A26__GPIO_2_20 IOMUX_PAD(0x458, 0x0c4, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_A26__USBH2_STP IOMUX_PAD(0x458, 0x0c4, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_A27__GPIO_2_21 IOMUX_PAD(0x45c, 0x0c8, 1, 0x0, 0, NO_PAD_CTRL)
-+#define MX51_PAD_EIM_A27__USBH2_NXT IOMUX_PAD(0x45c, 0x0c8, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
- #define MX51_PAD_EIM_EB0__EIM_EB0 IOMUX_PAD(0x460, 0x0cc, 0, 0x0, 0, NO_PAD_CTRL)
- #define MX51_PAD_EIM_EB1__EIM_EB1 IOMUX_PAD(0x464, 0x0d0, 0, 0x0, 0, NO_PAD_CTRL)
- #define MX51_PAD_EIM_EB2__GPIO_2_22 IOMUX_PAD(0x468, 0x0d4, 1, 0x0, 0, NO_PAD_CTRL)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
index e0df8fd..dd30443 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
@@ -5,19 +5,12 @@ Strange that with or without this changes HOST1 seems to work the same way...
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/ehci.c
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/ehci.c
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/ehci.c 2010-12-29 10:33:52.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/ehci.c 2010-12-29 10:35:35.000000000 +0100
-@@ -296,14 +296,14 @@
- /*Host ULPI */
- v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
- if (flags & MXC_EHCI_WAKEUP_ENABLED)
-- v &= ~(MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr disable */
-+ v |= (MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr enabled */
- else
-- v &= ~(MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr disable */
-+ v &= ~(MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr disabled */
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/ehci.c 2011-02-03 17:38:54.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/ehci.c 2011-02-03 17:39:20.000000000 +0100
+@@ -320,9 +320,9 @@
+ }
if (flags & MXC_EHCI_POWER_PINS_ENABLED)
- v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask used*/
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
deleted file mode 100644
index af1f7d1..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Add USBH2 in the list of MX5 devices.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/devices.c
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/devices.c 2010-12-29 10:33:52.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/devices.c 2010-12-29 10:35:40.000000000 +0100
-@@ -97,6 +97,29 @@
- },
- };
-
-+static struct resource usbh2_resources[] = {
-+ {
-+ .start = MX51_OTG_BASE_ADDR + 0x400,
-+ .end = MX51_OTG_BASE_ADDR + 0x400 + 0x1ff,
-+ .flags = IORESOURCE_MEM,
-+ },
-+ {
-+ .start = MX51_MXC_INT_USB_H2,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+};
-+
-+struct platform_device mxc_usbh2_device = {
-+ .name = "mxc-ehci",
-+ .id = 2,
-+ .num_resources = ARRAY_SIZE(usbh2_resources),
-+ .resource = usbh2_resources,
-+ .dev = {
-+ .dma_mask = &usb_dma_mask,
-+ .coherent_dma_mask = DMA_BIT_MASK(32),
-+ },
-+};
-+
- static struct resource mxc_kpp_resources[] = {
- {
- .start = MX51_MXC_INT_KPP,
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/devices.h
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/devices.h 2010-12-29 10:33:51.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/devices.h 2010-12-29 10:35:40.000000000 +0100
-@@ -1,5 +1,6 @@
- extern struct platform_device mxc_usbdr_host_device;
- extern struct platform_device mxc_usbh1_device;
-+extern struct platform_device mxc_usbh2_device;
- extern struct platform_device mxc_usbdr_udc_device;
- extern struct platform_device mxc_hsi2c_device;
- extern struct platform_device mxc_keypad_device;
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:35:10.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:35:40.000000000 +0100
-@@ -1233,6 +1233,8 @@
- _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", ahb_clk)
- _REGISTER_CLOCK("mxc-ehci.1", "usb", usboh3_clk)
- _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", ahb_clk)
-+ _REGISTER_CLOCK("mxc-ehci.2", "usb", usboh3_clk)
-+ _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", ahb_clk)
- _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
- _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
- _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/ehci.c
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/ehci.c 2010-12-29 10:35:35.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/ehci.c 2010-12-29 10:35:40.000000000 +0100
-@@ -49,6 +49,7 @@
-
- #define MXC_OTG_OFFSET 0
- #define MXC_H1_OFFSET 0x200
-+#define MXC_H2_OFFSET 0x400
-
- /* USB_CTRL */
- #define MXC_OTG_UCTRL_OWIE_BIT (1 << 27) /* OTG wakeup intr enable */
-@@ -57,6 +58,10 @@
- #define MXC_H1_UCTRL_H1WIE_BIT (1 << 11) /* HOST1 wakeup intr enable */
- #define MXC_H1_UCTRL_H1...
[truncated message content] |
