diff options
author | Heiko Stuebner <heiko@sntech.de> | 2012-03-07 04:47:15 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 04:47:15 -0500 |
commit | 2c5689a7c96ea4c04f0454cd29eaf957a3080877 (patch) | |
tree | 2fb8dd5bbddc1dc55d30b62c273b0ab1705d6e70 /arch/arm/mach-s3c24xx | |
parent | ec2cc753f47bfb4ce3584eb8cd9119340617bf12 (diff) |
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/mach-s3c24xx')
-rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 7 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/setup-i2c.c | 27 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/setup-ts.c | 34 |
4 files changed, 69 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index df6f419f9a5d..b399021ed6eb 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
@@ -106,6 +106,11 @@ config S3C24XX_SIMTEC_USB | |||
106 | help | 106 | help |
107 | USB management code for common Simtec S3C24XX boards | 107 | USB management code for common Simtec S3C24XX boards |
108 | 108 | ||
109 | config S3C24XX_SETUP_TS | ||
110 | bool | ||
111 | help | ||
112 | Compile in platform device definition for Samsung TouchScreen. | ||
113 | |||
109 | # cpu-specific sections | 114 | # cpu-specific sections |
110 | 115 | ||
111 | if CPU_S3C2410 | 116 | if CPU_S3C2410 |
@@ -178,7 +183,7 @@ config ARCH_H1940 | |||
178 | select PM_H1940 if PM | 183 | select PM_H1940 if PM |
179 | select S3C_DEV_USB_HOST | 184 | select S3C_DEV_USB_HOST |
180 | select S3C_DEV_NAND | 185 | select S3C_DEV_NAND |
181 | select S3C2410_SETUP_TS | 186 | select S3C24XX_SETUP_TS |
182 | help | 187 | help |
183 | Say Y here if you are using the HP IPAQ H1940 | 188 | Say Y here if you are using the HP IPAQ H1940 |
184 | 189 | ||
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 2843c81aa4f7..3f39e6fc4b23 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile | |||
@@ -91,3 +91,5 @@ obj-$(CONFIG_MACH_OSIRIS_DVS) += mach-osiris-dvs.o | |||
91 | # device setup | 91 | # device setup |
92 | 92 | ||
93 | obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | 93 | obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |
94 | obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o | ||
95 | obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o | ||
diff --git a/arch/arm/mach-s3c24xx/setup-i2c.c b/arch/arm/mach-s3c24xx/setup-i2c.c new file mode 100644 index 000000000000..9e90a7cbd1d6 --- /dev/null +++ b/arch/arm/mach-s3c24xx/setup-i2c.c | |||
@@ -0,0 +1,27 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/setup-i2c.c | ||
2 | * | ||
3 | * Copyright 2008 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * | ||
6 | * S3C24XX Base setup for i2c device | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/gpio.h> | ||
15 | |||
16 | struct platform_device; | ||
17 | |||
18 | #include <plat/gpio-cfg.h> | ||
19 | #include <plat/iic.h> | ||
20 | #include <mach/hardware.h> | ||
21 | #include <mach/regs-gpio.h> | ||
22 | |||
23 | void s3c_i2c0_cfg_gpio(struct platform_device *dev) | ||
24 | { | ||
25 | s3c_gpio_cfgpin(S3C2410_GPE(15), S3C2410_GPE15_IICSDA); | ||
26 | s3c_gpio_cfgpin(S3C2410_GPE(14), S3C2410_GPE14_IICSCL); | ||
27 | } | ||
diff --git a/arch/arm/mach-s3c24xx/setup-ts.c b/arch/arm/mach-s3c24xx/setup-ts.c new file mode 100644 index 000000000000..ed2638663675 --- /dev/null +++ b/arch/arm/mach-s3c24xx/setup-ts.c | |||
@@ -0,0 +1,34 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/setup-ts.c | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com/ | ||
5 | * | ||
6 | * Based on S3C24XX setup for i2c device | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/gpio.h> | ||
15 | |||
16 | struct platform_device; /* don't need the contents */ | ||
17 | |||
18 | #include <mach/hardware.h> | ||
19 | #include <mach/regs-gpio.h> | ||
20 | |||
21 | /** | ||
22 | * s3c24xx_ts_cfg_gpio - configure gpio for s3c2410 systems | ||
23 | * | ||
24 | * Configure the GPIO for the S3C2410 system, where we have external FETs | ||
25 | * connected to the device (later systems such as the S3C2440 integrate | ||
26 | * these into the device). | ||
27 | */ | ||
28 | void s3c24xx_ts_cfg_gpio(struct platform_device *dev) | ||
29 | { | ||
30 | s3c2410_gpio_cfgpin(S3C2410_GPG(12), S3C2410_GPG12_XMON); | ||
31 | s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPG13_nXPON); | ||
32 | s3c2410_gpio_cfgpin(S3C2410_GPG(14), S3C2410_GPG14_YMON); | ||
33 | s3c2410_gpio_cfgpin(S3C2410_GPG(15), S3C2410_GPG15_nYPON); | ||
34 | } | ||