From: Russell King Date: Thu, 10 Jul 2008 15:38:50 +0000 (+0100) Subject: Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap... X-Git-Tag: v2.6.27-rc1~850^2~2 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=a177ba3b7a08beef3f0fe74efa0f90701891945a Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel --- a177ba3b7a08beef3f0fe74efa0f90701891945a diff --cc arch/arm/Kconfig index 9773a3f730f3,b786e68914d4,167824e24edc,b786e68914d4,63ef7cf852a7,4039a133006e,d5a759e700eb,5bf60d5897d3,b786e68914d4,640df6a4c850,b786e68914d4,b786e68914d4..b92925c70172 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@@@@@@@@@@@ -232,6 -232,13 -232,13 -232,13 -232,13 -232,14 -236,13 -237,13 -232,13 -232,13 -232,13 -232,13 +241,6 @@@@@@@@@@@@@ config ARCH_CLPS711 help Support for Cirrus Logic 711x/721x based boards. -----------config ARCH_CO285 ----------- bool "Co-EBSA285" ----------- select FOOTBRIDGE ----------- select FOOTBRIDGE_ADDIN - select HAVE_IDE ----------- help ----------- Support for Intel's EBSA285 companion chip. ----------- config ARCH_EBSA110 bool "EBSA-110" select ISA @@@@@@@@@@@@@ -292,6 -299,6 -299,6 -299,6 -299,8 -300,7 -303,6 -304,6 -299,6 -299,6 -299,6 -299,6 +301,8 @@@@@@@@@@@@@ config ARCH_IOP32 depends on MMU select PLAT_IOP select PCI - select HAVE_IDE ++++ +++++++ select GENERIC_GPIO ++++ +++++++ select HAVE_GPIO_LIB help Support for Intel's 80219 and IOP32X (XScale) family of processors. @@@@@@@@@@@@@ -301,6 -308,6 -308,6 -308,6 -310,8 -310,7 -312,6 -313,6 -308,6 -308,6 -308,6 -308,6 +312,8 @@@@@@@@@@@@@ config ARCH_IOP33 depends on MMU select PLAT_IOP select PCI - select HAVE_IDE ++++ +++++++ select GENERIC_GPIO ++++ +++++++ select HAVE_GPIO_LIB help Support for Intel's IOP33X (XScale) family of processors. @@@@@@@@@@@@@ -371,10 -378,10 -378,10 -378,10 -382,10 -384,8 -382,10 -411,11 -378,10 -378,10 -378,10 -378,10 +412,11 @@@@@@@@@@@@@ config ARCH_ORION5 select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS + select PLAT_ORION help - Support for Marvell Orion System on Chip family. + Support for the following Marvell Orion 5x series SoCs: ----- - ---- Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.) +++++++ ++++ Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), +++++++ ++++ Orion-2 (5281). config ARCH_PNX4008 bool "Philips Nexperia PNX4008 Mobile" @@@@@@@@@@@@@ -399,8 -406,8 -406,8 -406,8 -410,8 -411,9 -410,8 -440,8 -406,8 -406,9 -406,8 -406,8 +441,9 @@@@@@@@@@@@@ config ARCH_RP select FIQ select TIMER_ACORN select ARCH_MAY_HAVE_PC_FDC +++++++++ ++ select HAVE_PATA_PLATFORM select ISA_DMA_API select NO_IOPORT - select HAVE_IDE help On the Acorn Risc-PC, Linux can support the internal IDE disk and CD-ROM interface, serial and parallel port, and the floppy drive. @@@@@@@@@@@@@ -505,8 -512,8 -512,8 -512,8 -516,8 -516,8 -516,8 -550,10 -512,8 -513,8 -512,8 -512,8 +552,10 @@@@@@@@@@@@@ source "arch/arm/mach-omap1/Kconfig source "arch/arm/mach-omap2/Kconfig" - source "arch/arm/mach-orion/Kconfig" + source "arch/arm/mach-orion5x/Kconfig" + +++++++ ++++source "arch/arm/mach-kirkwood/Kconfig" +++++ + ++++ source "arch/arm/plat-s3c24xx/Kconfig" source "arch/arm/plat-s3c/Kconfig" diff --cc arch/arm/Makefile index 1c840639f828,e72db27e0ba0,e72db27e0ba0,e72db27e0ba0,e72db27e0ba0,1a4649667ec8,1d74342d09c0,b53237bb6f13,e72db27e0ba0,e72db27e0ba0,e72db27e0ba0,e72db27e0ba0..91fac81833e8 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@@@@@@@@@@@ -132,12 -134,12 -134,12 -134,12 -134,12 -134,13 -134,12 -134,15 -134,12 -134,12 -134,12 -134,12 +132,15 @@@@@@@@@@@@@ endi machine-$(CONFIG_ARCH_PNX4008) := pnx4008 machine-$(CONFIG_ARCH_NETX) := netx machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx - textofs-$(CONFIG_ARCH_NS9XXX) := 0x00108000 machine-$(CONFIG_ARCH_DAVINCI) := davinci +++++++ ++++ machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood machine-$(CONFIG_ARCH_KS8695) := ks8695 incdir-$(CONFIG_ARCH_MXC) := mxc machine-$(CONFIG_ARCH_MX3) := mx3 - machine-$(CONFIG_ARCH_ORION) := orion + machine-$(CONFIG_ARCH_ORION5X) := orion5x machine-$(CONFIG_ARCH_MSM7X00A) := msm +++++++ ++++ machine-$(CONFIG_ARCH_LOKI) := loki +++++++ ++++ machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 ifeq ($(CONFIG_ARCH_EBSA110),y) # This is what happens if you forget the IOCS16 line. diff --cc arch/arm/configs/s3c2410_defconfig index f8a1645b3d4a,f8a1645b3d4a,6d03763773bf,f8a1645b3d4a,f8a1645b3d4a,f8a1645b3d4a,f8a1645b3d4a,f8a1645b3d4a,f8a1645b3d4a,f8a1645b3d4a,f8a1645b3d4a,3796397fde20..35faaea8623e --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@@@@@@@@@@@@ -245,8 -245,8 -245,7 -245,8 -245,8 -245,8 -245,8 -245,8 -245,8 -245,8 -245,8 -286,9 +286,8 @@@@@@@@@@@@@ CONFIG_ISA= # # Kernel Features # +++++++++++ # CONFIG_TICK_ONESHOT is not set # CONFIG_PREEMPT is not set -- ---------# CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=200 # CONFIG_AEABI is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set diff --cc arch/arm/mm/Kconfig index 33ed048502a3,750d895cd287,33ed048502a3,33ed048502a3,33ed048502a3,76348f060f27,33ed048502a3,236603bbafdc,33ed048502a3,33ed048502a3,33ed048502a3,33ed048502a3..a2c8b006d710 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@@@@@@@@@@@@ -180,11 -180,11 -180,11 -180,11 -180,11 -171,10 -180,11 -180,11 -180,11 -180,11 -180,11 -180,11 +180,11 @@@@@@@@@@@@@ config CPU_ARM925 # ARM926T config CPU_ARM926T bool "Support ARM926T processor" - ---------- depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI - ---------- default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI + ++++++++++ depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI + ++++++++++ default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI select CPU_32v5 select CPU_ABRT_EV5TJ + select CPU_PABRT_NOIFAR select CPU_CACHE_VIVT select CPU_CP15_MMU select CPU_COPY_V4WB if MMU @@@@@@@@@@@@@ -365,15 -365,15 -365,15 -365,15 -365,15 -345,14 -365,15 -365,15 -365,15 -365,15 -365,15 -365,15 +365,15 @@@@@@@@@@@@@ config CPU_XSC # Feroceon config CPU_FEROCEON bool ----- - ---- depends on ARCH_ORION5X - depends on ARCH_ORION +++++++ ++++ depends on ARCH_ORION5X || ARCH_LOKI || ARCH_KIRKWOOD || ARCH_MV78XX0 default y select CPU_32v5 select CPU_ABRT_EV5T + select CPU_PABRT_NOIFAR select CPU_CACHE_VIVT select CPU_CP15_MMU - select CPU_COPY_V4WB if MMU - select CPU_TLB_V4WBI if MMU + select CPU_COPY_FEROCEON if MMU ----- - ---- select CPU_TLB_V4WBI if MMU +++++++ ++++ select CPU_TLB_FEROCEON if MMU config CPU_FEROCEON_OLD_ID bool "Accept early Feroceon cores with an ARM926 ID" @@@@@@@@@@@@@ -709,10 -709,10 -709,10 -709,10 -709,10 -670,6 -709,10 -714,18 -709,10 -709,10 -709,10 -709,10 +714,18 @@@@@@@@@@@@@ config OUTER_CACH bool default n +++++++ ++++config CACHE_FEROCEON_L2 +++++++ ++++ bool "Enable the Feroceon L2 cache controller" +++++++ ++++ depends on ARCH_KIRKWOOD || ARCH_MV78XX0 +++++++ ++++ default y +++++++ ++++ select OUTER_CACHE +++++++ ++++ help +++++++ ++++ This option enables the Feroceon L2 cache controller. +++++++ ++++ config CACHE_L2X0 - bool + bool "Enable the L2x0 outer cache controller" + depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 + default y select OUTER_CACHE + help + This option enables the L2x0 PrimeCell. diff --cc drivers/rtc/Makefile index b6e14d51670b,872f1218ff9f,872f1218ff9f,b6e14d51670b,b6e14d51670b,872f1218ff9f,b6e14d51670b,b6e14d51670b,b6e14d51670b,b6e14d51670b,af3ee6652ce5,b6e14d51670b..b5d9d67df887 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@@@@@@@@@@@@ -41,8 -40,7 -40,7 -41,8 -41,8 -40,7 -41,8 -41,8 -41,8 -41,8 -40,8 -41,8 +41,9 @@@@@@@@@@@@@ obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-ma obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o ++++++++++ +obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o ++ + + obj-$(CONFIG_RTC_DRV_PPC) += rtc-ppc.o obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o