diff options
author | Tom Rini <trini@konsulko.com> | 2016-10-30 08:11:50 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-10-30 08:11:50 -0400 |
commit | 7ce79599a1b8f2078b15fa170f11f2666200b24e (patch) | |
tree | dcf8df06f13a5cb6ac4903605d96b7b6434a045d /drivers/i2c/mvtwsi.c | |
parent | 4ddc981225288e68d45eb8e33271d1481920086f (diff) | |
parent | fed329aebe3aaac0928c73547ac6316af2adf0cd (diff) |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers/i2c/mvtwsi.c')
-rw-r--r-- | drivers/i2c/mvtwsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 60c8ea1914..cea3da0b27 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; #include <asm/arch/orion5x.h> #elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) #include <asm/arch/soc.h> -#elif defined(CONFIG_SUNXI) +#elif defined(CONFIG_ARCH_SUNXI) #include <asm/arch/i2c.h> #else #error Driver mvtwsi not supported by SoC or board @@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR; * TWSI register structure */ -#ifdef CONFIG_SUNXI +#ifdef CONFIG_ARCH_SUNXI struct mvtwsi_registers { u32 slave_address; @@ -399,7 +399,7 @@ static int twsi_stop(struct mvtwsi_registers *twsi, uint tick) */ static uint twsi_calc_freq(const int n, const int m) { -#ifdef CONFIG_SUNXI +#ifdef CONFIG_ARCH_SUNXI return CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n)); #else return CONFIG_SYS_TCLK / (10 * (m + 1) * (2 << n)); |