From: Linus Torvalds Date: Sat, 13 Mar 2010 00:00:54 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: v2.6.34-rc2~66 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=dca1d9f6d7ae428c193f32bd3e9a4ca13176648b;hp=-c;p=karo-tx-linux.git Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits) ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock ARM: S3C2443: Remove #if 0 for clk_mpll ARM: S3C2443: Update notes on MPLLREF clock ARM: S3C2443: Further clksrc-clk conversions ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation USB: Fix s3c-hsotg build following Samsung platform header moves ARM: S3C64XX: Reintroduce unconditional build of audio device ARM: 5961/1: ux500: fix CLKRST addresses ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted ASoC: Fix S3C64xx IIS driver for Samsung header reorg ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support [ARM] pxa: fix typo in mxm8x10.h [ARM] pxa/raumfeld: set GPIO drive bits for LED pins [ARM] pxa/zeus: Add support for mcp2515 CAN bus [ARM] pxa/zeus: Add support for onboard max6369 watchdog [ARM] pxa/zeus: Add Eurotech as the manufacturer [ARM] pxa/zeus: Correct the USB host initialisation flags [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress [ARM] pxa: refactor uncompress.h for non-PXA uarts [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs ... --- dca1d9f6d7ae428c193f32bd3e9a4ca13176648b diff --combined MAINTAINERS index b2403eb495bc,bd8ac1ebc65b..fe88b5f732cd --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -666,6 -666,12 +666,12 @@@ T: git://git.pengutronix.de/git/imx/lin F: arch/arm/mach-mx*/ F: arch/arm/plat-mxc/ + ARM/FREESCALE IMX51 + M: Amit Kucheria + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + S: Maintained + F: arch/arm/mach-mx5/ + ARM/GLOMATION GESBC9312SX MACHINE SUPPORT M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -939,6 -945,16 +945,16 @@@ W: http://www.fluff.org/ben/linux S: Maintained F: arch/arm/mach-s3c6410/ + ARM/SHMOBILE ARM ARCHITECTURE + M: Paul Mundt + M: Magnus Damm + L: linux-sh@vger.kernel.org + T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git + W: http://oss.renesas.com + S: Supported + F: arch/arm/mach-shmobile/ + F: drivers/sh/ + ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -1235,13 -1251,6 +1251,13 @@@ W: http://blackfin.uclinux.or S: Supported F: drivers/rtc/rtc-bfin.c +BLACKFIN SDH DRIVER +M: Cliff Cai +L: uclinux-dist-devel@blackfin.uclinux.org +W: http://blackfin.uclinux.org +S: Supported +F: drivers/mmc/host/bfin_sdh.c + BLACKFIN SERIAL DRIVER M: Sonic Zhang L: uclinux-dist-devel@blackfin.uclinux.org @@@ -2811,7 -2820,7 +2827,7 @@@ S: Maintaine F: drivers/input/ INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) -M: Sylvain Meyer +M: Maik Broemme L: linux-fbdev@vger.kernel.org S: Maintained F: Documentation/fb/intelfb.txt @@@ -3628,7 -3637,7 +3644,7 @@@ F: mm MEMORY RESOURCE CONTROLLER M: Balbir Singh -M: Pavel Emelyanov +M: Daisuke Nishimura M: KAMEZAWA Hiroyuki L: linux-mm@kvack.org S: Maintained @@@ -4502,6 -4511,13 +4518,13 @@@ L: linux-arm-kernel@lists.infradead.or T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git S: Maintained + MMP2 SUPPORT (aka ARMADA610) + M: Haojian Zhuang + M: Eric Miao + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git + S: Maintained + PXA MMCI DRIVER S: Orphan diff --combined arch/arm/Kconfig index 15d43c393353,e12d700d985a..cadfe2ee66a5 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -155,9 -155,6 +155,9 @@@ config ARCH_MAY_HAVE_PC_FD config ZONE_DMA bool +config NEED_DMA_MAP_STATE + def_bool y + config GENERIC_ISA_DMA bool @@@ -324,10 -321,9 +324,9 @@@ config ARCH_MX bool "Freescale MXC/iMX-based" select GENERIC_TIME select GENERIC_CLOCKEVENTS - select ARCH_MTD_XIP - select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB select HAVE_CLK + select COMMON_CLKDEV help Support for Freescale MXC/iMX-based family of processors @@@ -511,7 -507,7 +510,7 @@@ config ARCH_ORION5 Orion-2 (5281), Orion-1-90 (6183). config ARCH_MMP - bool "Marvell PXA168/910" + bool "Marvell PXA168/910/MMP2" depends on MMU select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB @@@ -522,7 -518,7 +521,7 @@@ select TICK_ONESHOT select PLAT_PXA help - Support for Marvell's PXA168/910 processor line. + Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. config ARCH_KS8695 bool "Micrel/Kendin KS8695" @@@ -608,6 -604,11 +607,11 @@@ config ARCH_MS interface to the ARM9 modem processor which runs the baseband stack and controls some vital subsystems (clock and power control, etc). + config ARCH_SHMOBILE + bool "Renesas SH-Mobile" + help + Support for Renesas's SH-Mobile ARM platforms + config ARCH_RPC bool "RiscPC" select ARCH_ACORN @@@ -651,12 -652,43 +655,43 @@@ config ARCH_S3C241 config ARCH_S3C64XX bool "Samsung S3C64XX" + select PLAT_SAMSUNG + select CPU_V6 select GENERIC_GPIO + select ARM_VIC select HAVE_CLK + select NO_IOPORT select ARCH_HAS_CPUFREQ + select ARCH_REQUIRE_GPIOLIB + select SAMSUNG_CLKSRC + select SAMSUNG_IRQ_VIC_TIMER + select SAMSUNG_IRQ_UART + select S3C_GPIO_TRACK + select S3C_GPIO_PULL_UPDOWN + select S3C_GPIO_CFG_S3C24XX + select S3C_GPIO_CFG_S3C64XX + select S3C_DEV_NAND + select USB_ARCH_HAS_OHCI + select SAMSUNG_GPIOLIB_4BIT help Samsung S3C64XX series based systems + config ARCH_S5P6440 + bool "Samsung S5P6440" + select CPU_V6 + select GENERIC_GPIO + select HAVE_CLK + help + Samsung S5P6440 CPU based systems + + config ARCH_S5P6442 + bool "Samsung S5P6442" + select CPU_V6 + select GENERIC_GPIO + select HAVE_CLK + help + Samsung S5P6442 CPU based systems + config ARCH_S5PC1XX bool "Samsung S5PC1XX" select GENERIC_GPIO @@@ -666,6 -698,15 +701,15 @@@ help Samsung S5PC1XX series based systems + config ARCH_S5PV210 + bool "Samsung S5PV210/S5PC110" + select CPU_V7 + select GENERIC_GPIO + select HAVE_CLK + select ARM_L1_CACHE_SHIFT_6 + help + Samsung S5PV210/S5PC110 series based systems + config ARCH_SHARK bool "Shark" select CPU_SA110 @@@ -831,8 -872,7 +875,7 @@@ source "arch/arm/mach-sa1100/Kconfig source "arch/arm/plat-samsung/Kconfig" source "arch/arm/plat-s3c24xx/Kconfig" - source "arch/arm/plat-s3c64xx/Kconfig" - source "arch/arm/plat-s3c/Kconfig" + source "arch/arm/plat-s5p/Kconfig" source "arch/arm/plat-s5pc1xx/Kconfig" if ARCH_S3C2410 @@@ -840,21 -880,27 +883,27 @@@ source "arch/arm/mach-s3c2400/Kconfig source "arch/arm/mach-s3c2410/Kconfig" source "arch/arm/mach-s3c2412/Kconfig" source "arch/arm/mach-s3c2440/Kconfig" - source "arch/arm/mach-s3c2442/Kconfig" source "arch/arm/mach-s3c2443/Kconfig" endif if ARCH_S3C64XX - source "arch/arm/mach-s3c6400/Kconfig" - source "arch/arm/mach-s3c6410/Kconfig" + source "arch/arm/mach-s3c64xx/Kconfig" endif - source "arch/arm/plat-stmp3xxx/Kconfig" + source "arch/arm/mach-s5p6440/Kconfig" + + source "arch/arm/mach-s5p6442/Kconfig" if ARCH_S5PC1XX source "arch/arm/mach-s5pc100/Kconfig" endif + source "arch/arm/mach-s5pv210/Kconfig" + + source "arch/arm/mach-shmobile/Kconfig" + + source "arch/arm/plat-stmp3xxx/Kconfig" + source "arch/arm/mach-u300/Kconfig" source "arch/arm/mach-ux500/Kconfig" @@@ -1120,7 -1166,7 +1169,7 @@@ source kernel/Kconfig.preemp config HZ int default 128 if ARCH_L7200 - default 200 if ARCH_EBSA110 || ARCH_S3C2410 + default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210 default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER default AT91_TIMER_HZ if ARCH_AT91 default 100 diff --combined drivers/video/Kconfig index 3e5b4490c011,83d40ed2f2d6..1c60053439a9 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@@ -400,9 -400,12 +400,12 @@@ config FB_SA110 If you plan to use the LCD display with your SA-1100 system, say Y here. + config HAVE_FB_IMX + bool + config FB_IMX tristate "Motorola i.MX LCD support" - depends on FB && (ARCH_MX1 || ARCH_MX2) + depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT @@@ -1494,6 -1497,7 +1497,6 @@@ config FB_VI select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select I2C_ALGOBIT select I2C help @@@ -1944,27 -1948,6 +1947,27 @@@ config FB_S3C2410_DEBU Turn on debugging messages. Note that you can set/unset at run time through sysfs +config FB_NUC900 + bool "NUC900 LCD framebuffer support" + depends on FB && ARCH_W90X900 + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + ---help--- + Frame buffer driver for the built-in LCD controller in the Nuvoton + NUC900 processor + +config GPM1040A0_320X240 + bool "Giantplus Technology GPM1040A0 320x240 Color TFT LCD" + depends on FB_NUC900 + +config FB_NUC900_DEBUG + bool "NUC900 lcd debug messages" + depends on FB_NUC900 + help + Turn on debugging messages. Note that you can set/unset at run time + through sysfs + config FB_SM501 tristate "Silicon Motion SM501 framebuffer support" depends on FB && MFD_SM501