diff options
-rw-r--r-- | arch/arm/mach-s3c24xx/h1940-bluetooth.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/h1940.h (renamed from arch/arm/mach-s3c24xx/include/mach/h1940-latch.h) | 22 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/h1940.h | 24 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-h1940.c | 35 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx1950.c | 32 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx3715.c | 16 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2410.c | 6 | ||||
-rw-r--r-- | sound/soc/samsung/h1940_uda1380.c | 13 |
8 files changed, 68 insertions, 86 deletions
diff --git a/arch/arm/mach-s3c24xx/h1940-bluetooth.c b/arch/arm/mach-s3c24xx/h1940-bluetooth.c index 57aee916bdb1..93bdb927df1b 100644 --- a/arch/arm/mach-s3c24xx/h1940-bluetooth.c +++ b/arch/arm/mach-s3c24xx/h1940-bluetooth.c | |||
@@ -19,10 +19,10 @@ | |||
19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
20 | #include <linux/rfkill.h> | 20 | #include <linux/rfkill.h> |
21 | 21 | ||
22 | #include <mach/regs-gpio.h> | ||
23 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
24 | #include <mach/h1940-latch.h> | 23 | #include <mach/regs-gpio.h> |
25 | #include <mach/h1940.h> | 24 | |
25 | #include "h1940.h" | ||
26 | 26 | ||
27 | #define DRV_NAME "h1940-bt" | 27 | #define DRV_NAME "h1940-bt" |
28 | 28 | ||
diff --git a/arch/arm/mach-s3c24xx/include/mach/h1940-latch.h b/arch/arm/mach-s3c24xx/h1940.h index fc897d3a056c..2950cc466840 100644 --- a/arch/arm/mach-s3c24xx/include/mach/h1940-latch.h +++ b/arch/arm/mach-s3c24xx/h1940.h | |||
@@ -1,20 +1,30 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 1 | /* |
2 | * Copyright 2006 Ben Dooks <ben-linux@fluff.org> | ||
2 | * | 3 | * |
3 | * Copyright (c) 2005 Simtec Electronics | 4 | * Copyright (c) 2005 Simtec Electronics |
4 | * http://armlinux.simtec.co.uk/ | 5 | * http://armlinux.simtec.co.uk/ |
5 | * Ben Dooks <ben@simtec.co.uk> | 6 | * Ben Dooks <ben@simtec.co.uk> |
6 | * | 7 | * |
7 | * iPAQ H1940 series - latch definitions | 8 | * iPAQ H1940 series definitions |
8 | * | 9 | * |
9 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
11 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
12 | */ | 13 | */ |
13 | 14 | ||
14 | #ifndef __ASM_ARCH_H1940_LATCH_H | 15 | #ifndef __MACH_S3C24XX_H1940_H |
15 | #define __ASM_ARCH_H1940_LATCH_H | 16 | #define __MACH_S3C24XX_H1940_H __FILE__ |
16 | 17 | ||
17 | #include <asm/gpio.h> | 18 | #define H1940_SUSPEND_CHECKSUM (0x30003ff8) |
19 | #define H1940_SUSPEND_RESUMEAT (0x30081000) | ||
20 | #define H1940_SUSPEND_CHECK (0x30080000) | ||
21 | |||
22 | extern void h1940_pm_return(void); | ||
23 | extern int h1940_led_blink_set(unsigned gpio, int state, | ||
24 | unsigned long *delay_on, | ||
25 | unsigned long *delay_off); | ||
26 | |||
27 | #include <linux/gpio.h> | ||
18 | 28 | ||
19 | #define H1940_LATCH_GPIO(x) (S3C_GPIO_END + (x)) | 29 | #define H1940_LATCH_GPIO(x) (S3C_GPIO_END + (x)) |
20 | 30 | ||
@@ -40,4 +50,4 @@ | |||
40 | #define H1940_LATCH_LED_GREEN H1940_LATCH_GPIO(14) | 50 | #define H1940_LATCH_LED_GREEN H1940_LATCH_GPIO(14) |
41 | #define H1940_LATCH_LED_FLASH H1940_LATCH_GPIO(15) | 51 | #define H1940_LATCH_LED_FLASH H1940_LATCH_GPIO(15) |
42 | 52 | ||
43 | #endif /* __ASM_ARCH_H1940_LATCH_H */ | 53 | #endif /* __MACH_S3C24XX_H1940_H */ |
diff --git a/arch/arm/mach-s3c24xx/include/mach/h1940.h b/arch/arm/mach-s3c24xx/include/mach/h1940.h deleted file mode 100644 index 2aa683c8d3d6..000000000000 --- a/arch/arm/mach-s3c24xx/include/mach/h1940.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/h1940.h | ||
2 | * | ||
3 | * Copyright 2006 Ben Dooks <ben-linux@fluff.org> | ||
4 | * | ||
5 | * H1940 definitions | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #ifndef __ASM_ARCH_H1940_H | ||
13 | #define __ASM_ARCH_H1940_H | ||
14 | |||
15 | #define H1940_SUSPEND_CHECKSUM (0x30003ff8) | ||
16 | #define H1940_SUSPEND_RESUMEAT (0x30081000) | ||
17 | #define H1940_SUSPEND_CHECK (0x30080000) | ||
18 | |||
19 | extern void h1940_pm_return(void); | ||
20 | extern int h1940_led_blink_set(unsigned gpio, int state, | ||
21 | unsigned long *delay_on, unsigned long *delay_off); | ||
22 | |||
23 | |||
24 | #endif /* __ASM_ARCH_H1940_H */ | ||
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index e208dda3c759..afc05a7c24a1 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/mach-s3c2410/mach-h1940.c | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2003-2005 Simtec Electronics | 2 | * Copyright (c) 2003-2005 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 3 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 4 | * |
@@ -37,38 +36,36 @@ | |||
37 | #include <linux/mmc/host.h> | 36 | #include <linux/mmc/host.h> |
38 | #include <linux/export.h> | 37 | #include <linux/export.h> |
39 | 38 | ||
39 | #include <asm/irq.h> | ||
40 | #include <asm/mach-types.h> | ||
40 | #include <asm/mach/arch.h> | 41 | #include <asm/mach/arch.h> |
41 | #include <asm/mach/map.h> | 42 | #include <asm/mach/map.h> |
42 | #include <asm/mach/irq.h> | 43 | #include <asm/mach/irq.h> |
43 | 44 | ||
44 | #include <mach/hardware.h> | 45 | #include <linux/platform_data/i2c-s3c2410.h> |
45 | #include <asm/irq.h> | 46 | #include <linux/platform_data/mmc-s3cmci.h> |
46 | #include <asm/mach-types.h> | 47 | #include <linux/platform_data/touchscreen-s3c2410.h> |
47 | 48 | #include <linux/platform_data/usb-s3c2410_udc.h> | |
48 | #include <plat/regs-serial.h> | ||
49 | #include <mach/regs-lcd.h> | ||
50 | #include <mach/regs-clock.h> | ||
51 | 49 | ||
52 | #include <mach/regs-gpio.h> | 50 | #include <sound/uda1380.h> |
53 | 51 | ||
54 | #include <mach/h1940.h> | ||
55 | #include <mach/h1940-latch.h> | ||
56 | #include <mach/fb.h> | 52 | #include <mach/fb.h> |
57 | #include <linux/platform_data/usb-s3c2410_udc.h> | 53 | #include <mach/hardware.h> |
58 | #include <linux/platform_data/i2c-s3c2410.h> | 54 | #include <mach/regs-clock.h> |
55 | #include <mach/regs-gpio.h> | ||
56 | #include <mach/regs-lcd.h> | ||
59 | 57 | ||
60 | #include <plat/gpio-cfg.h> | ||
61 | #include <plat/clock.h> | 58 | #include <plat/clock.h> |
62 | #include <plat/devs.h> | ||
63 | #include <plat/cpu.h> | 59 | #include <plat/cpu.h> |
60 | #include <plat/devs.h> | ||
61 | #include <plat/gpio-cfg.h> | ||
64 | #include <plat/pll.h> | 62 | #include <plat/pll.h> |
65 | #include <plat/pm.h> | 63 | #include <plat/pm.h> |
66 | #include <linux/platform_data/mmc-s3cmci.h> | 64 | #include <plat/regs-serial.h> |
67 | #include <linux/platform_data/touchscreen-s3c2410.h> | ||
68 | 65 | ||
69 | #include <sound/uda1380.h> | ||
70 | 66 | ||
71 | #include "common.h" | 67 | #include "common.h" |
68 | #include "h1940.h" | ||
72 | 69 | ||
73 | #define H1940_LATCH ((void __force __iomem *)0xF8000000) | 70 | #define H1940_LATCH ((void __force __iomem *)0xF8000000) |
74 | 71 | ||
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 0606f2faaa5c..bdcfb8bb6811 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/mach-s3c2440/mach-rx1950.c | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev, | 2 | * Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev, |
4 | * Copyright (c) 2007-2010 Vasily Khoruzhick | 3 | * Copyright (c) 2007-2010 Vasily Khoruzhick |
5 | * | 4 | * |
@@ -37,31 +36,32 @@ | |||
37 | 36 | ||
38 | #include <linux/mmc/host.h> | 37 | #include <linux/mmc/host.h> |
39 | 38 | ||
39 | #include <asm/mach-types.h> | ||
40 | #include <asm/mach/arch.h> | 40 | #include <asm/mach/arch.h> |
41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
42 | #include <asm/mach-types.h> | ||
43 | 42 | ||
43 | #include <linux/platform_data/i2c-s3c2410.h> | ||
44 | #include <linux/platform_data/mmc-s3cmci.h> | ||
45 | #include <linux/platform_data/mtd-nand-s3c2410.h> | ||
46 | #include <linux/platform_data/touchscreen-s3c2410.h> | ||
47 | #include <linux/platform_data/usb-s3c2410_udc.h> | ||
48 | |||
49 | #include <sound/uda1380.h> | ||
50 | |||
51 | #include <mach/fb.h> | ||
44 | #include <mach/regs-gpio.h> | 52 | #include <mach/regs-gpio.h> |
45 | #include <mach/regs-lcd.h> | 53 | #include <mach/regs-lcd.h> |
46 | #include <mach/h1940.h> | ||
47 | #include <mach/fb.h> | ||
48 | 54 | ||
49 | #include <plat/clock.h> | 55 | #include <plat/clock.h> |
50 | #include <plat/regs-serial.h> | ||
51 | #include <plat/regs-iic.h> | ||
52 | #include <linux/platform_data/mmc-s3cmci.h> | ||
53 | #include <linux/platform_data/usb-s3c2410_udc.h> | ||
54 | #include <linux/platform_data/mtd-nand-s3c2410.h> | ||
55 | #include <linux/platform_data/i2c-s3c2410.h> | ||
56 | #include <plat/devs.h> | ||
57 | #include <plat/cpu.h> | 56 | #include <plat/cpu.h> |
58 | #include <plat/pm.h> | 57 | #include <plat/devs.h> |
59 | #include <plat/irq.h> | 58 | #include <plat/irq.h> |
60 | #include <linux/platform_data/touchscreen-s3c2410.h> | 59 | #include <plat/pm.h> |
61 | 60 | #include <plat/regs-iic.h> | |
62 | #include <sound/uda1380.h> | 61 | #include <plat/regs-serial.h> |
63 | 62 | ||
64 | #include "common.h" | 63 | #include "common.h" |
64 | #include "h1940.h" | ||
65 | 65 | ||
66 | #define LCD_PWM_PERIOD 192960 | 66 | #define LCD_PWM_PERIOD 192960 |
67 | #define LCD_PWM_DUTY 127353 | 67 | #define LCD_PWM_DUTY 127353 |
diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c index dacbb9a2122a..b261dd3efd5c 100644 --- a/arch/arm/mach-s3c24xx/mach-rx3715.c +++ b/arch/arm/mach-s3c24xx/mach-rx3715.c | |||
@@ -31,27 +31,27 @@ | |||
31 | #include <linux/mtd/partitions.h> | 31 | #include <linux/mtd/partitions.h> |
32 | 32 | ||
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | ||
35 | #include <asm/mach/irq.h> | 34 | #include <asm/mach/irq.h> |
35 | #include <asm/mach/map.h> | ||
36 | |||
37 | #include <linux/platform_data/mtd-nand-s3c2410.h> | ||
36 | 38 | ||
37 | #include <mach/hardware.h> | ||
38 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
39 | #include <asm/mach-types.h> | 40 | #include <asm/mach-types.h> |
40 | 41 | ||
41 | #include <plat/regs-serial.h> | 42 | #include <mach/fb.h> |
43 | #include <mach/hardware.h> | ||
42 | #include <mach/regs-gpio.h> | 44 | #include <mach/regs-gpio.h> |
43 | #include <mach/regs-lcd.h> | 45 | #include <mach/regs-lcd.h> |
44 | 46 | ||
45 | #include <mach/h1940.h> | ||
46 | #include <linux/platform_data/mtd-nand-s3c2410.h> | ||
47 | #include <mach/fb.h> | ||
48 | |||
49 | #include <plat/clock.h> | 47 | #include <plat/clock.h> |
50 | #include <plat/devs.h> | ||
51 | #include <plat/cpu.h> | 48 | #include <plat/cpu.h> |
49 | #include <plat/devs.h> | ||
52 | #include <plat/pm.h> | 50 | #include <plat/pm.h> |
51 | #include <plat/regs-serial.h> | ||
53 | 52 | ||
54 | #include "common.h" | 53 | #include "common.h" |
54 | #include "h1940.h" | ||
55 | 55 | ||
56 | static struct map_desc rx3715_iodesc[] __initdata = { | 56 | static struct map_desc rx3715_iodesc[] __initdata = { |
57 | /* dump ISA space somewhere unused */ | 57 | /* dump ISA space somewhere unused */ |
diff --git a/arch/arm/mach-s3c24xx/pm-s3c2410.c b/arch/arm/mach-s3c24xx/pm-s3c2410.c index 949ae05e07c5..2d82c4f116cd 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2410.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2410.c | |||
@@ -29,16 +29,16 @@ | |||
29 | #include <linux/gpio.h> | 29 | #include <linux/gpio.h> |
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | 31 | ||
32 | #include <mach/hardware.h> | ||
33 | |||
34 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
35 | 33 | ||
34 | #include <mach/hardware.h> | ||
36 | #include <mach/regs-gpio.h> | 35 | #include <mach/regs-gpio.h> |
37 | #include <mach/h1940.h> | ||
38 | 36 | ||
39 | #include <plat/cpu.h> | 37 | #include <plat/cpu.h> |
40 | #include <plat/pm.h> | 38 | #include <plat/pm.h> |
41 | 39 | ||
40 | #include "h1940.h" | ||
41 | |||
42 | static void s3c2410_pm_prepare(void) | 42 | static void s3c2410_pm_prepare(void) |
43 | { | 43 | { |
44 | /* ensure at least GSTATUS3 has the resume address */ | 44 | /* ensure at least GSTATUS3 has the resume address */ |
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 3870e9678b5d..15a3817aa5c8 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <sound/jack.h> | 21 | #include <sound/jack.h> |
22 | 22 | ||
23 | #include <plat/regs-iis.h> | 23 | #include <plat/regs-iis.h> |
24 | #include <mach/h1940-latch.h> | ||
25 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
26 | 25 | ||
27 | #include "s3c24xx-i2s.h" | 26 | #include "s3c24xx-i2s.h" |
@@ -147,9 +146,9 @@ static int h1940_spk_power(struct snd_soc_dapm_widget *w, | |||
147 | struct snd_kcontrol *kcontrol, int event) | 146 | struct snd_kcontrol *kcontrol, int event) |
148 | { | 147 | { |
149 | if (SND_SOC_DAPM_EVENT_ON(event)) | 148 | if (SND_SOC_DAPM_EVENT_ON(event)) |
150 | gpio_set_value(H1940_LATCH_AUDIO_POWER, 1); | 149 | gpio_set_value(S3C_GPIO_END + 9, 1); |
151 | else | 150 | else |
152 | gpio_set_value(H1940_LATCH_AUDIO_POWER, 0); | 151 | gpio_set_value(S3C_GPIO_END + 9, 0); |
153 | 152 | ||
154 | return 0; | 153 | return 0; |
155 | } | 154 | } |
@@ -233,11 +232,11 @@ static int __init h1940_init(void) | |||
233 | return -ENODEV; | 232 | return -ENODEV; |
234 | 233 | ||
235 | /* configure some gpios */ | 234 | /* configure some gpios */ |
236 | ret = gpio_request(H1940_LATCH_AUDIO_POWER, "speaker-power"); | 235 | ret = gpio_request(S3C_GPIO_END + 9, "speaker-power"); |
237 | if (ret) | 236 | if (ret) |
238 | goto err_out; | 237 | goto err_out; |
239 | 238 | ||
240 | ret = gpio_direction_output(H1940_LATCH_AUDIO_POWER, 0); | 239 | ret = gpio_direction_output(S3C_GPIO_END + 9, 0); |
241 | if (ret) | 240 | if (ret) |
242 | goto err_gpio; | 241 | goto err_gpio; |
243 | 242 | ||
@@ -258,7 +257,7 @@ static int __init h1940_init(void) | |||
258 | err_plat: | 257 | err_plat: |
259 | platform_device_put(s3c24xx_snd_device); | 258 | platform_device_put(s3c24xx_snd_device); |
260 | err_gpio: | 259 | err_gpio: |
261 | gpio_free(H1940_LATCH_AUDIO_POWER); | 260 | gpio_free(S3C_GPIO_END + 9); |
262 | 261 | ||
263 | err_out: | 262 | err_out: |
264 | return ret; | 263 | return ret; |
@@ -269,7 +268,7 @@ static void __exit h1940_exit(void) | |||
269 | platform_device_unregister(s3c24xx_snd_device); | 268 | platform_device_unregister(s3c24xx_snd_device); |
270 | snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios), | 269 | snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios), |
271 | hp_jack_gpios); | 270 | hp_jack_gpios); |
272 | gpio_free(H1940_LATCH_AUDIO_POWER); | 271 | gpio_free(S3C_GPIO_END + 9); |
273 | } | 272 | } |
274 | 273 | ||
275 | module_init(h1940_init); | 274 | module_init(h1940_init); |