From 2f3941572634bb1eefbdf116e3778c77d6b43dde Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 30 Sep 2011 22:54:11 +0200 Subject: [PATCH] --- yaml --- r: 272610 b: refs/heads/master c: 2cd050062f1ad5834d07f9b392b7d04848f79667 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-davinci/devices-da8xx.c | 3 + .../arch/arm/mach-davinci/devices-tnetv107x.c | 1 + trunk/arch/arm/mach-davinci/dm355.c | 1 + trunk/arch/arm/mach-davinci/dm644x.c | 1 + trunk/arch/arm/mach-davinci/dm646x.c | 1 + trunk/arch/arm/mach-davinci/dma.c | 5 +- trunk/arch/arm/mach-exynos4/Kconfig | 17 +- trunk/arch/arm/mach-exynos4/Makefile | 2 +- trunk/arch/arm/mach-exynos4/mach-smdkc210.c | 309 -- trunk/arch/arm/mach-exynos4/mach-smdkv310.c | 78 + trunk/arch/arm/mach-imx/Makefile | 10 +- trunk/arch/arm/mach-imx/mach-armadillo5x0.c | 18 +- trunk/arch/arm/mach-imx/mach-cpuimx35.c | 2 +- trunk/arch/arm/mach-imx/mach-mx1ads.c | 15 +- trunk/arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- trunk/arch/arm/mach-imx/mach-vpr200.c | 2 +- trunk/arch/arm/mach-mx5/Kconfig | 10 +- trunk/arch/arm/mach-mx5/Makefile | 2 +- trunk/arch/arm/mach-mx5/board-cpuimx51.c | 27 +- trunk/arch/arm/mach-mx5/board-cpuimx51sd.c | 25 +- trunk/arch/arm/mach-mx5/board-mx51_3ds.c | 1 - trunk/arch/arm/mach-mx5/board-mx51_babbage.c | 26 +- trunk/arch/arm/mach-mx5/board-mx51_efikamx.c | 2 - trunk/arch/arm/mach-mx5/board-mx51_efikasb.c | 6 +- trunk/arch/arm/mach-mx5/board-mx53_ard.c | 4 +- trunk/arch/arm/mach-mx5/clock-mx51-mx53.c | 2 +- trunk/arch/arm/mach-mx5/devices-imx51.h | 13 + trunk/arch/arm/mach-mx5/devices.c | 120 - trunk/arch/arm/mach-mx5/devices.h | 5 - trunk/arch/arm/mach-mx5/ehci.c | 2 +- .../arm/mach-mx5/eukrea_mbimx51-baseboard.c | 3 +- .../arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +- trunk/arch/arm/mach-mx5/mm.c | 8 +- trunk/arch/arm/mach-mx5/mx51_efika.c | 17 +- trunk/arch/arm/mach-mxs/include/mach/gpio.h | 4 - trunk/arch/arm/mach-mxs/include/mach/mxs.h | 2 + trunk/arch/arm/mach-mxs/mach-mx23evk.c | 1 - trunk/arch/arm/mach-mxs/mach-mx28evk.c | 1 - trunk/arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 - trunk/arch/arm/mach-s3c2410/Kconfig | 6 - trunk/arch/arm/mach-s3c2410/Makefile | 1 - trunk/arch/arm/mach-s3c2410/dma.c | 14 - trunk/arch/arm/mach-s3c2410/gpio.c | 72 - .../arch/arm/mach-s3c2410/include/mach/map.h | 52 +- trunk/arch/arm/mach-s3c2412/Kconfig | 1 - trunk/arch/arm/mach-s3c2412/Makefile | 1 - trunk/arch/arm/mach-s3c2412/dma.c | 18 - trunk/arch/arm/mach-s3c2412/gpio.c | 62 - trunk/arch/arm/mach-s3c2440/Kconfig | 2 - trunk/arch/arm/mach-s3c2440/dma.c | 17 - trunk/arch/arm/mach-s3c2443/dma.c | 27 - .../arch/arm/mach-s3c64xx/include/mach/map.h | 9 +- trunk/arch/arm/mach-s3c64xx/mach-crag6410.c | 3 - trunk/arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +- trunk/arch/arm/mach-s3c64xx/mach-real6410.c | 8 +- trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 +- trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c | 8 +- trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c | 8 +- trunk/arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +- trunk/arch/arm/mach-s5pv210/Kconfig | 6 - trunk/arch/arm/mach-s5pv210/Makefile | 2 +- trunk/arch/arm/mach-s5pv210/mach-smdkv210.c | 8 +- trunk/arch/arm/mach-u300/Kconfig | 46 - trunk/arch/arm/mach-u300/Makefile.boot | 17 +- trunk/arch/arm/mach-u300/core.c | 82 +- .../arch/arm/mach-u300/include/mach/memory.h | 22 +- trunk/arch/arm/mach-u300/u300.c | 16 - trunk/arch/arm/mach-ux500/Makefile | 1 + trunk/arch/arm/mach-ux500/board-mop500-pins.c | 34 +- trunk/arch/arm/mach-ux500/board-mop500-sdi.c | 52 +- trunk/arch/arm/mach-ux500/board-mop500.c | 78 +- trunk/arch/arm/mach-ux500/board-mop500.h | 3 + trunk/arch/arm/mach-ux500/cache-l2x0.c | 72 + trunk/arch/arm/mach-ux500/cpu.c | 69 - .../arm/mach-ux500/include/mach/uncompress.h | 10 +- trunk/arch/arm/mach-ux500/pins-db8500.h | 142 +- trunk/arch/arm/plat-mxc/audmux-v2.c | 18 +- trunk/arch/arm/plat-mxc/devices.c | 14 - trunk/arch/arm/plat-mxc/devices/Kconfig | 2 +- .../plat-mxc/devices/platform-fsl-usb2-udc.c | 5 + .../arm/plat-mxc/devices/platform-imx-i2c.c | 6 + .../arm/plat-mxc/devices/platform-mxc-ehci.c | 9 + trunk/arch/arm/plat-mxc/include/mach/common.h | 1 - trunk/arch/arm/plat-mxc/include/mach/gpio.h | 9 +- .../arch/arm/plat-mxc/include/mach/hardware.h | 6 + .../arm/plat-mxc/include/mach/iomux-mx51.h | 2270 ++++------- .../arm/plat-mxc/include/mach/iomux-mx53.h | 3530 ++++++----------- .../arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 + trunk/arch/arm/plat-mxc/include/mach/mx51.h | 167 +- .../arm/plat-nomadik/include/plat/pincfg.h | 5 - .../arch/arm/plat-s3c24xx/include/plat/map.h | 100 - trunk/arch/arm/plat-s5p/include/plat/pll.h | 1 - trunk/arch/arm/plat-samsung/dev-hsmmc.c | 19 +- trunk/arch/arm/plat-samsung/dev-hsmmc1.c | 19 +- trunk/arch/arm/plat-samsung/dev-hsmmc2.c | 19 +- trunk/arch/arm/plat-samsung/dev-hsmmc3.c | 19 +- trunk/arch/arm/plat-samsung/dev-ts.c | 9 + .../plat-samsung/include/plat/dma-s3c24xx.h | 6 - .../arm/plat-samsung/include/plat/map-s3c.h | 84 + .../include/plat/map-s5p.h | 6 +- .../arm/plat-samsung/include/plat/sdhci.h | 7 + trunk/arch/arm/plat-samsung/platformdata.c | 22 + trunk/drivers/gpio/gpio-mxc.c | 12 + trunk/drivers/gpio/gpio-mxs.c | 2 + 106 files changed, 2723 insertions(+), 5396 deletions(-) delete mode 100644 trunk/arch/arm/mach-exynos4/mach-smdkc210.c delete mode 100644 trunk/arch/arm/mach-mx5/devices.c delete mode 100644 trunk/arch/arm/mach-mx5/devices.h delete mode 100644 trunk/arch/arm/mach-s3c2410/gpio.c delete mode 100644 trunk/arch/arm/mach-s3c2412/gpio.c create mode 100644 trunk/arch/arm/mach-ux500/cache-l2x0.c delete mode 100644 trunk/arch/arm/plat-s3c24xx/include/plat/map.h create mode 100644 trunk/arch/arm/plat-samsung/include/plat/map-s3c.h rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%) diff --git a/[refs] b/[refs] index 8c062de2c9d4..8a5c940103bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be73246058737beec52ae232bcab7776332a9e06 +refs/heads/master: 2cd050062f1ad5834d07f9b392b7d04848f79667 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 3269576dbfa8..9f1ff5c94bef 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -830,6 +830,7 @@ config ARCH_U300 select HAVE_SCHED_CLOCK select HAVE_TCM select ARM_AMBA + select ARM_PATCH_PHYS_VIRT select ARM_VIC select GENERIC_CLOCKEVENTS select CLKDEV_LOOKUP diff --git a/trunk/arch/arm/mach-davinci/devices-da8xx.c b/trunk/arch/arm/mach-davinci/devices-da8xx.c index 2f7e719636f1..68def7188868 100644 --- a/trunk/arch/arm/mach-davinci/devices-da8xx.c +++ b/trunk/arch/arm/mach-davinci/devices-da8xx.c @@ -136,6 +136,7 @@ static struct edma_soc_info da830_edma_cc0_info = { .n_cc = 1, .queue_tc_mapping = da8xx_queue_tc_mapping, .queue_priority_mapping = da8xx_queue_priority_mapping, + .default_queue = EVENTQ_1, }; static struct edma_soc_info *da830_edma_info[EDMA_MAX_CC] = { @@ -151,6 +152,7 @@ static struct edma_soc_info da850_edma_cc_info[] = { .n_cc = 1, .queue_tc_mapping = da8xx_queue_tc_mapping, .queue_priority_mapping = da8xx_queue_priority_mapping, + .default_queue = EVENTQ_1, }, { .n_channel = 32, @@ -160,6 +162,7 @@ static struct edma_soc_info da850_edma_cc_info[] = { .n_cc = 1, .queue_tc_mapping = da850_queue_tc_mapping, .queue_priority_mapping = da850_queue_priority_mapping, + .default_queue = EVENTQ_0, }, }; diff --git a/trunk/arch/arm/mach-davinci/devices-tnetv107x.c b/trunk/arch/arm/mach-davinci/devices-tnetv107x.c index 6162cae7f868..29b17f7d3a5f 100644 --- a/trunk/arch/arm/mach-davinci/devices-tnetv107x.c +++ b/trunk/arch/arm/mach-davinci/devices-tnetv107x.c @@ -80,6 +80,7 @@ static struct edma_soc_info edma_cc0_info = { .n_cc = 1, .queue_tc_mapping = edma_tc_mapping, .queue_priority_mapping = edma_priority_mapping, + .default_queue = EVENTQ_1, }; static struct edma_soc_info *tnetv107x_edma_info[EDMA_MAX_CC] = { diff --git a/trunk/arch/arm/mach-davinci/dm355.c b/trunk/arch/arm/mach-davinci/dm355.c index a3a94e9c9378..68fb18162459 100644 --- a/trunk/arch/arm/mach-davinci/dm355.c +++ b/trunk/arch/arm/mach-davinci/dm355.c @@ -591,6 +591,7 @@ static struct edma_soc_info edma_cc0_info = { .n_cc = 1, .queue_tc_mapping = queue_tc_mapping, .queue_priority_mapping = queue_priority_mapping, + .default_queue = EVENTQ_1, }; static struct edma_soc_info *dm355_edma_info[EDMA_MAX_CC] = { diff --git a/trunk/arch/arm/mach-davinci/dm644x.c b/trunk/arch/arm/mach-davinci/dm644x.c index 4c82c2716293..555ff5bdb220 100644 --- a/trunk/arch/arm/mach-davinci/dm644x.c +++ b/trunk/arch/arm/mach-davinci/dm644x.c @@ -514,6 +514,7 @@ static struct edma_soc_info edma_cc0_info = { .n_cc = 1, .queue_tc_mapping = queue_tc_mapping, .queue_priority_mapping = queue_priority_mapping, + .default_queue = EVENTQ_1, }; static struct edma_soc_info *dm644x_edma_info[EDMA_MAX_CC] = { diff --git a/trunk/arch/arm/mach-davinci/dm646x.c b/trunk/arch/arm/mach-davinci/dm646x.c index 1802e711a2b8..b0c350a02484 100644 --- a/trunk/arch/arm/mach-davinci/dm646x.c +++ b/trunk/arch/arm/mach-davinci/dm646x.c @@ -555,6 +555,7 @@ static struct edma_soc_info edma_cc0_info = { .n_cc = 1, .queue_tc_mapping = dm646x_queue_tc_mapping, .queue_priority_mapping = dm646x_queue_priority_mapping, + .default_queue = EVENTQ_1, }; static struct edma_soc_info *dm646x_edma_info[EDMA_MAX_CC] = { diff --git a/trunk/arch/arm/mach-davinci/dma.c b/trunk/arch/arm/mach-davinci/dma.c index 6b9669869c46..da90103a313d 100644 --- a/trunk/arch/arm/mach-davinci/dma.c +++ b/trunk/arch/arm/mach-davinci/dma.c @@ -1435,12 +1435,11 @@ static int __init edma_probe(struct platform_device *pdev) goto fail1; } - edma_cc[j] = kmalloc(sizeof(struct edma), GFP_KERNEL); + edma_cc[j] = kzalloc(sizeof(struct edma), GFP_KERNEL); if (!edma_cc[j]) { status = -ENOMEM; goto fail1; } - memset(edma_cc[j], 0, sizeof(struct edma)); edma_cc[j]->num_channels = min_t(unsigned, info[j]->n_channel, EDMA_MAX_DMACH); @@ -1450,8 +1449,6 @@ static int __init edma_probe(struct platform_device *pdev) EDMA_MAX_CC); edma_cc[j]->default_queue = info[j]->default_queue; - if (!edma_cc[j]->default_queue) - edma_cc[j]->default_queue = EVENTQ_1; dev_dbg(&pdev->dev, "DMA REG BASE ADDR=%p\n", edmacc_regs_base[j]); diff --git a/trunk/arch/arm/mach-exynos4/Kconfig b/trunk/arch/arm/mach-exynos4/Kconfig index 0c77ab99fa16..bee8f77de2ab 100644 --- a/trunk/arch/arm/mach-exynos4/Kconfig +++ b/trunk/arch/arm/mach-exynos4/Kconfig @@ -113,22 +113,7 @@ menu "EXYNOS4 Machines" config MACH_SMDKC210 bool "SMDKC210" - select CPU_EXYNOS4210 - select S5P_DEV_FIMD0 - select S3C_DEV_RTC - select S3C_DEV_WDT - select S3C_DEV_I2C1 - select S3C_DEV_HSMMC - select S3C_DEV_HSMMC1 - select S3C_DEV_HSMMC2 - select S3C_DEV_HSMMC3 - select SAMSUNG_DEV_PWM - select SAMSUNG_DEV_BACKLIGHT - select EXYNOS4_DEV_PD - select EXYNOS4_DEV_SYSMMU - select EXYNOS4_SETUP_FIMD0 - select EXYNOS4_SETUP_I2C1 - select EXYNOS4_SETUP_SDHCI + select MACH_SMDKV310 help Machine support for Samsung SMDKC210 diff --git a/trunk/arch/arm/mach-exynos4/Makefile b/trunk/arch/arm/mach-exynos4/Makefile index b7fe1d7b0b1f..e3e93ea41385 100644 --- a/trunk/arch/arm/mach-exynos4/Makefile +++ b/trunk/arch/arm/mach-exynos4/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o # machine support -obj-$(CONFIG_MACH_SMDKC210) += mach-smdkc210.o +obj-$(CONFIG_MACH_SMDKC210) += mach-smdkv310.o obj-$(CONFIG_MACH_SMDKV310) += mach-smdkv310.o obj-$(CONFIG_MACH_ARMLEX4210) += mach-armlex4210.o obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o diff --git a/trunk/arch/arm/mach-exynos4/mach-smdkc210.c b/trunk/arch/arm/mach-exynos4/mach-smdkc210.c deleted file mode 100644 index a7c65e05c1eb..000000000000 --- a/trunk/arch/arm/mach-exynos4/mach-smdkc210.c +++ /dev/null @@ -1,309 +0,0 @@ -/* linux/arch/arm/mach-exynos4/mach-smdkc210.c - * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include