diff options
author | Heiko Stuebner <heiko@sntech.de> | 2012-03-07 10:47:15 +0100 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 10:47:15 +0100 |
commit | 2c5689a7c96ea4c04f0454cd29eaf957a3080877 (patch) | |
tree | 2fb8dd5bbddc1dc55d30b62c273b0ab1705d6e70 /arch/arm/plat-s3c24xx | |
parent | ARM: S3C24XX: Consolidate Simtec extensions (diff) | |
download | linux-2c5689a7c96ea4c04f0454cd29eaf957a3080877.tar.xz linux-2c5689a7c96ea4c04f0454cd29eaf957a3080877.zip |
ARM: S3C24XX: Move device setup files to mach directory
Includes a small rename of the SETUP_TS option to a S3C24XX prefix.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r-- | arch/arm/plat-s3c24xx/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/setup-i2c.c | 27 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/setup-ts.c | 34 |
4 files changed, 0 insertions, 70 deletions
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index 0338d207475d..21bf6adb9198 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig @@ -113,9 +113,4 @@ config S3C2412_IOTIMING Intel node to select io timing code that is common to the s3c2412 and the s3c2443. -config S3C2410_SETUP_TS - bool - help - Compile in platform device definition for Samsung TouchScreen. - endif diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile index 27dd9c5fc147..2467b800cc76 100644 --- a/arch/arm/plat-s3c24xx/Makefile +++ b/arch/arm/plat-s3c24xx/Makefile @@ -31,7 +31,3 @@ obj-$(CONFIG_S3C24XX_DMA) += dma.o obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o - -# device specific setup and/or initialisation -obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o -obj-$(CONFIG_S3C2410_SETUP_TS) += setup-ts.o diff --git a/arch/arm/plat-s3c24xx/setup-i2c.c b/arch/arm/plat-s3c24xx/setup-i2c.c deleted file mode 100644 index 9e90a7cbd1d6..000000000000 --- a/arch/arm/plat-s3c24xx/setup-i2c.c +++ /dev/null @@ -1,27 +0,0 @@ -/* linux/arch/arm/plat-s3c24xx/setup-i2c.c - * - * Copyright 2008 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> - * - * S3C24XX Base setup for i2c device - * - * 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 <linux/kernel.h> -#include <linux/gpio.h> - -struct platform_device; - -#include <plat/gpio-cfg.h> -#include <plat/iic.h> -#include <mach/hardware.h> -#include <mach/regs-gpio.h> - -void s3c_i2c0_cfg_gpio(struct platform_device *dev) -{ - s3c_gpio_cfgpin(S3C2410_GPE(15), S3C2410_GPE15_IICSDA); - s3c_gpio_cfgpin(S3C2410_GPE(14), S3C2410_GPE14_IICSCL); -} diff --git a/arch/arm/plat-s3c24xx/setup-ts.c b/arch/arm/plat-s3c24xx/setup-ts.c deleted file mode 100644 index ed2638663675..000000000000 --- a/arch/arm/plat-s3c24xx/setup-ts.c +++ /dev/null @@ -1,34 +0,0 @@ -/* linux/arch/arm/plat-s3c24xx/setup-ts.c - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * Based on S3C24XX setup for i2c device - * - * 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 <linux/kernel.h> -#include <linux/gpio.h> - -struct platform_device; /* don't need the contents */ - -#include <mach/hardware.h> -#include <mach/regs-gpio.h> - -/** - * s3c24xx_ts_cfg_gpio - configure gpio for s3c2410 systems - * - * Configure the GPIO for the S3C2410 system, where we have external FETs - * connected to the device (later systems such as the S3C2440 integrate - * these into the device). - */ -void s3c24xx_ts_cfg_gpio(struct platform_device *dev) -{ - s3c2410_gpio_cfgpin(S3C2410_GPG(12), S3C2410_GPG12_XMON); - s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPG13_nXPON); - s3c2410_gpio_cfgpin(S3C2410_GPG(14), S3C2410_GPG14_YMON); - s3c2410_gpio_cfgpin(S3C2410_GPG(15), S3C2410_GPG15_nYPON); -} |