Commit 36b8659f authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
  ARM: 5639/1: arm: clkdev.c should include <linux/clk.h>
  ARM: 5638/1: arch/arm/kernel/signal.c: use correct address space for CRUNCH
  ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers
  ARM: S3C64XX: serial: Fix section mismatch warning
  ARM: S3C24XX: serial: Fix section mismatch warnings
  ARM: S3C: PWM fix for low duty cycle
  ARM: 5597/1: [PCI] reset all internal hardware prior PCI initialization
  ARM: 5627/1: Fix restoring of lr at the end of mcount
  ARM: 5624/1: Document cache aliasing region
  S3C64XX: Fix ARMCLK configuration
  S3C64XX: Fix get_rate() for ARMCLK
  S3C24XX: GPIO: Fix pin range check in s3c_gpiolib_getchip
  mx3 defconfig update
  mx27 defconfig update
  ARM: 5623/1: Treo680: ir shutdown typo fix
  ARM: includecheck fix: plat-stmp3xxx/pinmux.c
  ARM: includecheck fix: plat-s3c64xx/pm.c
  ARM: includecheck fix: mach-omap2/mcbsp.c
  ARM: includecheck fix: mach-omap1/mcbsp.c
  ARM: includecheck fix: board-sffsdr.c
  ...
