diff options
| author | Alexandre Bailon <abailon@baylibre.com> | 2016-10-27 17:32:36 +0200 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2016-10-31 16:51:56 +0530 |
| commit | 766763dbdc1dca11deabdb00077a1c19e2803f0a (patch) | |
| tree | 2e96b8c1227b1eac0ba40d30a524ff7701490f0f /arch/arm/mach-davinci/board-da830-evm.c | |
| parent | fc89017c83b77dd50da2ce893184483a7718f353 (diff) | |
| download | lwn-766763dbdc1dca11deabdb00077a1c19e2803f0a.tar.gz lwn-766763dbdc1dca11deabdb00077a1c19e2803f0a.zip | |
ARM: davinci: da8xx: Remove duplicated defines
Some macro for DA8xx CFGCHIP are defined in usb-davinci.h,
but da8xx-cfgchip.h intend to replace them.
Remove duplicated defines between da8xx-cfgchip.h and usb-davinci.h
Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-da830-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-da830-evm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 3d8cf8cbd98a..df1f4091a8ae 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -18,6 +18,7 @@ #include <linux/i2c.h> #include <linux/i2c/pcf857x.h> #include <linux/platform_data/at24.h> +#include <linux/mfd/da8xx-cfgchip.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/spi/spi.h> @@ -116,7 +117,7 @@ static __init void da830_evm_usb_init(void) cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG)); /* USB2.0 PHY reference clock is 24 MHz */ - cfgchip2 &= ~CFGCHIP2_REFFREQ; + cfgchip2 &= ~CFGCHIP2_REFFREQ_MASK; cfgchip2 |= CFGCHIP2_REFFREQ_24MHZ; /* @@ -133,7 +134,7 @@ static __init void da830_evm_usb_init(void) * controller won't be able to drive VBUS thinking that it's a B-device. * Otherwise, we want to use the OTG mode and enable VBUS comparators. */ - cfgchip2 &= ~CFGCHIP2_OTGMODE; + cfgchip2 &= ~CFGCHIP2_OTGMODE_MASK; #ifdef CONFIG_USB_MUSB_HOST cfgchip2 |= CFGCHIP2_FORCE_HOST; #else |