Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
b24065c4
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,体验更适合开发者的 AI 搜索 >>
提交
b24065c4
编写于
8月 10, 2017
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-i2c
上级
4edc31c5
014e47f0
变更
34
隐藏空白更改
内联
并排
Showing
34 changed file
with
43 addition
and
38 deletion
+43
-38
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Kconfig
+5
-0
arch/arm/mach-omap2/omap3/clock.c
arch/arm/mach-omap2/omap3/clock.c
+1
-1
board/compulab/cm_t35/cm_t35.c
board/compulab/cm_t35/cm_t35.c
+1
-1
board/logicpd/am3517evm/am3517evm.c
board/logicpd/am3517evm/am3517evm.c
+1
-1
board/ti/am3517crane/am3517crane.c
board/ti/am3517crane/am3517crane.c
+1
-1
board/ti/evm/evm.c
board/ti/evm/evm.c
+1
-1
configs/ti816x_evm_defconfig
configs/ti816x_evm_defconfig
+1
-0
drivers/i2c/Kconfig
drivers/i2c/Kconfig
+6
-0
drivers/i2c/Makefile
drivers/i2c/Makefile
+0
-1
drivers/i2c/at91_i2c.c
drivers/i2c/at91_i2c.c
+24
-2
drivers/i2c/designware_i2c.c
drivers/i2c/designware_i2c.c
+2
-1
include/configs/am3517_crane.h
include/configs/am3517_crane.h
+0
-1
include/configs/am3517_evm.h
include/configs/am3517_evm.h
+0
-1
include/configs/bur_am335x_common.h
include/configs/bur_am335x_common.h
+0
-1
include/configs/cm_t35.h
include/configs/cm_t35.h
+0
-1
include/configs/cm_t3517.h
include/configs/cm_t3517.h
+0
-1
include/configs/cm_t54.h
include/configs/cm_t54.h
+0
-1
include/configs/devkit8000.h
include/configs/devkit8000.h
+0
-2
include/configs/kc1.h
include/configs/kc1.h
+0
-1
include/configs/mcx.h
include/configs/mcx.h
+0
-1
include/configs/nokia_rx51.h
include/configs/nokia_rx51.h
+0
-1
include/configs/omap3_evm.h
include/configs/omap3_evm.h
+0
-1
include/configs/omap3_logic.h
include/configs/omap3_logic.h
+0
-1
include/configs/omap3_overo.h
include/configs/omap3_overo.h
+0
-1
include/configs/omap3_pandora.h
include/configs/omap3_pandora.h
+0
-3
include/configs/omap3_zoom1.h
include/configs/omap3_zoom1.h
+0
-3
include/configs/siemens-am33x-common.h
include/configs/siemens-am33x-common.h
+0
-1
include/configs/sniper.h
include/configs/sniper.h
+0
-1
include/configs/tam3517-common.h
include/configs/tam3517-common.h
+0
-1
include/configs/tao3530.h
include/configs/tao3530.h
+0
-1
include/configs/ti_armv7_omap.h
include/configs/ti_armv7_omap.h
+0
-1
include/configs/ti_omap4_common.h
include/configs/ti_omap4_common.h
+0
-1
include/configs/tricorder.h
include/configs/tricorder.h
+0
-1
scripts/config_whitelist.txt
scripts/config_whitelist.txt
+0
-2
未找到文件。
arch/arm/mach-omap2/Kconfig
浏览文件 @
b24065c4
...
...
@@ -22,6 +22,7 @@ config OMAP34XX
imply SPL_NAND_SUPPORT
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT
imply SYS_I2C_OMAP24XX
imply SYS_THUMB_BUILD
imply TWL4030_POWER
...
...
@@ -40,6 +41,7 @@ config OMAP44XX
imply SPL_NAND_SUPPORT
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT
imply SYS_I2C_OMAP24XX
imply SYS_THUMB_BUILD
config OMAP54XX
...
...
@@ -59,6 +61,7 @@ config OMAP54XX
imply SPL_NAND_SUPPORT
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT
imply SYS_I2C_OMAP24XX
config TI814X
bool "TI814X SoC"
...
...
@@ -82,6 +85,7 @@ config AM43XX
imply SPL_OF_TRANSLATE
imply SPL_SEPARATE_BSS
imply SPL_SYS_MALLOC_SIMPLE
imply SYS_I2C_OMAP24XX
imply SYS_THUMB_BUILD
help
Support for AM43xx SOC from Texas Instruments.
...
...
@@ -92,6 +96,7 @@ config AM43XX
config AM33XX
bool "AM33XX SoC"
imply SYS_I2C_OMAP24XX
imply SYS_THUMB_BUILD
imply USE_TINY_PRINTF
help
...
...
arch/arm/mach-omap2/omap3/clock.c
浏览文件 @
b24065c4
...
...
@@ -772,7 +772,7 @@ void per_clocks_enable(void)
setbits_le32
(
&
prcm_base
->
iclken_per
,
0x00020000
);
#endif
#ifdef CONFIG_SYS_I2C_OMAP
3
4XX
#ifdef CONFIG_SYS_I2C_OMAP
2
4XX
/* Turn on all 3 I2C clocks */
setbits_le32
(
&
prcm_base
->
fclken1_core
,
0x00038000
);
setbits_le32
(
&
prcm_base
->
iclken1_core
,
0x00038000
);
/* I2C1,2,3 = on */
...
...
board/compulab/cm_t35/cm_t35.c
浏览文件 @
b24065c4
...
...
@@ -398,7 +398,7 @@ void board_mmc_power_init(void)
}
#endif
#ifdef CONFIG_SYS_I2C_OMAP
3
4XX
#ifdef CONFIG_SYS_I2C_OMAP
2
4XX
/*
* Routine: reset_net_chip
* Description: reset the Ethernet controller via TPS65930 GPIO
...
...
board/logicpd/am3517evm/am3517evm.c
浏览文件 @
b24065c4
...
...
@@ -105,7 +105,7 @@ int misc_init_r(void)
volatile
unsigned
int
ctr
;
u32
reset
;
#ifdef CONFIG_SYS_I2C_OMAP
3
4XX
#ifdef CONFIG_SYS_I2C_OMAP
2
4XX
i2c_init
(
CONFIG_SYS_OMAP24_I2C_SPEED
,
CONFIG_SYS_OMAP24_I2C_SLAVE
);
#endif
...
...
board/ti/am3517crane/am3517crane.c
浏览文件 @
b24065c4
...
...
@@ -43,7 +43,7 @@ int board_init(void)
*/
int
misc_init_r
(
void
)
{
#ifdef CONFIG_SYS_I2C_OMAP
3
4XX
#ifdef CONFIG_SYS_I2C_OMAP
2
4XX
i2c_init
(
CONFIG_SYS_OMAP24_I2C_SPEED
,
CONFIG_SYS_OMAP24_I2C_SLAVE
);
#endif
...
...
board/ti/evm/evm.c
浏览文件 @
b24065c4
...
...
@@ -147,7 +147,7 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
int
misc_init_r
(
void
)
{
#ifdef CONFIG_SYS_I2C_OMAP
3
4XX
#ifdef CONFIG_SYS_I2C_OMAP
2
4XX
i2c_init
(
CONFIG_SYS_OMAP24_I2C_SPEED
,
CONFIG_SYS_OMAP24_I2C_SLAVE
);
#endif
...
...
configs/ti816x_evm_defconfig
浏览文件 @
b24065c4
...
...
@@ -39,6 +39,7 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_SYS_I2C_OMAP24XX=y
CONFIG_MMC_OMAP_HS=y
CONFIG_SYS_NS16550=y
# CONFIG_USE_PRIVATE_LIBGCC is not set
drivers/i2c/Kconfig
浏览文件 @
b24065c4
...
...
@@ -145,6 +145,12 @@ config SYS_I2C_MXC
channels and operating on standard mode upto 100 kbits/s and fast
mode upto 400 kbits/s.
config SYS_I2C_OMAP24XX
bool "TI OMAP2+ I2C driver"
depends on ARCH_OMAP2PLUS
help
Add support for the OMAP2+ I2C driver.
config SYS_I2C_ROCKCHIP
bool "Rockchip I2C driver"
depends on DM_I2C
...
...
drivers/i2c/Makefile
浏览文件 @
b24065c4
...
...
@@ -31,7 +31,6 @@ obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o
obj-$(CONFIG_SYS_I2C_MXC)
+=
mxc_i2c.o
obj-$(CONFIG_SYS_I2C_MXS)
+=
mxs_i2c.o
obj-$(CONFIG_SYS_I2C_OMAP24XX)
+=
omap24xx_i2c.o
obj-$(CONFIG_SYS_I2C_OMAP34XX)
+=
omap24xx_i2c.o
obj-$(CONFIG_SYS_I2C_RCAR)
+=
rcar_i2c.o
obj-$(CONFIG_SYS_I2C_ROCKCHIP)
+=
rk_i2c.o
obj-$(CONFIG_SYS_I2C_S3C24X0)
+=
s3c24x0_i2c.o exynos_hs_i2c.o
...
...
drivers/i2c/at91_i2c.c
浏览文件 @
b24065c4
...
...
@@ -199,7 +199,7 @@ static int at91_i2c_enable_clk(struct udevice *dev)
return
0
;
}
static
int
at91_i2c_probe
(
struct
udevice
*
dev
,
uint
chip
,
uint
chip_flags
)
static
int
at91_i2c_probe
_chip
(
struct
udevice
*
dev
,
uint
chip
,
uint
chip_flags
)
{
struct
at91_i2c_bus
*
bus
=
dev_get_priv
(
dev
);
struct
at91_i2c_regs
*
reg
=
bus
->
regs
;
...
...
@@ -254,11 +254,32 @@ static int at91_i2c_ofdata_to_platdata(struct udevice *dev)
static
const
struct
dm_i2c_ops
at91_i2c_ops
=
{
.
xfer
=
at91_i2c_xfer
,
.
probe_chip
=
at91_i2c_probe
,
.
probe_chip
=
at91_i2c_probe
_chip
,
.
set_bus_speed
=
at91_i2c_set_bus_speed
,
.
get_bus_speed
=
at91_i2c_get_bus_speed
,
};
static
int
at91_i2c_probe
(
struct
udevice
*
dev
)
{
struct
at91_i2c_bus
*
bus
=
dev_get_priv
(
dev
);
struct
at91_i2c_regs
*
reg
=
bus
->
regs
;
int
ret
;
ret
=
at91_i2c_enable_clk
(
dev
);
if
(
ret
)
return
ret
;
writel
(
TWI_CR_SWRST
,
&
reg
->
cr
);
at91_calc_i2c_clock
(
dev
,
bus
->
clock_frequency
);
writel
(
bus
->
cwgr_val
,
&
reg
->
cwgr
);
writel
(
TWI_CR_MSEN
,
&
reg
->
cr
);
writel
(
TWI_CR_SVDIS
,
&
reg
->
cr
);
return
0
;
}
static
const
struct
at91_i2c_pdata
at91rm9200_config
=
{
.
clk_max_div
=
5
,
.
clk_offset
=
3
,
...
...
@@ -315,6 +336,7 @@ U_BOOT_DRIVER(i2c_at91) = {
.
name
=
"i2c_at91"
,
.
id
=
UCLASS_I2C
,
.
of_match
=
at91_i2c_ids
,
.
probe
=
at91_i2c_probe
,
.
ofdata_to_platdata
=
at91_i2c_ofdata_to_platdata
,
.
per_child_auto_alloc_size
=
sizeof
(
struct
dm_i2c_chip
),
.
priv_auto_alloc_size
=
sizeof
(
struct
at91_i2c_bus
),
...
...
drivers/i2c/designware_i2c.c
浏览文件 @
b24065c4
...
...
@@ -374,7 +374,8 @@ static void __dw_i2c_init(struct i2c_regs *i2c_base, int speed, int slaveaddr)
/* Disable i2c */
dw_i2c_enable
(
i2c_base
,
false
);
writel
((
IC_CON_SD
|
IC_CON_SPD_FS
|
IC_CON_MM
),
&
i2c_base
->
ic_con
);
writel
(
IC_CON_SD
|
IC_CON_RE
|
IC_CON_SPD_FS
|
IC_CON_MM
,
&
i2c_base
->
ic_con
);
writel
(
IC_RX_TL
,
&
i2c_base
->
ic_rx_tl
);
writel
(
IC_TX_TL
,
&
i2c_base
->
ic_tx_tl
);
writel
(
IC_STOP_DET
,
&
i2c_base
->
ic_intr_mask
);
...
...
include/configs/am3517_crane.h
浏览文件 @
b24065c4
...
...
@@ -103,7 +103,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
/*
* Board NAND Info.
...
...
include/configs/am3517_evm.h
浏览文件 @
b24065c4
...
...
@@ -91,7 +91,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
/* Ethernet */
#define CONFIG_DRIVER_TI_EMAC
...
...
include/configs/bur_am335x_common.h
浏览文件 @
b24065c4
...
...
@@ -72,7 +72,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP24XX
/*
* Our platforms make use of SPL to initalize the hardware (primarily
...
...
include/configs/cm_t35.h
浏览文件 @
b24065c4
...
...
@@ -93,7 +93,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0
...
...
include/configs/cm_t3517.h
浏览文件 @
b24065c4
...
...
@@ -101,7 +101,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0
...
...
include/configs/cm_t54.h
浏览文件 @
b24065c4
...
...
@@ -17,7 +17,6 @@
#include <configs/ti_omap5_common.h>
/* EEPROM related defines */
#define CONFIG_SYS_I2C_OMAP34XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0
...
...
include/configs/devkit8000.h
浏览文件 @
b24065c4
...
...
@@ -65,8 +65,6 @@
#undef CONFIG_OMAP3_SPI
/* I2C */
#undef CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_OMAP34XX
/* TWL4030 */
#define CONFIG_TWL4030_LED 1
...
...
include/configs/kc1.h
浏览文件 @
b24065c4
...
...
@@ -60,7 +60,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_I2C_MULTI_BUS
/*
...
...
include/configs/mcx.h
浏览文件 @
b24065c4
...
...
@@ -86,7 +86,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
/* RTC */
#define CONFIG_RTC_DS1337
...
...
include/configs/nokia_rx51.h
浏览文件 @
b24065c4
...
...
@@ -112,7 +112,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
/*
* TWL4030
...
...
include/configs/omap3_evm.h
浏览文件 @
b24065c4
...
...
@@ -143,7 +143,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
/*
* PISMO support
...
...
include/configs/omap3_logic.h
浏览文件 @
b24065c4
...
...
@@ -53,7 +53,6 @@
#define CONFIG_USB_OMAP3
/* I2C */
#define CONFIG_SYS_I2C_OMAP34XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
/* EEPROM AT24C64 */
/* USB */
...
...
include/configs/omap3_overo.h
浏览文件 @
b24065c4
...
...
@@ -34,7 +34,6 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 15))
/* I2C Support */
#define CONFIG_SYS_I2C_OMAP34XX
/* TWL4030 LED */
#define CONFIG_TWL4030_LED
...
...
include/configs/omap3_pandora.h
浏览文件 @
b24065c4
...
...
@@ -29,9 +29,6 @@
* Hardware drivers
*/
/* I2C Support */
#define CONFIG_SYS_I2C_OMAP34XX
/* TWL4030 LED */
#define CONFIG_TWL4030_LED
...
...
include/configs/omap3_zoom1.h
浏览文件 @
b24065c4
...
...
@@ -63,9 +63,6 @@
#endif
#endif
#undef CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_OMAP34XX
/*
* TWL4030
*/
...
...
include/configs/siemens-am33x-common.h
浏览文件 @
b24065c4
...
...
@@ -104,7 +104,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP24XX
/* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK
...
...
include/configs/sniper.h
浏览文件 @
b24065c4
...
...
@@ -62,7 +62,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
#define CONFIG_I2C_MULTI_BUS
/*
...
...
include/configs/tam3517-common.h
浏览文件 @
b24065c4
...
...
@@ -71,7 +71,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
#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/tao3530.h
浏览文件 @
b24065c4
...
...
@@ -69,7 +69,6 @@
"4m(kernel),-(fs)"
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_OMAP34XX
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_I2C_MULTI_BUS
...
...
include/configs/ti_armv7_omap.h
浏览文件 @
b24065c4
...
...
@@ -15,7 +15,6 @@
/* I2C IP block */
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP24XX
/* SPI IP Block */
#define CONFIG_OMAP3_SPI
...
...
include/configs/ti_omap4_common.h
浏览文件 @
b24065c4
...
...
@@ -150,7 +150,6 @@
#ifdef CONFIG_SPL_BUILD
/* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */
#undef CONFIG_SYS_I2C
#undef CONFIG_SYS_I2C_OMAP24XX
#endif
#endif
/* __CONFIG_TI_OMAP4_COMMON_H */
include/configs/tricorder.h
浏览文件 @
b24065c4
...
...
@@ -62,7 +62,6 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX
/* EEPROM */
...
...
scripts/config_whitelist.txt
浏览文件 @
b24065c4
...
...
@@ -3530,8 +3530,6 @@ CONFIG_SYS_I2C_MXC_I2C4
CONFIG_SYS_I2C_NCT72_ADDR
CONFIG_SYS_I2C_NOPROBES
CONFIG_SYS_I2C_OFFSET
CONFIG_SYS_I2C_OMAP24XX
CONFIG_SYS_I2C_OMAP34XX
CONFIG_SYS_I2C_PCA953X_ADDR
CONFIG_SYS_I2C_PCA953X_ADDR0
CONFIG_SYS_I2C_PCA953X_ADDR1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录