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-omapl138-hawk.c | |
parent | fc89017c83b77dd50da2ce893184483a7718f353 (diff) | |
download | op-kernel-dev-766763dbdc1dca11deabdb00077a1c19e2803f0a.zip op-kernel-dev-766763dbdc1dca11deabdb00077a1c19e2803f0a.tar.gz |
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-omapl138-hawk.c')
-rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index ee62486..e1efa10 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/console.h> #include <linux/gpio.h> +#include <linux/mfd/da8xx-cfgchip.h> #include <linux/platform_data/gpio-davinci.h> #include <asm/mach-types.h> @@ -254,7 +255,7 @@ static __init void omapl138_hawk_usb_init(void) /* Setup the Ref. clock frequency for the HAWK at 24 MHz. */ cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG)); - cfgchip2 &= ~CFGCHIP2_REFFREQ; + cfgchip2 &= ~CFGCHIP2_REFFREQ_MASK; cfgchip2 |= CFGCHIP2_REFFREQ_24MHZ; __raw_writel(cfgchip2, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG)); |