Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
88ba6d53
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
88ba6d53
编写于
1月 29, 2013
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-i2c
上级
06b02c58
019be4af
变更
19
显示空白变更内容
内联
并排
Showing
19 changed file
with
4 addition
and
39 deletion
+4
-39
drivers/i2c/mxs_i2c.c
drivers/i2c/mxs_i2c.c
+4
-4
include/configs/am3517_crane.h
include/configs/am3517_crane.h
+0
-2
include/configs/am3517_evm.h
include/configs/am3517_evm.h
+0
-2
include/configs/cm_t35.h
include/configs/cm_t35.h
+0
-2
include/configs/devkit8000.h
include/configs/devkit8000.h
+0
-2
include/configs/dig297.h
include/configs/dig297.h
+0
-2
include/configs/igep00x0.h
include/configs/igep00x0.h
+0
-2
include/configs/mcx.h
include/configs/mcx.h
+0
-1
include/configs/omap3_beagle.h
include/configs/omap3_beagle.h
+0
-2
include/configs/omap3_evm_common.h
include/configs/omap3_evm_common.h
+0
-2
include/configs/omap3_logic.h
include/configs/omap3_logic.h
+0
-2
include/configs/omap3_mvblx.h
include/configs/omap3_mvblx.h
+0
-2
include/configs/omap3_pandora.h
include/configs/omap3_pandora.h
+0
-2
include/configs/omap3_sdp3430.h
include/configs/omap3_sdp3430.h
+0
-2
include/configs/omap3_zoom1.h
include/configs/omap3_zoom1.h
+0
-2
include/configs/omap3_zoom2.h
include/configs/omap3_zoom2.h
+0
-2
include/configs/omap4_common.h
include/configs/omap4_common.h
+0
-2
include/configs/tam3517-common.h
include/configs/tam3517-common.h
+0
-2
include/configs/tricorder.h
include/configs/tricorder.h
+0
-2
未找到文件。
drivers/i2c/mxs_i2c.c
浏览文件 @
88ba6d53
...
...
@@ -37,7 +37,7 @@
#define MXS_I2C_MAX_TIMEOUT 1000000
void
mxs_i2c_reset
(
void
)
static
void
mxs_i2c_reset
(
void
)
{
struct
mxs_i2c_regs
*
i2c_regs
=
(
struct
mxs_i2c_regs
*
)
MXS_I2C0_BASE
;
int
ret
;
...
...
@@ -59,7 +59,7 @@ void mxs_i2c_reset(void)
i2c_set_bus_speed
(
speed
);
}
void
mxs_i2c_setup_read
(
uint8_t
chip
,
int
len
)
static
void
mxs_i2c_setup_read
(
uint8_t
chip
,
int
len
)
{
struct
mxs_i2c_regs
*
i2c_regs
=
(
struct
mxs_i2c_regs
*
)
MXS_I2C0_BASE
;
...
...
@@ -77,7 +77,7 @@ void mxs_i2c_setup_read(uint8_t chip, int len)
writel
(
I2C_QUEUECTRL_QUEUE_RUN
,
&
i2c_regs
->
hw_i2c_queuectrl_set
);
}
void
mxs_i2c_write
(
uchar
chip
,
uint
addr
,
int
alen
,
static
void
mxs_i2c_write
(
uchar
chip
,
uint
addr
,
int
alen
,
uchar
*
buf
,
int
blen
,
int
stop
)
{
struct
mxs_i2c_regs
*
i2c_regs
=
(
struct
mxs_i2c_regs
*
)
MXS_I2C0_BASE
;
...
...
@@ -121,7 +121,7 @@ void mxs_i2c_write(uchar chip, uint addr, int alen,
writel
(
I2C_QUEUECTRL_QUEUE_RUN
,
&
i2c_regs
->
hw_i2c_queuectrl_set
);
}
int
mxs_i2c_wait_for_ack
(
void
)
static
int
mxs_i2c_wait_for_ack
(
void
)
{
struct
mxs_i2c_regs
*
i2c_regs
=
(
struct
mxs_i2c_regs
*
)
MXS_I2C0_BASE
;
uint32_t
tmp
;
...
...
include/configs/am3517_crane.h
浏览文件 @
88ba6d53
...
...
@@ -156,8 +156,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
#undef CONFIG_CMD_NET
...
...
include/configs/am3517_evm.h
浏览文件 @
88ba6d53
...
...
@@ -150,8 +150,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
#undef CONFIG_CMD_NET
...
...
include/configs/cm_t35.h
浏览文件 @
88ba6d53
...
...
@@ -157,8 +157,6 @@
#define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
...
...
include/configs/devkit8000.h
浏览文件 @
88ba6d53
...
...
@@ -108,8 +108,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/* TWL4030 */
...
...
include/configs/dig297.h
浏览文件 @
88ba6d53
...
...
@@ -141,8 +141,6 @@
#define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/*
...
...
include/configs/igep00x0.h
浏览文件 @
88ba6d53
...
...
@@ -129,8 +129,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/*
...
...
include/configs/mcx.h
浏览文件 @
88ba6d53
...
...
@@ -151,7 +151,6 @@
#define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_DRIVER_OMAP34XX_I2C
/* RTC */
...
...
include/configs/omap3_beagle.h
浏览文件 @
88ba6d53
...
...
@@ -178,8 +178,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_I2C_MULTI_BUS 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
#define CONFIG_VIDEO_OMAP3
/* DSS Support */
...
...
include/configs/omap3_evm_common.h
浏览文件 @
88ba6d53
...
...
@@ -100,8 +100,6 @@
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
/*
* PISMO support
...
...
include/configs/omap3_logic.h
浏览文件 @
88ba6d53
...
...
@@ -138,8 +138,6 @@
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_I2C_MULTI_BUS
/*
...
...
include/configs/omap3_mvblx.h
浏览文件 @
88ba6d53
...
...
@@ -142,8 +142,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 0
#define CONFIG_SYS_I2C_BUS 0
/* This isn't used anywhere ?? */
#define CONFIG_SYS_I2C_BUS_SELECT 1
/* This isn't used anywhere ?? */
#define CONFIG_DRIVER_OMAP34XX_I2C 1
#define CONFIG_I2C_MULTI_BUS 1
...
...
include/configs/omap3_pandora.h
浏览文件 @
88ba6d53
...
...
@@ -126,8 +126,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/*
...
...
include/configs/omap3_sdp3430.h
浏览文件 @
88ba6d53
...
...
@@ -132,8 +132,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/* OMITTED: single 1 Gbit MT29F1G NAND flash */
...
...
include/configs/omap3_zoom1.h
浏览文件 @
88ba6d53
...
...
@@ -136,8 +136,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/*
...
...
include/configs/omap3_zoom2.h
浏览文件 @
88ba6d53
...
...
@@ -156,8 +156,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/*
...
...
include/configs/omap4_common.h
浏览文件 @
88ba6d53
...
...
@@ -91,8 +91,6 @@
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
#define CONFIG_I2C_MULTI_BUS 1
...
...
include/configs/tam3517-common.h
浏览文件 @
88ba6d53
...
...
@@ -131,8 +131,6 @@
#define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
/* base address */
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
/* bytes of address */
#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07
...
...
include/configs/tricorder.h
浏览文件 @
88ba6d53
...
...
@@ -98,8 +98,6 @@
#define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1
/* TWL4030 */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录