diff options
author | Wolfgang Denk <wd@denx.de> | 2010-08-07 22:33:06 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-08-07 22:33:06 +0200 |
commit | 3df4f46f3209c067dcadc969ed02d27c97fa3632 (patch) | |
tree | 4639307e5e9120b0c80c62da8376be3e406e84fb /include/configs/bf533-stamp.h | |
parent | 9efac4a1eb99d9c5539aa6992025eeacab7980c6 (diff) | |
parent | c519facc645812c6d174c2d5b60241d23e285642 (diff) | |
download | u-boot-imx-3df4f46f3209c067dcadc969ed02d27c97fa3632.zip u-boot-imx-3df4f46f3209c067dcadc969ed02d27c97fa3632.tar.gz u-boot-imx-3df4f46f3209c067dcadc969ed02d27c97fa3632.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/bf533-stamp.h')
-rw-r--r-- | include/configs/bf533-stamp.h | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 02c8bc3..f39bfee 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -138,49 +138,10 @@ /* * I2C Settings - * By default PF2 is used as SDA and PF3 as SCL on the Stamp board */ #define CONFIG_SOFT_I2C -#ifdef CONFIG_SOFT_I2C -#define PF_SCL PF3 -#define PF_SDA PF2 -#define I2C_INIT \ - do { \ - *pFIO_DIR |= PF_SCL; \ - SSYNC(); \ - } while (0) -#define I2C_ACTIVE \ - do { \ - *pFIO_DIR |= PF_SDA; \ - *pFIO_INEN &= ~PF_SDA; \ - SSYNC(); \ - } while (0) -#define I2C_TRISTATE \ - do { \ - *pFIO_DIR &= ~PF_SDA; \ - *pFIO_INEN |= PF_SDA; \ - SSYNC(); \ - } while (0) -#define I2C_READ ((*pFIO_FLAG_D & PF_SDA) != 0) -#define I2C_SDA(bit) \ - do { \ - if (bit) \ - *pFIO_FLAG_S = PF_SDA; \ - else \ - *pFIO_FLAG_C = PF_SDA; \ - SSYNC(); \ - } while (0) -#define I2C_SCL(bit) \ - do { \ - if (bit) \ - *pFIO_FLAG_S = PF_SCL; \ - else \ - *pFIO_FLAG_C = PF_SCL; \ - SSYNC(); \ - } while (0) -#define I2C_DELAY udelay(5) /* 1/4 I2C clock duration */ - -#endif +#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF3 +#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF2 /* |