aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/dev-audio.c2
-rw-r--r--arch/arm/mach-s5pv210/include/mach/gpio-samsung.h (renamed from arch/arm/mach-s5pv210/include/mach/gpio.h)3
-rw-r--r--arch/arm/mach-s5pv210/mach-aquila.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkv210.c1
-rw-r--r--arch/arm/mach-s5pv210/setup-fb-24bpp.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-fimc.c3
-rw-r--r--arch/arm/mach-s5pv210/setup-i2c0.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-i2c1.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-i2c2.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-ide.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-keypad.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-sdhci-gpio.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-spi.c2
14 files changed, 15 insertions, 12 deletions
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
index 2d67361ef431..90356ad10c54 100644
--- a/arch/arm/mach-s5pv210/dev-audio.c
+++ b/arch/arm/mach-s5pv210/dev-audio.c
@@ -10,7 +10,6 @@
10 10
11#include <linux/platform_device.h> 11#include <linux/platform_device.h>
12#include <linux/dma-mapping.h> 12#include <linux/dma-mapping.h>
13#include <linux/gpio.h>
14 13
15#include <plat/gpio-cfg.h> 14#include <plat/gpio-cfg.h>
16#include <linux/platform_data/asoc-s3c.h> 15#include <linux/platform_data/asoc-s3c.h>
@@ -18,6 +17,7 @@
18#include <mach/map.h> 17#include <mach/map.h>
19#include <mach/dma.h> 18#include <mach/dma.h>
20#include <mach/irqs.h> 19#include <mach/irqs.h>
20#include <mach/gpio-samsung.h>
21 21
22#define S5PV210_AUDSS_INT_MEM (0xC0000000) 22#define S5PV210_AUDSS_INT_MEM (0xC0000000)
23 23
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
index e6f80d57c38e..e193b891e7b2 100644
--- a/arch/arm/mach-s5pv210/include/mach/gpio.h
+++ b/arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
@@ -1,5 +1,4 @@
1/* linux/arch/arm/mach-s5pv210/include/mach/gpio.h 1/*
2 *
3 * Copyright (c) 2010 Samsung Electronics Co., Ltd. 2 * Copyright (c) 2010 Samsung Electronics Co., Ltd.
4 * http://www.samsung.com/ 3 * http://www.samsung.com/
5 * 4 *
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index cc37edacda26..4262d8ff1988 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -31,6 +31,7 @@
31#include <video/samsung_fimd.h> 31#include <video/samsung_fimd.h>
32#include <mach/map.h> 32#include <mach/map.h>
33#include <mach/regs-clock.h> 33#include <mach/regs-clock.h>
34#include <mach/gpio-samsung.h>
34 35
35#include <plat/gpio-cfg.h> 36#include <plat/gpio-cfg.h>
36#include <plat/devs.h> 37#include <plat/devs.h>
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index c1ce921c4088..096a8173a1d9 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -38,6 +38,7 @@
38#include <video/samsung_fimd.h> 38#include <video/samsung_fimd.h>
39#include <mach/map.h> 39#include <mach/map.h>
40#include <mach/regs-clock.h> 40#include <mach/regs-clock.h>
41#include <mach/gpio-samsung.h>
41 42
42#include <plat/gpio-cfg.h> 43#include <plat/gpio-cfg.h>
43#include <plat/devs.h> 44#include <plat/devs.h>
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 2a6655fb63e7..a146089c9ee6 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -32,6 +32,7 @@
32 32
33#include <mach/map.h> 33#include <mach/map.h>
34#include <mach/regs-clock.h> 34#include <mach/regs-clock.h>
35#include <mach/gpio-samsung.h>
35 36
36#include <plat/regs-srom.h> 37#include <plat/regs-srom.h>
37#include <plat/gpio-cfg.h> 38#include <plat/gpio-cfg.h>
diff --git a/arch/arm/mach-s5pv210/setup-fb-24bpp.c b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
index 55103c8220b3..815e329f70c4 100644
--- a/arch/arm/mach-s5pv210/setup-fb-24bpp.c
+++ b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
@@ -13,12 +13,12 @@
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/types.h> 14#include <linux/types.h>
15#include <linux/fb.h> 15#include <linux/fb.h>
16#include <linux/gpio.h>
17 16
18#include <mach/map.h> 17#include <mach/map.h>
19#include <plat/fb.h> 18#include <plat/fb.h>
20#include <mach/regs-clock.h> 19#include <mach/regs-clock.h>
21#include <plat/gpio-cfg.h> 20#include <plat/gpio-cfg.h>
21#include <mach/gpio-samsung.h>
22 22
23static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr) 23static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
24{ 24{
diff --git a/arch/arm/mach-s5pv210/setup-fimc.c b/arch/arm/mach-s5pv210/setup-fimc.c
index 54cc5b11be0b..36945ec437f8 100644
--- a/arch/arm/mach-s5pv210/setup-fimc.c
+++ b/arch/arm/mach-s5pv210/setup-fimc.c
@@ -8,9 +8,10 @@
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
9 */ 9 */
10 10
11#include <linux/gpio.h> 11#include <linux/kernel.h>
12#include <plat/gpio-cfg.h> 12#include <plat/gpio-cfg.h>
13#include <plat/camport.h> 13#include <plat/camport.h>
14#include <mach/gpio-samsung.h>
14 15
15int s5pv210_fimc_setup_gpio(enum s5p_camport_id id) 16int s5pv210_fimc_setup_gpio(enum s5p_camport_id id)
16{ 17{
diff --git a/arch/arm/mach-s5pv210/setup-i2c0.c b/arch/arm/mach-s5pv210/setup-i2c0.c
index 4a15849766c0..b0f2b69ac743 100644
--- a/arch/arm/mach-s5pv210/setup-i2c0.c
+++ b/arch/arm/mach-s5pv210/setup-i2c0.c
@@ -14,12 +14,12 @@
14 14
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/types.h> 16#include <linux/types.h>
17#include <linux/gpio.h>
18 17
19struct platform_device; /* don't need the contents */ 18struct platform_device; /* don't need the contents */
20 19
21#include <linux/platform_data/i2c-s3c2410.h> 20#include <linux/platform_data/i2c-s3c2410.h>
22#include <plat/gpio-cfg.h> 21#include <plat/gpio-cfg.h>
22#include <mach/gpio-samsung.h>
23 23
24void s3c_i2c0_cfg_gpio(struct platform_device *dev) 24void s3c_i2c0_cfg_gpio(struct platform_device *dev)
25{ 25{
diff --git a/arch/arm/mach-s5pv210/setup-i2c1.c b/arch/arm/mach-s5pv210/setup-i2c1.c
index 4777f6b97a92..aac1da7b9071 100644
--- a/arch/arm/mach-s5pv210/setup-i2c1.c
+++ b/arch/arm/mach-s5pv210/setup-i2c1.c
@@ -14,12 +14,12 @@
14 14
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/types.h> 16#include <linux/types.h>
17#include <linux/gpio.h>
18 17
19struct platform_device; /* don't need the contents */ 18struct platform_device; /* don't need the contents */
20 19
21#include <linux/platform_data/i2c-s3c2410.h> 20#include <linux/platform_data/i2c-s3c2410.h>
22#include <plat/gpio-cfg.h> 21#include <plat/gpio-cfg.h>
22#include <mach/gpio-samsung.h>
23 23
24void s3c_i2c1_cfg_gpio(struct platform_device *dev) 24void s3c_i2c1_cfg_gpio(struct platform_device *dev)
25{ 25{
diff --git a/arch/arm/mach-s5pv210/setup-i2c2.c b/arch/arm/mach-s5pv210/setup-i2c2.c
index bbce6c74b915..eff4503b903f 100644
--- a/arch/arm/mach-s5pv210/setup-i2c2.c
+++ b/arch/arm/mach-s5pv210/setup-i2c2.c
@@ -14,12 +14,12 @@
14 14
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/types.h> 16#include <linux/types.h>
17#include <linux/gpio.h>
18 17
19struct platform_device; /* don't need the contents */ 18struct platform_device; /* don't need the contents */
20 19
21#include <linux/platform_data/i2c-s3c2410.h> 20#include <linux/platform_data/i2c-s3c2410.h>
22#include <plat/gpio-cfg.h> 21#include <plat/gpio-cfg.h>
22#include <mach/gpio-samsung.h>
23 23
24void s3c_i2c2_cfg_gpio(struct platform_device *dev) 24void s3c_i2c2_cfg_gpio(struct platform_device *dev)
25{ 25{
diff --git a/arch/arm/mach-s5pv210/setup-ide.c b/arch/arm/mach-s5pv210/setup-ide.c
index ea123d546bd2..5b6042d97892 100644
--- a/arch/arm/mach-s5pv210/setup-ide.c
+++ b/arch/arm/mach-s5pv210/setup-ide.c
@@ -11,9 +11,9 @@
11*/ 11*/
12 12
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/gpio.h>
15 14
16#include <plat/gpio-cfg.h> 15#include <plat/gpio-cfg.h>
16#include <mach/gpio-samsung.h>
17 17
18static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr) 18static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
19{ 19{
diff --git a/arch/arm/mach-s5pv210/setup-keypad.c b/arch/arm/mach-s5pv210/setup-keypad.c
index c56420a52f48..faf6178f3a1b 100644
--- a/arch/arm/mach-s5pv210/setup-keypad.c
+++ b/arch/arm/mach-s5pv210/setup-keypad.c
@@ -11,8 +11,8 @@
11 * 11 *
12 */ 12 */
13 13
14#include <linux/gpio.h>
15#include <plat/gpio-cfg.h> 14#include <plat/gpio-cfg.h>
15#include <mach/gpio-samsung.h>
16 16
17void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) 17void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
18{ 18{
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index 0512ada00522..0dd055b47579 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -15,12 +15,12 @@
15#include <linux/interrupt.h> 15#include <linux/interrupt.h>
16#include <linux/platform_device.h> 16#include <linux/platform_device.h>
17#include <linux/io.h> 17#include <linux/io.h>
18#include <linux/gpio.h>
19#include <linux/mmc/host.h> 18#include <linux/mmc/host.h>
20#include <linux/mmc/card.h> 19#include <linux/mmc/card.h>
21 20
22#include <plat/gpio-cfg.h> 21#include <plat/gpio-cfg.h>
23#include <plat/sdhci.h> 22#include <plat/sdhci.h>
23#include <mach/gpio-samsung.h>
24 24
25void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) 25void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
26{ 26{
diff --git a/arch/arm/mach-s5pv210/setup-spi.c b/arch/arm/mach-s5pv210/setup-spi.c
index 81aecc162f82..e1faf8ea4502 100644
--- a/arch/arm/mach-s5pv210/setup-spi.c
+++ b/arch/arm/mach-s5pv210/setup-spi.c
@@ -8,8 +8,8 @@
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
9 */ 9 */
10 10
11#include <linux/gpio.h>
12#include <plat/gpio-cfg.h> 11#include <plat/gpio-cfg.h>
12#include <mach/gpio-samsung.h>
13 13
14#ifdef CONFIG_S3C64XX_DEV_SPI0 14#ifdef CONFIG_S3C64XX_DEV_SPI0
15int s3c64xx_spi0_cfg_gpio(void) 15int s3c64xx_spi0_cfg_gpio(void)
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-20 13:09:55 -0500