diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-29 22:36:25 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-29 22:36:25 (GMT) |
commit | 108f56b056780f0d23f720d98709304f84a0d6c8 (patch) | |
tree | 2a2eb0ab998cfdbf6275dcf282ab282056a14f30 /include/configs | |
parent | 4c2e3da82dc2b7f8b39b7f1d57f570e4bc5caa6d (diff) | |
parent | bb4291e62579dbc611e84eaaf973631e0bf129c7 (diff) | |
download | u-boot-108f56b056780f0d23f720d98709304f84a0d6c8.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/nhk8815.h | 18 | ||||
-rw-r--r-- | include/configs/omap3_beagle.h | 6 | ||||
-rw-r--r-- | include/configs/omap3_evm.h | 5 | ||||
-rw-r--r-- | include/configs/omap3_overo.h | 6 | ||||
-rw-r--r-- | include/configs/omap3_pandora.h | 6 | ||||
-rw-r--r-- | include/configs/omap3_zoom1.h | 6 | ||||
-rw-r--r-- | include/configs/omap3_zoom2.h | 6 |
7 files changed, 52 insertions, 1 deletions
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h index 3e2e09f..8a83d92 100644 --- a/include/configs/nhk8815.h +++ b/include/configs/nhk8815.h @@ -93,7 +93,7 @@ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */ #define CONFIG_SYS_64BIT_VSPRINTF /* mtd desires this */ -#define CONFIG_MISC_INIT_R /* call misc_init_r during start up */ +#define BOARD_LATE_INIT /* call board_late_init during start up */ /* timing informazion */ #define CONFIG_SYS_HZ 1000 /* Mandatory... */ @@ -110,6 +110,22 @@ #define CONFIG_PL01x_PORTS { (void *)CFG_SERIAL0, (void *)CFG_SERIAL1 } #define CONFIG_PL011_CLOCK 48000000 +/* i2c, for the port extenders (uses gpio.c in board directory) */ +#ifndef __ASSEMBLY__ +#include <asm/arch/gpio.h> +#define CONFIG_CMD_I2C +#define CONFIG_SOFT_I2C +#define CONFIG_SYS_I2C_SPEED 400000 +#define __SDA 63 +#define __SCL 62 +#define I2C_SDA(x) nmk_gpio_set(__SDA, x) +#define I2C_SCL(x) nmk_gpio_set(__SCL, x) +#define I2C_READ (nmk_gpio_get(__SDA)!=0) +#define I2C_ACTIVE nmk_gpio_dir(__SDA, 1) +#define I2C_TRISTATE nmk_gpio_dir(__SDA, 0) +#define I2C_DELAY (udelay(2)) +#endif /* __ASSEMBLY__ */ + /* Ethernet */ #define PCI_MEMORY_VADDR 0xe8000000 #define PCI_IO_VADDR 0xee000000 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a1a849e..8fc6fb2 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -130,6 +130,12 @@ #define CONFIG_DRIVER_OMAP34XX_I2C 1 /* + * TWL4030 + */ +#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_LED 1 + +/* * Board NAND Info. */ #define CONFIG_NAND_OMAP_GPMC diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 3d9d72c..809198b 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -128,6 +128,11 @@ #define CONFIG_DRIVER_OMAP34XX_I2C 1 /* + * TWL4030 + */ +#define CONFIG_TWL4030_POWER 1 + +/* * Board NAND Info. */ #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 3bf798a..c359c60 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -116,6 +116,12 @@ #define CONFIG_DRIVER_OMAP34XX_I2C 1 /* + * TWL4030 + */ +#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_LED 1 + +/* * Board NAND Info. */ #define CONFIG_NAND_OMAP_GPMC diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index d7e0ea1..d7b1cc1 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -119,6 +119,12 @@ #define CONFIG_DRIVER_OMAP34XX_I2C 1 /* + * TWL4030 + */ +#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_LED 1 + +/* * Board NAND Info. */ #define CONFIG_NAND_OMAP_GPMC diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 4034ea4..676b425 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -126,6 +126,12 @@ #define CONFIG_DRIVER_OMAP34XX_I2C 1 /* + * TWL4030 + */ +#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_LED 1 + +/* * Board NAND Info. */ #define CONFIG_NAND_OMAP_GPMC diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 701a296..3f6f545 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -147,6 +147,12 @@ #define CONFIG_DRIVER_OMAP34XX_I2C 1 /* + * TWL4030 + */ +#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_LED 1 + +/* * Board NAND Info. */ #define CONFIG_NAND_OMAP_GPMC |