Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1508248 > unrolled thread
| Started by | Alexandre Bailon <abailon@baylibre.com> |
|---|---|
| First post | 2016-10-25 14:20 +0200 |
| Last post | 2016-10-26 14:50 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v2] ARM: davinci: da8xx: Fix some redefined symbol warnings Alexandre Bailon <abailon@baylibre.com> - 2016-10-25 14:20 +0200
Re: [PATCH v2] ARM: davinci: da8xx: Fix some redefined symbol warnings Sekhar Nori <nsekhar@ti.com> - 2016-10-26 14:00 +0200
Re: [PATCH v2] ARM: davinci: da8xx: Fix some redefined symbol warnings Alexandre Bailon <abailon@baylibre.com> - 2016-10-26 14:50 +0200
| From | Alexandre Bailon <abailon@baylibre.com> |
|---|---|
| Date | 2016-10-25 14:20 +0200 |
| Subject | [PATCH v2] ARM: davinci: da8xx: Fix some redefined symbol warnings |
| Message-ID | <sw8RY-5yg-3@gated-at.bofh.it> |
Some macro for DA8xx CFGCHIP are defined in usb-davinci.h, but da8xx-cfgchip.h intend to replace them. The usb-da8xx.c is using both headers, causing redefined symbol warnings. Remove the macro and update the da830-evm board file to use da8xx-cfgchip.h Signed-off-by: Alexandre Bailon <abailon@baylibre.com> --- arch/arm/mach-davinci/board-da830-evm.c | 3 ++- include/linux/platform_data/usb-davinci.h | 23 ----------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 3d8cf8c..9817316 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -27,6 +27,7 @@ #include <linux/platform_data/mtd-davinci-aemif.h> #include <linux/platform_data/spi-davinci.h> #include <linux/platform_data/usb-davinci.h> +#include <linux/mfd/da8xx-cfgchip.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -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 diff --git a/include/linux/platform_data/usb-davinci.h b/include/linux/platform_data/usb-davinci.h index e0bc4ab..0926e99 100644 --- a/include/linux/platform_data/usb-davinci.h +++ b/include/linux/platform_data/usb-davinci.h @@ -11,29 +11,6 @@ #ifndef __ASM_ARCH_USB_H #define __ASM_ARCH_USB_H -/* DA8xx CFGCHIP2 (USB 2.0 PHY Control) register bits */ -#define CFGCHIP2_PHYCLKGD (1 << 17) -#define CFGCHIP2_VBUSSENSE (1 << 16) -#define CFGCHIP2_RESET (1 << 15) -#define CFGCHIP2_OTGMODE (3 << 13) -#define CFGCHIP2_NO_OVERRIDE (0 << 13) -#define CFGCHIP2_FORCE_HOST (1 << 13) -#define CFGCHIP2_FORCE_DEVICE (2 << 13) -#define CFGCHIP2_FORCE_HOST_VBUS_LOW (3 << 13) -#define CFGCHIP2_USB1PHYCLKMUX (1 << 12) -#define CFGCHIP2_USB2PHYCLKMUX (1 << 11) -#define CFGCHIP2_PHYPWRDN (1 << 10) -#define CFGCHIP2_OTGPWRDN (1 << 9) -#define CFGCHIP2_DATPOL (1 << 8) -#define CFGCHIP2_USB1SUSPENDM (1 << 7) -#define CFGCHIP2_PHY_PLLON (1 << 6) /* override PLL suspend */ -#define CFGCHIP2_SESENDEN (1 << 5) /* Vsess_end comparator */ -#define CFGCHIP2_VBDTCTEN (1 << 4) /* Vbus comparator */ -#define CFGCHIP2_REFFREQ (0xf << 0) -#define CFGCHIP2_REFFREQ_12MHZ (1 << 0) -#define CFGCHIP2_REFFREQ_24MHZ (2 << 0) -#define CFGCHIP2_REFFREQ_48MHZ (3 << 0) - struct da8xx_ohci_root_hub; typedef void (*da8xx_ocic_handler_t)(struct da8xx_ohci_root_hub *hub, -- 2.7.3
[toc] | [next] | [standalone]
| From | Sekhar Nori <nsekhar@ti.com> |
|---|---|
| Date | 2016-10-26 14:00 +0200 |
| Subject | Re: [PATCH v2] ARM: davinci: da8xx: Fix some redefined symbol warnings |
| Message-ID | <swv29-35P-9@gated-at.bofh.it> |
| In reply to | #1508248 |
On Tuesday 25 October 2016 05:41 PM, Alexandre Bailon wrote: > Some macro for DA8xx CFGCHIP are defined in usb-davinci.h, > but da8xx-cfgchip.h intend to replace them. > The usb-da8xx.c is using both headers, causing redefined symbol warnings. > Remove the macro and update the da830-evm board file to use da8xx-cfgchip.h > > Signed-off-by: Alexandre Bailon <abailon@baylibre.com> This leads to build error on v4.9-rc2: arch/arm/mach-davinci/board-da830-evm.c: In function 'da830_evm_usb_init': arch/arm/mach-davinci/board-da830-evm.c:120:15: error: 'CFGCHIP2_REFFREQ' undeclared (first use in this function) cfgchip2 &= ~CFGCHIP2_REFFREQ; Thanks, Sekhar
[toc] | [prev] | [next] | [standalone]
| From | Alexandre Bailon <abailon@baylibre.com> |
|---|---|
| Date | 2016-10-26 14:50 +0200 |
| Subject | Re: [PATCH v2] ARM: davinci: da8xx: Fix some redefined symbol warnings |
| Message-ID | <swvOx-3Ml-17@gated-at.bofh.it> |
| In reply to | #1509113 |
On 10/26/2016 01:57 PM, Sekhar Nori wrote: > On Tuesday 25 October 2016 05:41 PM, Alexandre Bailon wrote: >> Some macro for DA8xx CFGCHIP are defined in usb-davinci.h, >> but da8xx-cfgchip.h intend to replace them. >> The usb-da8xx.c is using both headers, causing redefined symbol warnings. >> Remove the macro and update the da830-evm board file to use da8xx-cfgchip.h >> >> Signed-off-by: Alexandre Bailon <abailon@baylibre.com> > > This leads to build error on v4.9-rc2: Oops! Sorry for that. I will fit it. > > arch/arm/mach-davinci/board-da830-evm.c: In function 'da830_evm_usb_init': > arch/arm/mach-davinci/board-da830-evm.c:120:15: error: 'CFGCHIP2_REFFREQ' undeclared (first use in this function) > cfgchip2 &= ~CFGCHIP2_REFFREQ; > > Thanks, > Sekhar >
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web