From: Linus Torvalds Date: Fri, 18 Mar 2011 02:08:06 +0000 (-0700) Subject: Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: v3.0~1544 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=411f5c7a502769ccc0377c5ba36cb0b283847ba8;p=platform%2Fkernel%2Flinux-amlogic.git Merge branch 'devel-stable' of /home/rmk/linux-2.6-arm * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits) davinci: DM644x EVM: register MUSB device earlier davinci: add spi devices on tnetv107x evm davinci: add ssp config for tnetv107x evm board davinci: add tnetv107x ssp platform device spi: add ti-ssp spi master driver mfd: add driver for sequencer serial port ARM: EXYNOS4: Implement Clock gating for System MMU ARM: EXYNOS4: Enhancement of System MMU driver ARM: EXYNOS4: Add support for gpio interrupts ARM: S5P: Add function to register gpio interrupt bank data ARM: S5P: Cleanup S5P gpio interrupt code ARM: EXYNOS4: Add missing GPYx banks ARM: S3C64XX: Fix section mismatch from cpufreq init ARM: EXYNOS4: Add keypad device to the SMDKV310 ARM: EXYNOS4: Update clocks for keypad ARM: EXYNOS4: Update keypad base address ARM: EXYNOS4: Add keypad device helpers ARM: EXYNOS4: Add support for SATA on ARMLEX4210 plat-nomadik: make GPIO interrupts work with cpuidle ApSleep mach-u300: define a dummy filter function for coh901318 ... Fix up various conflicts in - arch/arm/mach-exynos4/cpufreq.c - arch/arm/mach-mxs/gpio.c - drivers/net/Kconfig - drivers/tty/serial/Kconfig - drivers/tty/serial/Makefile - drivers/usb/gadget/fsl_mxc_udc.c - drivers/video/Kconfig --- 411f5c7a502769ccc0377c5ba36cb0b283847ba8 diff --cc arch/arm/mach-exynos4/cpufreq.c index 7c08ad7,a16ac35..a1bd258 --- a/arch/arm/mach-exynos4/cpufreq.c +++ b/arch/arm/mach-exynos4/cpufreq.c @@@ -458,7 -452,8 +452,7 @@@ static int exynos4_target(struct cpufre } #ifdef CONFIG_PM - static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy) -static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy, - pm_message_t pmsg) ++static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy) { return 0; } diff --cc arch/arm/mach-mxs/gpio.c index 61991e4,5120ab5..56fa2ed --- a/arch/arm/mach-mxs/gpio.c +++ b/arch/arm/mach-mxs/gpio.c @@@ -182,11 -182,12 +182,12 @@@ static int mxs_gpio_set_wake_irq(struc } static struct irq_chip gpio_irq_chip = { + .name = "mxs gpio", - .ack = mxs_gpio_ack_irq, - .mask = mxs_gpio_mask_irq, - .unmask = mxs_gpio_unmask_irq, - .set_type = mxs_gpio_set_irq_type, - .set_wake = mxs_gpio_set_wake_irq, + .irq_ack = mxs_gpio_ack_irq, + .irq_mask = mxs_gpio_mask_irq, + .irq_unmask = mxs_gpio_unmask_irq, + .irq_set_type = mxs_gpio_set_irq_type, + .irq_set_wake = mxs_gpio_set_wake_irq, }; static void mxs_set_gpio_direction(struct gpio_chip *chip, unsigned offset, diff --cc drivers/tty/serial/Kconfig index e461be1,aa9d3d1..e1aee37 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@@ -1585,17 -1597,18 +1585,31 @@@ config SERIAL_PCH_UAR which is an IOH(Input/Output Hub) for x86 embedded processor. Enabling PCH_DMA, this PCH UART works as DMA mode. + This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/ + Output Hub) which is for IVI(In-Vehicle Infotainment) use. + ML7213 is companion chip for Intel Atom E6xx series. + ML7213 is completely compatible for Intel EG20T PCH. + +config SERIAL_MSM_SMD + bool "Enable tty device interface for some SMD ports" + default n + depends on MSM_SMD + help + Enables userspace clients to read and write to some streaming SMD + ports via tty device interface for MSM chipset. + + config SERIAL_MXS_AUART + depends on ARCH_MXS + tristate "MXS AUART support" + select SERIAL_CORE + help + This driver supports the MXS Application UART (AUART) port. + + config SERIAL_MXS_AUART_CONSOLE + bool "MXS AUART console support" + depends on SERIAL_MXS_AUART=y + select SERIAL_CORE_CONSOLE + help + Enable a MXS AUART port to be the system console. + endmenu diff --cc drivers/tty/serial/Makefile index 31e868c,c855071..fee0690 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@@ -92,4 -92,4 +92,5 @@@ obj-$(CONFIG_SERIAL_MRST_MAX3110) += mr obj-$(CONFIG_SERIAL_MFD_HSU) += mfd.o obj-$(CONFIG_SERIAL_IFX6X60) += ifx6x60.o obj-$(CONFIG_SERIAL_PCH_UART) += pch_uart.o +obj-$(CONFIG_SERIAL_MSM_SMD) += msm_smd_tty.o + obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o diff --cc drivers/video/Kconfig index bfc62d1,e0ea23f..e6a8d8c --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@@ -2321,17 -2365,15 +2321,26 @@@ config FB_JZ474 help Framebuffer support for the JZ4740 SoC. + config FB_MXS + tristate "MXS LCD framebuffer support" + depends on FB && ARCH_MXS + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + Framebuffer support for the MXS SoC. + +config FB_PUV3_UNIGFX + tristate "PKUnity v3 Unigfx framebuffer support" + depends on FB && UNICORE32 && ARCH_PUV3 + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + help + Choose this option if you want to use the Unigfx device as a + framebuffer device. Without the support of PCI & AGP. + source "drivers/video/omap/Kconfig" source "drivers/video/omap2/Kconfig"