github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

update some file

Browse Source
This commit is contained in:
林辉辉 2010-05-13 07:03:11 +00:00 committed by 黄涛
parent e92079f347
commit 55374d9689
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rtc/rtc-HYM8563.c
View File

@ -26,12 +26,6 @@
#define DBG(x...)
#endif
static const unsigned short normal_i2c[] = {
HYM_ADDR , /* HYM8563 address */
I2C_CLIENT_END
};
I2C_CLIENT_INSMOD; /* defines addr_data */
static int hym8563_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[], unsigned len)
{
int ret;

6
drivers/rtc/rtc-HYM8563.h
View File

@ -15,8 +15,6 @@
#ifndef _DRIVERS_HYM8563_H
#define _DRIVERS_HYM8563_H
#define HYM_ADDR 0x51
#define RTC_CTL1 0x00
#define RTC_CTL2 0x01
#define RTC_SEC 0x02
@ -26,9 +24,9 @@
#define RTC_WEEK 0x06
#define RTC_MON 0x07
#define RTC_YEAR 0x08
#define RTC_A_MIN 0x09
#define RTC_A_MIN 0x09
#define RTC_A_HOUR 0x0A
#define RTC_A_DAY 0x0B
#define RTC_A_DAY 0x0B
#define RTC_A_WEEK 0x0C
#define RTC_CLKOUT 0x0D
#define RTC_T_CTL 0x0E

15
drivers/serial/rk2818_serial.c
View File

@ -1,5 +1,5 @@
/*
* drivers/serial/rk2818_serial.c - driver for rk2818 RK2818 serial device and console
* drivers/serial/rk2818_serial.c - driver for rk2818 serial device and console
*
* Copyright (C) 2010 ROCKCHIP, Inc.
*
@ -14,6 +14,9 @@
*/
#if defined(CONFIG_SERIAL_RK2818_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif
#include <linux/hrtimer.h>
#include <linux/module.h>
@ -42,10 +45,6 @@ struct rk2818_port {
unsigned int imr;
};
#if defined(CONFIG_SERIAL_RK2818_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif
#define UART_TO_RK2818(uart_port) ((struct rk2818_port *) uart_port)
#define RK2818_SERIAL_MAJOR TTY_MAJOR
#define RK2818_SERIAL_MINOR 64
@ -223,9 +222,15 @@ static void rk2818_rx_chars(struct uart_port *port)
unsigned int ch, flag;
while((rk2818_uart_read(port,UART_USR) & UART_RECEIVE_FIFO_NOT_EMPTY) == UART_RECEIVE_FIFO_NOT_EMPTY)
{
u32 lsr = rk2818_uart_read(port, UART_LSR);
ch = rk2818_uart_read(port,UART_RBR);
flag = TTY_NORMAL;
port->icount.rx++;
if (lsr & UART_BREAK_INT_BIT) {
port->icount.brk++;
if (uart_handle_break(port))
continue;
}
if (uart_handle_sysrq_char(port, ch))
{
continue;

3
drivers/serial/rk2818_serial.h
View File

@ -119,4 +119,7 @@
#define UART_TRANSMIT_FIFO_NOT_FULL (1<<1)
#define UART_USR_BUSY (1)
/*UART_LSR Line Status Register*/
#define UART_BREAK_INT_BIT (1<<4)/*break Interrupt bit*/
#endif /* __DRIVERS_SERIAL_RK2818_SERIAL_H */

10
drivers/spi/rk2818_spim.c
View File

@ -543,7 +543,7 @@ static void pump_transfers(unsigned long data)
| (chip->tmode << SPI_TMOD_OFFSET);
}
message->state = RUNNING_STATE;
/*
* Adjust transfer mode if necessary. Requires platform dependent
* chipselect mechanism.
@ -873,7 +873,7 @@ static int __init rk2818_spim_probe(struct platform_device *pdev)
struct resource *regs;
struct rk2818_spi *dws;
struct spi_master *master;
int irq;
int irq;
int ret;
gpio_request(RK2818_PIN_PB0, "rk2818_spim");
@ -898,8 +898,10 @@ static int __init rk2818_spim_probe(struct platform_device *pdev)
if (IS_ERR(dws->clock_spim))
return PTR_ERR(dws->clock_spim);
dws->regs = ioremap(regs->start, (regs->end - regs->start) + 1);
if (!dws->regs)
goto exit;
if (!dws->regs){
release_mem_region(regs->start, (regs->end - regs->start) + 1);
return -EBUSY;
}
dws->irq = irq;
dws->master = master;
dws->type = SSI_MOTO_SPI;