Skip to content

L
linux
Commit 232910d6 authored by Kukjin Kim's avatar Kukjin Kim
Browse files
Options

ARM: S3C24XX: make h1940.h and h1940-latch.h local 

The headers can be local in mach-s3c24xx/.
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b2ca7871
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 86 deletions
arch/arm/mach-s3c24xx/h1940-bluetooth.c
View file @ 232910d6
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <mach/regs-gpio.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/h1940-latch.h> #include <mach/regs-gpio.h>
#include <mach/h1940.h>
#include "h1940.h"
#define DRV_NAME "h1940-bt" #define DRV_NAME "h1940-bt"
......
arch/arm/mach-s3c24xx/include/mach/h1940-latch.h → arch/arm/mach-s3c24xx/h1940.h
View file @ 232910d6
/* arch/arm/mach-s3c2410/include/mach/h1940-latch.h /*
* Copyright 2006 Ben Dooks <ben-linux@fluff.org>
* *
* Copyright (c) 2005 Simtec Electronics * Copyright (c) 2005 Simtec Electronics
* http://armlinux.simtec.co.uk/ * http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
* *
* iPAQ H1940 series - latch definitions * iPAQ H1940 series definitions
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __ASM_ARCH_H1940_LATCH_H #ifndef __MACH_S3C24XX_H1940_H
#define __ASM_ARCH_H1940_LATCH_H #define __MACH_S3C24XX_H1940_H __FILE__
#include <asm/gpio.h> #define H1940_SUSPEND_CHECKSUM (0x30003ff8)
#define H1940_SUSPEND_RESUMEAT (0x30081000)
#define H1940_SUSPEND_CHECK (0x30080000)
extern void h1940_pm_return(void);
extern int h1940_led_blink_set(unsigned gpio, int state,
unsigned long *delay_on,
unsigned long *delay_off);
#include <linux/gpio.h>
#define H1940_LATCH_GPIO(x) (S3C_GPIO_END + (x)) #define H1940_LATCH_GPIO(x) (S3C_GPIO_END + (x))
...@@ -40,4 +50,4 @@ ...@@ -40,4 +50,4 @@
#define H1940_LATCH_LED_GREEN H1940_LATCH_GPIO(14) #define H1940_LATCH_LED_GREEN H1940_LATCH_GPIO(14)
#define H1940_LATCH_LED_FLASH H1940_LATCH_GPIO(15) #define H1940_LATCH_LED_FLASH H1940_LATCH_GPIO(15)
#endif /* __ASM_ARCH_H1940_LATCH_H */ #endif /* __MACH_S3C24XX_H1940_H */
arch/arm/mach-s3c24xx/include/mach/h1940.h deleted 100644 → 0
View file @ b2ca7871
/* arch/arm/mach-s3c2410/include/mach/h1940.h
*
* Copyright 2006 Ben Dooks <ben-linux@fluff.org>
*
* H1940 definitions
*
* 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.
*/
#ifndef __ASM_ARCH_H1940_H
#define __ASM_ARCH_H1940_H
#define H1940_SUSPEND_CHECKSUM (0x30003ff8)
#define H1940_SUSPEND_RESUMEAT (0x30081000)
#define H1940_SUSPEND_CHECK (0x30080000)
extern void h1940_pm_return(void);
extern int h1940_led_blink_set(unsigned gpio, int state,
unsigned long *delay_on, unsigned long *delay_off);
#endif /* __ASM_ARCH_H1940_H */
arch/arm/mach-s3c24xx/mach-h1940.c
View file @ 232910d6
/* linux/arch/arm/mach-s3c2410/mach-h1940.c /*
*
* Copyright (c) 2003-2005 Simtec Electronics * Copyright (c) 2003-2005 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
* *
...@@ -37,38 +36,36 @@ ...@@ -37,38 +36,36 @@
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/export.h> #include <linux/export.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/hardware.h> #include <linux/platform_data/i2c-s3c2410.h>
#include <asm/irq.h> #include <linux/platform_data/mmc-s3cmci.h>
#include <asm/mach-types.h> #include <linux/platform_data/touchscreen-s3c2410.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <plat/regs-serial.h>
#include <mach/regs-lcd.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <sound/uda1380.h>
#include <mach/h1940.h>
#include <mach/h1940-latch.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <linux/platform_data/usb-s3c2410_udc.h> #include <mach/hardware.h>
#include <linux/platform_data/i2c-s3c2410.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
#include <mach/regs-lcd.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/gpio-cfg.h>
#include <plat/pll.h> #include <plat/pll.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <linux/platform_data/mmc-s3cmci.h> #include <plat/regs-serial.h>
#include <linux/platform_data/touchscreen-s3c2410.h>
#include <sound/uda1380.h>
#include "common.h" #include "common.h"
#include "h1940.h"
#define H1940_LATCH ((void __force __iomem *)0xF8000000) #define H1940_LATCH ((void __force __iomem *)0xF8000000)
......
arch/arm/mach-s3c24xx/mach-rx1950.c
View file @ 232910d6
/* linux/arch/arm/mach-s3c2440/mach-rx1950.c /*
*
* Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev, * Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev,
* Copyright (c) 2007-2010 Vasily Khoruzhick * Copyright (c) 2007-2010 Vasily Khoruzhick
* *
...@@ -37,31 +36,32 @@ ...@@ -37,31 +36,32 @@
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/mmc-s3cmci.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/touchscreen-s3c2410.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <sound/uda1380.h>
#include <mach/fb.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/h1940.h>
#include <mach/fb.h>
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/regs-serial.h>
#include <plat/regs-iic.h>
#include <linux/platform_data/mmc-s3cmci.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/pm.h> #include <plat/devs.h>
#include <plat/irq.h> #include <plat/irq.h>
#include <linux/platform_data/touchscreen-s3c2410.h> #include <plat/pm.h>
#include <plat/regs-iic.h>
#include <sound/uda1380.h> #include <plat/regs-serial.h>
#include "common.h" #include "common.h"
#include "h1940.h"
#define LCD_PWM_PERIOD 192960 #define LCD_PWM_PERIOD 192960
#define LCD_PWM_DUTY 127353 #define LCD_PWM_DUTY 127353
......
arch/arm/mach-s3c24xx/mach-rx3715.c
View file @ 232910d6
...@@ -31,27 +31,27 @@ ...@@ -31,27 +31,27 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/mach/map.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/regs-serial.h> #include <mach/fb.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/h1940.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <mach/fb.h>
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <plat/regs-serial.h>
#include "common.h" #include "common.h"
#include "h1940.h"
static struct map_desc rx3715_iodesc[] __initdata = { static struct map_desc rx3715_iodesc[] __initdata = {
/* dump ISA space somewhere unused */ /* dump ISA space somewhere unused */
......
arch/arm/mach-s3c24xx/pm-s3c2410.c
View file @ 232910d6
...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/h1940.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/pm.h> #include <plat/pm.h>
#include "h1940.h"
static void s3c2410_pm_prepare(void) static void s3c2410_pm_prepare(void)
{ {
/* ensure at least GSTATUS3 has the resume address */ /* ensure at least GSTATUS3 has the resume address */
......
sound/soc/samsung/h1940_uda1380.c
View file @ 232910d6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <sound/jack.h> #include <sound/jack.h>
#include <plat/regs-iis.h> #include <plat/regs-iis.h>
#include <mach/h1940-latch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "s3c24xx-i2s.h" #include "s3c24xx-i2s.h"
...@@ -147,9 +146,9 @@ static int h1940_spk_power(struct snd_soc_dapm_widget *w, ...@@ -147,9 +146,9 @@ static int h1940_spk_power(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
if (SND_SOC_DAPM_EVENT_ON(event)) if (SND_SOC_DAPM_EVENT_ON(event))
gpio_set_value(H1940_LATCH_AUDIO_POWER, 1); gpio_set_value(S3C_GPIO_END + 9, 1);
else else
gpio_set_value(H1940_LATCH_AUDIO_POWER, 0); gpio_set_value(S3C_GPIO_END + 9, 0);
return 0; return 0;
} }
...@@ -233,11 +232,11 @@ static int __init h1940_init(void) ...@@ -233,11 +232,11 @@ static int __init h1940_init(void)
return -ENODEV; return -ENODEV;
/* configure some gpios */ /* configure some gpios */
ret = gpio_request(H1940_LATCH_AUDIO_POWER, "speaker-power"); ret = gpio_request(S3C_GPIO_END + 9, "speaker-power");
if (ret) if (ret)
goto err_out; goto err_out;
ret = gpio_direction_output(H1940_LATCH_AUDIO_POWER, 0); ret = gpio_direction_output(S3C_GPIO_END + 9, 0);
if (ret) if (ret)
goto err_gpio; goto err_gpio;
...@@ -258,7 +257,7 @@ static int __init h1940_init(void) ...@@ -258,7 +257,7 @@ static int __init h1940_init(void)
err_plat: err_plat:
platform_device_put(s3c24xx_snd_device); platform_device_put(s3c24xx_snd_device);
err_gpio: err_gpio:
gpio_free(H1940_LATCH_AUDIO_POWER); gpio_free(S3C_GPIO_END + 9);
err_out: err_out:
return ret; return ret;
...@@ -269,7 +268,7 @@ static void __exit h1940_exit(void) ...@@ -269,7 +268,7 @@ static void __exit h1940_exit(void)
platform_device_unregister(s3c24xx_snd_device); platform_device_unregister(s3c24xx_snd_device);
snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios), snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
hp_jack_gpios); hp_jack_gpios);
gpio_free(H1940_LATCH_AUDIO_POWER); gpio_free(S3C_GPIO_END + 9);
} }
module_init(h1940_init); module_init(h1940_init);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7