parents cba8784a c0c60c4b
...@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use. ...@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use.
For SA11xx and Xscale, this is used to For SA11xx and Xscale, this is used to
setup a minicache mapping. setup a minicache mapping.
ffff4000 ffffffff cache aliasing on ARMv6 and later CPUs.
ffff1000 ffff7fff Reserved. ffff1000 ffff7fff Reserved.
Platforms must not use this address range. Platforms must not use this address range.
......
...@@ -29,7 +29,6 @@ unsigned int __machine_arch_type; ...@@ -29,7 +29,6 @@ unsigned int __machine_arch_type;
static void putstr(const char *ptr); static void putstr(const char *ptr);
#include <linux/compiler.h>
#include <mach/uncompress.h> #include <mach/uncompress.h>
#ifdef CONFIG_DEBUG_ICEDCC #ifdef CONFIG_DEBUG_ICEDCC
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/clk.h>
#include <asm/clkdev.h> #include <asm/clkdev.h>
#include <mach/clkdev.h> #include <mach/clkdev.h>
......
This diff is collapsed.
This diff is collapsed.
...@@ -159,8 +159,6 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) ...@@ -159,8 +159,6 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
#else /* ARM_ARCH_6 */ #else /* ARM_ARCH_6 */
#include <asm/system.h>
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#error SMP not supported on pre-ARMv6 CPUs #error SMP not supported on pre-ARMv6 CPUs
#endif #endif
......
...@@ -148,7 +148,7 @@ trace: ...@@ -148,7 +148,7 @@ trace:
sub r0, r0, #MCOUNT_INSN_SIZE sub r0, r0, #MCOUNT_INSN_SIZE
mov lr, pc mov lr, pc
mov pc, r2 mov pc, r2
mov lr, r1 @ restore lr ldr lr, [fp, #-4] @ restore lr
ldmia sp!, {r0-r3, pc} ldmia sp!, {r0-r3, pc}
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
......
...@@ -133,7 +133,7 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, ...@@ -133,7 +133,7 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
} }
#ifdef CONFIG_CRUNCH #ifdef CONFIG_CRUNCH
static int preserve_crunch_context(struct crunch_sigframe *frame) static int preserve_crunch_context(struct crunch_sigframe __user *frame)
{ {
char kbuf[sizeof(*frame) + 8]; char kbuf[sizeof(*frame) + 8];
struct crunch_sigframe *kframe; struct crunch_sigframe *kframe;
...@@ -146,7 +146,7 @@ static int preserve_crunch_context(struct crunch_sigframe *frame) ...@@ -146,7 +146,7 @@ static int preserve_crunch_context(struct crunch_sigframe *frame)
return __copy_to_user(frame, kframe, sizeof(*frame)); return __copy_to_user(frame, kframe, sizeof(*frame));
} }
static int restore_crunch_context(struct crunch_sigframe *frame) static int restore_crunch_context(struct crunch_sigframe __user *frame)
{ {
char kbuf[sizeof(*frame) + 8]; char kbuf[sizeof(*frame) + 8];
struct crunch_sigframe *kframe; struct crunch_sigframe *kframe;
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/nand.h> #include <mach/nand.h>
#include <mach/mmc.h> #include <mach/mmc.h>
#include <mach/common.h>
#define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000
#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/nand.h> #include <mach/nand.h>
#include <mach/mmc.h> #include <mach/mmc.h>
#include <mach/common.h>
#define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000
#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <mach/nand.h> #include <mach/nand.h>
#include <mach/mmc.h> #include <mach/mmc.h>
#include <mach/emac.h> #include <mach/emac.h>
#include <mach/common.h>
#define DM644X_EVM_PHY_MASK (0x2) #define DM644X_EVM_PHY_MASK (0x2)
#define DM644X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ #define DM644X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <mach/i2c.h> #include <mach/i2c.h>
#include <mach/mmc.h> #include <mach/mmc.h>
#include <mach/emac.h> #include <mach/emac.h>
#include <mach/common.h>
#define DM646X_EVM_PHY_MASK (0x2) #define DM646X_EVM_PHY_MASK (0x2)
#define DM646X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ #define DM646X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/psc.h> #include <mach/psc.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/common.h>
#define SFFSDR_PHY_MASK (0x2) #define SFFSDR_PHY_MASK (0x2)
#define SFFSDR_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ #define SFFSDR_MDIO_FREQUENCY (2200000) /* PHY bus frequency */
......
...@@ -41,9 +41,6 @@ ...@@ -41,9 +41,6 @@
#define TS72XX_OPTIONS2_TS9420_BOOT 0x02 #define TS72XX_OPTIONS2_TS9420_BOOT 0x02
#define TS72XX_NOR_PHYS_BASE 0x60000000
#define TS72XX_NOR2_PHYS_BASE 0x62000000
#define TS72XX_NAND1_DATA_PHYS_BASE 0x60000000 #define TS72XX_NAND1_DATA_PHYS_BASE 0x60000000
#define TS72XX_NAND2_DATA_PHYS_BASE 0x70000000 #define TS72XX_NAND2_DATA_PHYS_BASE 0x70000000
#define TS72XX_NAND_DATA_VIRT_BASE 0xfebfc000 #define TS72XX_NAND_DATA_VIRT_BASE 0xfebfc000
......
...@@ -112,13 +112,16 @@ static void __init ts72xx_map_io(void) ...@@ -112,13 +112,16 @@ static void __init ts72xx_map_io(void)
} }
} }
/*************************************************************************
* NOR flash (TS-7200 only)
*************************************************************************/
static struct physmap_flash_data ts72xx_flash_data = { static struct physmap_flash_data ts72xx_flash_data = {
.width = 1, .width = 2,
}; };
static struct resource ts72xx_flash_resource = { static struct resource ts72xx_flash_resource = {
.start = TS72XX_NOR_PHYS_BASE, .start = EP93XX_CS6_PHYS_BASE,
.end = TS72XX_NOR_PHYS_BASE + SZ_16M - 1, .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}; };
...@@ -132,6 +135,12 @@ static struct platform_device ts72xx_flash = { ...@@ -132,6 +135,12 @@ static struct platform_device ts72xx_flash = {
.resource = &ts72xx_flash_resource, .resource = &ts72xx_flash_resource,
}; };
static void __init ts72xx_register_flash(void)
{
if (board_is_ts7200())
platform_device_register(&ts72xx_flash);
}
static unsigned char ts72xx_rtc_readbyte(unsigned long addr) static unsigned char ts72xx_rtc_readbyte(unsigned long addr)
{ {
__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE); __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
...@@ -165,8 +174,7 @@ static struct ep93xx_eth_data ts72xx_eth_data = { ...@@ -165,8 +174,7 @@ static struct ep93xx_eth_data ts72xx_eth_data = {
static void __init ts72xx_init_machine(void) static void __init ts72xx_init_machine(void)
{ {
ep93xx_init_devices(); ep93xx_init_devices();
if (board_is_ts7200()) ts72xx_register_flash();
platform_device_register(&ts72xx_flash);
platform_device_register(&ts72xx_rtc_device); platform_device_register(&ts72xx_rtc_device);
ep93xx_register_eth(&ts72xx_eth_data, 1); ep93xx_register_eth(&ts72xx_eth_data, 1);
......
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
#include <asm/sizes.h> #include <asm/sizes.h>
/*
* Clocks are derived from MCLK, which is 25Mhz
*/
#define KS8695_CLOCK_RATE 25000000
/* /*
* Physical RAM address. * Physical RAM address.
*/ */
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
#ifndef __ASM_ARCH_TIMEX_H #ifndef __ASM_ARCH_TIMEX_H
#define __ASM_ARCH_TIMEX_H #define __ASM_ARCH_TIMEX_H
/* timers are derived from MCLK, which is 25MHz */ #include <mach/hardware.h>
#define CLOCK_TICK_RATE 25000000
#define CLOCK_TICK_RATE KS8695_CLOCK_RATE
#endif #endif
...@@ -245,6 +245,9 @@ static int ks8695_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs ...@@ -245,6 +245,9 @@ static int ks8695_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs
static void __init ks8695_pci_preinit(void) static void __init ks8695_pci_preinit(void)
{ {
/* make software reset to avoid freeze if PCI bus was messed up */
__raw_writel(0x80000000, KS8695_PCI_VA + KS8695_PBCS);
/* stage 1 initialization, subid, subdevice = 0x0001 */ /* stage 1 initialization, subid, subdevice = 0x0001 */
__raw_writel(0x00010001, KS8695_PCI_VA + KS8695_CRCSID); __raw_writel(0x00010001, KS8695_PCI_VA + KS8695_CRCSID);
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/irqs.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/cpu.h> #include <mach/cpu.h>
#include <mach/mcbsp.h> #include <mach/mcbsp.h>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/irqs.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/cpu.h> #include <mach/cpu.h>
#include <mach/mcbsp.h> #include <mach/mcbsp.h>
......
...@@ -1141,12 +1141,16 @@ struct power_supply_info em_x270_psy_info = { ...@@ -1141,12 +1141,16 @@ struct power_supply_info em_x270_psy_info = {
static void em_x270_battery_low(void) static void em_x270_battery_low(void)
{ {
#if defined(CONFIG_APM_EMULATION)
apm_queue_event(APM_LOW_BATTERY); apm_queue_event(APM_LOW_BATTERY);
#endif
} }
static void em_x270_battery_critical(void) static void em_x270_battery_critical(void)
{ {
#if defined(CONFIG_APM_EMULATION)
apm_queue_event(APM_CRITICAL_SUSPEND); apm_queue_event(APM_CRITICAL_SUSPEND);
#endif
} }
struct da9030_battery_info em_x270_batterty_info = { struct da9030_battery_info em_x270_batterty_info = {
......
...@@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = { ...@@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = {
GPIO38_GPIO, /* wifi ready */ GPIO38_GPIO, /* wifi ready */
GPIO81_GPIO, /* wifi reset */ GPIO81_GPIO, /* wifi reset */
/* FFUART */
GPIO34_FFUART_RXD,
GPIO39_FFUART_TXD,
/* HDD */ /* HDD */
GPIO98_GPIO, /* HDD reset */ GPIO98_GPIO, /* HDD reset */
GPIO115_GPIO, /* HDD power */ GPIO115_GPIO, /* HDD power */
......
...@@ -111,6 +111,10 @@ static unsigned long palmt5_pin_config[] __initdata = { ...@@ -111,6 +111,10 @@ static unsigned long palmt5_pin_config[] __initdata = {
/* PWM */ /* PWM */
GPIO16_PWM0_OUT, GPIO16_PWM0_OUT,
/* FFUART */
GPIO34_FFUART_RXD,
GPIO39_FFUART_TXD,
/* MISC */ /* MISC */
GPIO10_GPIO, /* hotsync button */ GPIO10_GPIO, /* hotsync button */
GPIO90_GPIO, /* power detect */ GPIO90_GPIO, /* power detect */
......
...@@ -127,6 +127,10 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -127,6 +127,10 @@ static unsigned long palmtx_pin_config[] __initdata = {
GPIO76_LCD_PCLK, GPIO76_LCD_PCLK,
GPIO77_LCD_BIAS, GPIO77_LCD_BIAS,
/* FFUART */
GPIO34_FFUART_RXD,
GPIO39_FFUART_TXD,
/* MISC. */ /* MISC. */
GPIO10_GPIO, /* hotsync button */ GPIO10_GPIO, /* hotsync button */
GPIO12_GPIO, /* power detect */ GPIO12_GPIO, /* power detect */
......
...@@ -409,7 +409,7 @@ err1: ...@@ -409,7 +409,7 @@ err1:
static void treo680_irda_shutdown(struct device *dev) static void treo680_irda_shutdown(struct device *dev)
{ {
gpio_free(GPIO_NR_TREO680_AMP_EN); gpio_free(GPIO_NR_TREO680_IR_EN);
} }
static struct pxaficp_platform_data treo680_ficp_info = { static struct pxaficp_platform_data treo680_ficp_info = {
......
...@@ -197,10 +197,12 @@ static void __init zylonite_detect_lcd_panel(void) ...@@ -197,10 +197,12 @@ static void __init zylonite_detect_lcd_panel(void)
for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {
id = id << 1; id = id << 1;
gpio = mfp_to_gpio(lcd_detect_pins[i]); gpio = mfp_to_gpio(lcd_detect_pins[i]);
gpio_request(gpio, "LCD_ID_PINS");
gpio_direction_input(gpio); gpio_direction_input(gpio);
if (gpio_get_value(gpio)) if (gpio_get_value(gpio))
id = id | 0x1; id = id | 0x1;
gpio_free(gpio);
} }
/* lcd id, flush out bit 1 */ /* lcd id, flush out bit 1 */
......
...@@ -176,10 +176,12 @@ static void __init zylonite_detect_lcd_panel(void) ...@@ -176,10 +176,12 @@ static void __init zylonite_detect_lcd_panel(void)
for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {
id = id << 1; id = id << 1;
gpio = mfp_to_gpio(lcd_detect_pins[i]); gpio = mfp_to_gpio(lcd_detect_pins[i]);
gpio_request(gpio, "LCD_ID_PINS");
gpio_direction_input(gpio); gpio_direction_input(gpio);
if (gpio_get_value(gpio)) if (gpio_get_value(gpio))
id = id | 0x1; id = id | 0x1;
gpio_free(gpio);
} }
/* lcd id, flush out bit 1 */ /* lcd id, flush out bit 1 */
......
...@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin) ...@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
return NULL; return NULL;
chip = &s3c24xx_gpios[pin/32]; chip = &s3c24xx_gpios[pin/32];
return (S3C2410_GPIO_OFFSET(pin) > chip->chip.ngpio) ? chip : NULL; return (S3C2410_GPIO_OFFSET(pin) < chip->chip.ngpio) ? chip : NULL;
} }
#endif /* __ASM_ARCH_GPIO_CORE_H */ #endif /* __ASM_ARCH_GPIO_CORE_H */
...@@ -246,6 +246,10 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) ...@@ -246,6 +246,10 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
tcmp = duty_ns / tin_ns; tcmp = duty_ns / tin_ns;
tcmp = tcnt - tcmp; tcmp = tcnt - tcmp;
/* the pwm hw only checks the compare register after a decrement,
so the pin never toggles if tcmp = tcnt */
if (tcmp == tcnt)
tcmp--;
pwm_dbg(pwm, "tin_ns=%lu, tcmp=%ld/%lu\n", tin_ns, tcmp, tcnt); pwm_dbg(pwm, "tin_ns=%lu, tcmp=%ld/%lu\n", tin_ns, tcmp, tcnt);
......
...@@ -117,8 +117,6 @@ void s3c_pm_save_core(void) ...@@ -117,8 +117,6 @@ void s3c_pm_save_core(void)
* this. * this.
*/ */
#include <plat/regs-gpio.h>
static void s3c64xx_cpu_suspend(void) static void s3c64xx_cpu_suspend(void)
{ {
unsigned long tmp; unsigned long tmp;
......
...@@ -153,7 +153,7 @@ static unsigned long s3c64xx_clk_arm_round_rate(struct clk *clk, ...@@ -153,7 +153,7 @@ static unsigned long s3c64xx_clk_arm_round_rate(struct clk *clk,
u32 div; u32 div;
if (parent < rate) if (parent < rate)
return rate; return parent;
div = (parent / rate) - 1; div = (parent / rate) - 1;
if (div > armclk_mask) if (div > armclk_mask)
...@@ -175,7 +175,7 @@ static int s3c64xx_clk_arm_set_rate(struct clk *clk, unsigned long rate) ...@@ -175,7 +175,7 @@ static int s3c64xx_clk_arm_set_rate(struct clk *clk, unsigned long rate)
div = clk_get_rate(clk->parent) / rate; div = clk_get_rate(clk->parent) / rate;
val = __raw_readl(S3C_CLK_DIV0); val = __raw_readl(S3C_CLK_DIV0);
val &= armclk_mask; val &= ~armclk_mask;
val |= (div - 1); val |= (div - 1);
__raw_writel(val, S3C_CLK_DIV0); __raw_writel(val, S3C_CLK_DIV0);
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/sysdev.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -76,7 +76,7 @@ static int s3c2400_serial_probe(struct platform_device *dev) ...@@ -76,7 +76,7 @@ static int s3c2400_serial_probe(struct platform_device *dev)
return s3c24xx_serial_probe(dev, &s3c2400_uart_inf); return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
} }
static struct platform_driver s3c2400_serial_drv = { static struct platform_driver s3c2400_serial_driver = {
.probe = s3c2400_serial_probe, .probe = s3c2400_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove), .remove = __devexit_p(s3c24xx_serial_remove),
.driver = { .driver = {
...@@ -85,16 +85,16 @@ static struct platform_driver s3c2400_serial_drv = { ...@@ -85,16 +85,16 @@ static struct platform_driver s3c2400_serial_drv = {
}, },
}; };
s3c24xx_console_init(&s3c2400_serial_drv, &s3c2400_uart_inf); s3c24xx_console_init(&s3c2400_serial_driver, &s3c2400_uart_inf);
static inline int s3c2400_serial_init(void) static inline int s3c2400_serial_init(void)
{ {
return s3c24xx_serial_init(&s3c2400_serial_drv, &s3c2400_uart_inf); return s3c24xx_serial_init(&s3c2400_serial_driver, &s3c2400_uart_inf);
} }
static inline void s3c2400_serial_exit(void) static inline void s3c2400_serial_exit(void)
{ {
platform_driver_unregister(&s3c2400_serial_drv); platform_driver_unregister(&s3c2400_serial_driver);
} }
module_init(s3c2400_serial_init); module_init(s3c2400_serial_init);
......
...@@ -88,7 +88,7 @@ static int s3c2410_serial_probe(struct platform_device *dev) ...@@ -88,7 +88,7 @@ static int s3c2410_serial_probe(struct platform_device *dev)
return s3c24xx_serial_probe(dev, &s3c2410_uart_inf); return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);
} }
static struct platform_driver s3c2410_serial_drv = { static struct platform_driver s3c2410_serial_driver = {
.probe = s3c2410_serial_probe, .probe = s3c2410_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove), .remove = __devexit_p(s3c24xx_serial_remove),
.driver = { .driver = {
...@@ -97,16 +97,16 @@ static struct platform_driver s3c2410_serial_drv = { ...@@ -97,16 +97,16 @@ static struct platform_driver s3c2410_serial_drv = {
}, },
}; };
s3c24xx_console_init(&s3c2410_serial_drv, &s3c2410_uart_inf); s3c24xx_console_init(&s3c2410_serial_driver, &s3c2410_uart_inf);
static int __init s3c2410_serial_init(void) static int __init s3c2410_serial_init(void)
{ {
return s3c24xx_serial_init(&s3c2410_serial_drv, &s3c2410_uart_inf); return s3c24xx_serial_init(&s3c2410_serial_driver, &s3c2410_uart_inf);
} }
static void __exit s3c2410_serial_exit(void) static void __exit s3c2410_serial_exit(void)
{ {
platform_driver_unregister(&s3c2410_serial_drv); platform_driver_unregister(&s3c2410_serial_driver);
} }
module_init(s3c2410_serial_init); module_init(s3c2410_serial_init);
......
...@@ -121,7 +121,7 @@ static int s3c2412_serial_probe(struct platform_device *dev) ...@@ -121,7 +121,7 @@ static int s3c2412_serial_probe(struct platform_device *dev)
return s3c24xx_serial_probe(dev, &s3c2412_uart_inf); return s3c24xx_serial_probe(dev, &s3c2412_uart_inf);
} }
static struct platform_driver s3c2412_serial_drv = { static struct platform_driver s3c2412_serial_driver = {
.probe = s3c2412_serial_probe, .probe = s3c2412_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove), .remove = __devexit_p(s3c24xx_serial_remove),
.driver = { .driver = {
...@@ -130,16 +130,16 @@ static struct platform_driver s3c2412_serial_drv = { ...@@ -130,16 +130,16 @@ static struct platform_driver s3c2412_serial_drv = {
}, },
}; };
s3c24xx_console_init(&s3c2412_serial_drv, &s3c2412_uart_inf); s3c24xx_console_init(&s3c2412_serial_driver, &s3c2412_uart_inf);
static inline int s3c2412_serial_init(void) static inline int s3c2412_serial_init(void)
{ {
return s3c24xx_serial_init(&s3c2412_serial_drv, &s3c2412_uart_inf); return s3c24xx_serial_init(&s3c2412_serial_driver, &s3c2412_uart_inf);
} }
static inline void s3c2412_serial_exit(void) static inline void s3c2412_serial_exit(void)
{ {
platform_driver_unregister(&s3c2412_serial_drv); platform_driver_unregister(&s3c2412_serial_driver);
} }
module_init(s3c2412_serial_init); module_init(s3c2412_serial_init);
......
...@@ -151,7 +151,7 @@ static int s3c2440_serial_probe(struct platform_device *dev) ...@@ -151,7 +151,7 @@ static int s3c2440_serial_probe(struct platform_device *dev)
return s3c24xx_serial_probe(dev, &s3c2440_uart_inf); return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
} }
static struct platform_driver s3c2440_serial_drv = { static struct platform_driver s3c2440_serial_driver = {
.probe = s3c2440_serial_probe, .probe = s3c2440_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove), .remove = __devexit_p(s3c24xx_serial_remove),
.driver = { .driver = {
...@@ -160,16 +160,16 @@ static struct platform_driver s3c2440_serial_drv = { ...@@ -160,16 +160,16 @@ static struct platform_driver s3c2440_serial_drv = {
}, },
}; };
s3c24xx_console_init(&s3c2440_serial_drv, &s3c2440_uart_inf); s3c24xx_console_init(&s3c2440_serial_driver, &s3c2440_uart_inf);
static int __init s3c2440_serial_init(void) static int __init s3c2440_serial_init(void)
{ {
return s3c24xx_serial_init(&s3c2440_serial_drv, &s3c2440_uart_inf); return s3c24xx_serial_init(&s3c2440_serial_driver, &s3c2440_uart_inf);
} }
static void __exit s3c2440_serial_exit(void) static void __exit s3c2440_serial_exit(void)
{ {
platform_driver_unregister(&s3c2440_serial_drv); platform_driver_unregister(&s3c2440_serial_driver);
} }
module_init(s3c2440_serial_init); module_init(s3c2440_serial_init);
......
...@@ -92,7 +92,7 @@ static int s3c24a0_serial_probe(struct platform_device *dev) ...@@ -92,7 +92,7 @@ static int s3c24a0_serial_probe(struct platform_device *dev)
return s3c24xx_serial_probe(dev, &s3c24a0_uart_inf); return s3c24xx_serial_probe(dev, &s3c24a0_uart_inf);
} }
static struct platform_driver s3c24a0_serial_drv = { static struct platform_driver s3c24a0_serial_driver = {
.probe = s3c24a0_serial_probe, .probe = s3c24a0_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove), .remove = __devexit_p(s3c24xx_serial_remove),
.driver = { .driver = {
...@@ -101,16 +101,16 @@ static struct platform_driver s3c24a0_serial_drv = { ...@@ -101,16 +101,16 @@ static struct platform_driver s3c24a0_serial_drv = {
}, },
}; };
s3c24xx_console_init(&s3c24a0_serial_drv, &s3c24a0_uart_inf); s3c24xx_console_init(&s3c24a0_serial_driver, &s3c24a0_uart_inf);
static int __init s3c24a0_serial_init(void) static int __init s3c24a0_serial_init(void)
{ {
return s3c24xx_serial_init(&s3c24a0_serial_drv, &s3c24a0_uart_inf); return s3c24xx_serial_init(&s3c24a0_serial_driver, &s3c24a0_uart_inf);
} }
static void __exit s3c24a0_serial_exit(void) static void __exit s3c24a0_serial_exit(void)
{ {
platform_driver_unregister(&s3c24a0_serial_drv); platform_driver_unregister(&s3c24a0_serial_driver);
} }
module_init(s3c24a0_serial_init); module_init(s3c24a0_serial_init);
......
...@@ -122,7 +122,7 @@ static int s3c6400_serial_probe(struct platform_device *dev) ...@@ -122,7 +122,7 @@ static int s3c6400_serial_probe(struct platform_device *dev)
return s3c24xx_serial_probe(dev, &s3c6400_uart_inf); return s3c24xx_serial_probe(dev, &s3c6400_uart_inf);
} }
static struct platform_driver s3c6400_serial_drv = { static struct platform_driver s3c6400_serial_driver = {
.probe = s3c6400_serial_probe, .probe = s3c6400_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove), .remove = __devexit_p(s3c24xx_serial_remove),
.driver = { .driver = {
...@@ -131,16 +131,16 @@ static struct platform_driver s3c6400_serial_drv = { ...@@ -131,16 +131,16 @@ static struct platform_driver s3c6400_serial_drv = {
}, },
}; };
s3c24xx_console_init(&s3c6400_serial_drv, &s3c6400_uart_inf); s3c24xx_console_init(&s3c6400_serial_driver, &s3c6400_uart_inf);
static int __init s3c6400_serial_init(void) static int __init s3c6400_serial_init(void)
{ {
return s3c24xx_serial_init(&s3c6400_serial_drv, &s3c6400_uart_inf); return s3c24xx_serial_init(&s3c6400_serial_driver, &s3c6400_uart_inf);
} }
static void __exit s3c6400_serial_exit(void) static void __exit s3c6400_serial_exit(void)
{ {
platform_driver_unregister(&s3c6400_serial_drv); platform_driver_unregister(&s3c6400_serial_driver);
} }
module_init(s3c6400_serial_init); module_init(s3c6400_serial_init);
......
...@@ -549,7 +549,7 @@ static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = { ...@@ -549,7 +549,7 @@ static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = {
.mapbase = KS8695_UART_VA, .mapbase = KS8695_UART_VA,
.iotype = SERIAL_IO_MEM, .iotype = SERIAL_IO_MEM,
.irq = KS8695_IRQ_UART_TX, .irq = KS8695_IRQ_UART_TX,
.uartclk = CLOCK_TICK_RATE * 16, .uartclk = KS8695_CLOCK_RATE * 16,
.fifosize = 16, .fifosize = 16,
.ops = &ks8695uart_pops, .ops = &ks8695uart_pops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = ASYNC_BOOT_AUTOCONF,
......
...@@ -66,7 +66,7 @@ static inline void ks8695_wdt_stop(void) ...@@ -66,7 +66,7 @@ static inline void ks8695_wdt_stop(void)
static inline void ks8695_wdt_start(void) static inline void ks8695_wdt_start(void)
{ {
unsigned long tmcon; unsigned long tmcon;
unsigned long tval = wdt_time * CLOCK_TICK_RATE; unsigned long tval = wdt_time * KS8695_CLOCK_RATE;
spin_lock(&ks8695_lock); spin_lock(&ks8695_lock);
/* disable timer0 */ /* disable timer0 */
...@@ -103,7 +103,7 @@ static inline void ks8695_wdt_reload(void) ...@@ -103,7 +103,7 @@ static inline void ks8695_wdt_reload(void)
static int ks8695_wdt_settimeout(int new_time) static int ks8695_wdt_settimeout(int new_time)
{ {
/* /*
* All counting occurs at SLOW_CLOCK / 128 = 0.256 Hz * All counting occurs at KS8695_CLOCK_RATE / 128 = 0.256 Hz
* *
* Since WDV is a 16-bit counter, the maximum period is * Since WDV is a 16-bit counter, the maximum period is
* 65536 / 0.256 = 256 seconds. * 65536 / 0.256 = 256 seconds.
......
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