random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-03 21:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot

Browse Source
This commit is contained in:
Kim Phillips 2013-01-29 17:30:39 -06:00
commit 8f171a56b5
19 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/mxs_i2c.c
View File

@ -37,7 +37,7 @@
#define MXS_I2C_MAX_TIMEOUT 1000000 #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; struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE;
int ret; int ret;
@ -59,7 +59,7 @@ void mxs_i2c_reset(void)
i2c_set_bus_speed(speed); 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; 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); 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) uchar *buf, int blen, int stop)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; 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); 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; struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE;
uint32_t tmp; uint32_t tmp;

2
include/configs/am3517_crane.h
View File

@ -156,8 +156,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
#undef CONFIG_CMD_NET #undef CONFIG_CMD_NET

2
include/configs/am3517_evm.h
View File

@ -150,8 +150,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
#undef CONFIG_CMD_NET #undef CONFIG_CMD_NET

2
include/configs/cm_t35.h
View File

@ -157,8 +157,6 @@
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1

2
include/configs/devkit8000.h
View File

@ -108,8 +108,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* TWL4030 */ /* TWL4030 */

2
include/configs/dig297.h
View File

@ -141,8 +141,6 @@
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* /*

2
include/configs/igep00x0.h
View File

@ -129,8 +129,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* /*

1
include/configs/mcx.h
View File

@ -151,7 +151,6 @@
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_DRIVER_OMAP34XX_I2C #define CONFIG_DRIVER_OMAP34XX_I2C
/* RTC */ /* RTC */

2
include/configs/omap3_beagle.h
View File

@ -178,8 +178,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_I2C_MULTI_BUS 1
#define CONFIG_DRIVER_OMAP34XX_I2C 1 #define CONFIG_DRIVER_OMAP34XX_I2C 1
#define CONFIG_VIDEO_OMAP3 /* DSS Support */ #define CONFIG_VIDEO_OMAP3 /* DSS Support */

2
include/configs/omap3_evm_common.h
View File

@ -100,8 +100,6 @@
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
/* /*
* PISMO support * PISMO support

2
include/configs/omap3_logic.h
View File

@ -138,8 +138,6 @@
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SYS_I2C_BUS 0
#define CONFIG_SYS_I2C_BUS_SELECT 1
#define CONFIG_I2C_MULTI_BUS #define CONFIG_I2C_MULTI_BUS
/* /*

2
include/configs/omap3_mvblx.h
View File

@ -142,8 +142,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 0 #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_DRIVER_OMAP34XX_I2C 1
#define CONFIG_I2C_MULTI_BUS 1 #define CONFIG_I2C_MULTI_BUS 1

2
include/configs/omap3_pandora.h
View File

@ -126,8 +126,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* /*

2
include/configs/omap3_sdp3430.h
View File

@ -132,8 +132,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* OMITTED: single 1 Gbit MT29F1G NAND flash */ /* OMITTED: single 1 Gbit MT29F1G NAND flash */

2
include/configs/omap3_zoom1.h
View File

@ -136,8 +136,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* /*

2
include/configs/omap3_zoom2.h
View File

@ -156,8 +156,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* /*

2
include/configs/omap4_common.h
View File

@ -91,8 +91,6 @@
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
#define CONFIG_I2C_MULTI_BUS 1 #define CONFIG_I2C_MULTI_BUS 1

2
include/configs/tam3517-common.h
View File

@ -131,8 +131,6 @@
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 1 #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 0x50 /* base address */
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */
#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07 #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07

2
include/configs/tricorder.h
View File

@ -98,8 +98,6 @@
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #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_DRIVER_OMAP34XX_I2C 1
/* TWL4030 */ /* TWL4030 */