From 265556d2dfaf57fd20144ac69b8edd77cbf1c720 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E6=9F=AF=E9=A3=9E=E9=9B=84?= Date: Wed, 12 May 2010 09:51:53 +0000 Subject: [PATCH] del i2c.h --- arch/arm/mach-rk2818/include/mach/board.h | 10 ++- arch/arm/mach-rk2818/include/mach/i2c.h | 85 ----------------------- 2 files changed, 9 insertions(+), 86 deletions(-) delete mode 100755 arch/arm/mach-rk2818/include/mach/i2c.h diff --git a/arch/arm/mach-rk2818/include/mach/board.h b/arch/arm/mach-rk2818/include/mach/board.h index e21c023c7418..5bf7f0c8da2e 100644 --- a/arch/arm/mach-rk2818/include/mach/board.h +++ b/arch/arm/mach-rk2818/include/mach/board.h @@ -26,8 +26,16 @@ struct RK2818_mddi_platform_data unsigned has_vsync_irq:1; }; -/* common init routines for use by arch/arm/mach-msm/board-*.c */ +struct rk2818_i2c_platform_data { + int bus_num; + unsigned int flags; + unsigned int slave_addr; + unsigned long scl_rate; + char clk_id[16]; + void (*cfg_gpio)(struct platform_device *dev); +}; +/* common init routines for use by arch/arm/mach-msm/board-*.c */ void __init rk2818_add_devices(void); void __init rk2818_map_common_io(void); void __init rk2818_init_irq(void); diff --git a/arch/arm/mach-rk2818/include/mach/i2c.h b/arch/arm/mach-rk2818/include/mach/i2c.h deleted file mode 100755 index 18ce171c99c6..000000000000 --- a/arch/arm/mach-rk2818/include/mach/i2c.h +++ /dev/null @@ -1,85 +0,0 @@ -/* arch/arm/mach-rk2818/include/mach/i2c.h - * - * Copyright (C) 2010 ROCKCHIP, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#ifndef __ASM_ARM_ARCH_I2C_H -#define __ASM_ARM_ARCH_I2C_H - -/* master transmit */ -#define I2C_MTXR (0x0000) -/* master receive */ -#define I2C_MRXR (0x0004) -/* slave address */ -#define I2C_SADDR (0x0010) -/* interrupt enable control */ -#define I2C_IER (0x0014) -#define I2C_IER_ARBITR_LOSE (1<<7) -#define I2C_IER_MRX_NEED_ACK (1<<1) -#define I2C_IER_MTX_RCVD_ACK (1<<0) - -#define IRQ_MST_ENABLE (I2C_IER_ARBITR_LOSE | \ - I2C_IER_MRX_NEED_ACK | \ - I2C_IER_MTX_RCVD_ACK) -#define IRQ_ALL_DISABLE (0x00) - -/* interrupt status, write 0 to clear */ -#define I2C_ISR (0x0018) -#define I2C_ISR_ARBITR_LOSE (1<<7) -#define I2C_ISR_MRX_NEED_ACK (1<<1) -#define I2C_ISR_MTX_RCVD_ACK (1<<0) - -/* stop/start/resume command, write 1 to set */ -#define I2C_LCMR (0x001c) -#define I2C_LCMR_RESUME (1<<2) -#define I2C_LCMR_STOP (1<<1) -#define I2C_LCMR_START (1<<0) - -/* i2c core status */ -#define I2C_LSR (0x0020) -#define I2C_LSR_RCV_NAK (1<<1) -#define I2C_LSR_RCV_ACK (~(1<<1)) -#define I2C_LSR_BUSY (1<<0) - -/* i2c config */ -#define I2C_CONR (0x0024) -#define I2C_CONR_NAK (1<<4) -#define I2C_CONR_ACK (~(1<<4)) -#define I2C_CONR_MTX_MODE (1<<3) -#define I2C_CONR_MRX_MODE (~(1<<3)) -#define I2C_CONR_MPORT_ENABLE (1<<2) -#define I2C_CONR_MPORT_DISABLE (~(1<<2)) - -/* i2c core config */ -#define I2C_OPR (0x0028) -#define I2C_OPR_RESET_STATUS (1<<7) -#define I2C_OPR_CORE_ENABLE (1<<6) - -#define I2CCDVR_REM_BITS (0x03) -#define I2CCDVR_REM_MAX (1<<(I2CCDVR_REM_BITS)) -#define I2CCDVR_EXP_BITS (0x03) -#define I2CCDVR_EXP_MAX (1<<(I2CCDVR_EXP_BITS)) - -struct rk2818_i2c_platform_data { - int bus_num; /* i2c总线号 */ - unsigned int flags; /* i2c总线标志 */ - unsigned int slave_addr; /* i2c从设备地址 */ - unsigned long scl_rate; /* i2c总线频率，单位：hz */ - char clk_id[16]; /* clk id */ - /* gpio口配置 */ - void (*cfg_gpio)(struct platform_device *dev); -}; - -void rk2818_i2c_board_init(void); - -#endif -- 2.34.1