Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1507452
| From | ahaslam@baylibre.com |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH/RFT v2 06/17] ARM: davinci: da8xx: Fix some redefined symbol warnings |
| Date | 2016-10-24 19:00 +0200 |
| Message-ID | <svQLo-1O1-19@gated-at.bofh.it> (permalink) |
| References | <svQBH-1Ks-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Alexandre Bailon <abailon@baylibre.com> 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 old macros. Signed-off-by: Alexandre Bailon <abailon@baylibre.com> --- include/linux/platform_data/usb-davinci.h | 23 ----------------------- 1 file changed, 23 deletions(-) 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, -- 1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH/RFT v2 00/17] Add DT support for ohci-da8xx ahaslam@baylibre.com - 2016-10-24 18:50 +0200
[PATCH/RFT v2 01/17] ARM: davinci: da8xx: add usb phy clocks ahaslam@baylibre.com - 2016-10-24 18:50 +0200
[PATCH/RFT v2 15/17] usb: host: ohci-da8xx: Add devicetree bindings documentation ahaslam@baylibre.com - 2016-10-24 18:50 +0200
Re: [PATCH/RFT v2 15/17] usb: host: ohci-da8xx: Add devicetree bindings documentation David Lechner <david@lechnology.com> - 2016-10-25 03:10 +0200
Re: [PATCH/RFT v2 15/17] usb: host: ohci-da8xx: Add devicetree bindings documentation Axel Haslam <ahaslam@baylibre.com> - 2016-10-25 12:00 +0200
[PATCH/RFT v2 07/17] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable ahaslam@baylibre.com - 2016-10-24 18:50 +0200
Re: [PATCH/RFT v2 07/17] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable David Lechner <david@lechnology.com> - 2016-10-25 05:00 +0200
Re: [PATCH/RFT v2 07/17] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable Axel Haslam <ahaslam@baylibre.com> - 2016-10-25 12:10 +0200
Re: [PATCH/RFT v2 07/17] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable Sekhar Nori <nsekhar@ti.com> - 2016-10-25 12:20 +0200
Re: [PATCH/RFT v2 07/17] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable David Lechner <david@lechnology.com> - 2016-10-25 18:10 +0200
Re: [PATCH/RFT v2 07/17] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable Sekhar Nori <nsekhar@ti.com> - 2016-10-26 11:40 +0200
[PATCH/RFT v2 10/17] USB: da8xx: use flag instead of bitmask for over current change ahaslam@baylibre.com - 2016-10-24 18:50 +0200
[PATCH/RFT v2 16/17] USB: ohci-da8xx: Allow probing from DT ahaslam@baylibre.com - 2016-10-24 18:50 +0200
Re: [PATCH/RFT v2 16/17] USB: ohci-da8xx: Allow probing from DT David Lechner <david@lechnology.com> - 2016-10-25 03:00 +0200
Re: [PATCH/RFT v2 16/17] USB: ohci-da8xx: Allow probing from DT Axel Haslam <ahaslam@baylibre.com> - 2016-10-25 10:20 +0200
[PATCH/RFT v2 02/17] ARM: davinci: da8xx: Add CFGCHIP syscon platform declaration. ahaslam@baylibre.com - 2016-10-24 18:50 +0200
Re: [PATCH/RFT v2 02/17] ARM: davinci: da8xx: Add CFGCHIP syscon platform declaration. Sekhar Nori <nsekhar@ti.com> - 2016-10-25 10:20 +0200
Re: [PATCH/RFT v2 02/17] ARM: davinci: da8xx: Add CFGCHIP syscon platform declaration. Axel Haslam <ahaslam@baylibre.com> - 2016-10-25 11:40 +0200
Re: [PATCH/RFT v2 02/17] ARM: davinci: da8xx: Add CFGCHIP syscon platform declaration. Sekhar Nori <nsekhar@ti.com> - 2016-10-25 12:20 +0200
Re: [PATCH/RFT v2 02/17] ARM: davinci: da8xx: Add CFGCHIP syscon platform declaration. David Lechner <david@lechnology.com> - 2016-10-25 18:00 +0200
Re: [PATCH/RFT v2 02/17] ARM: davinci: da8xx: Add CFGCHIP syscon platform declaration. Sekhar Nori <nsekhar@ti.com> - 2016-10-26 11:00 +0200
[PATCH/RFT v2 04/17] ARM: DTS: da850: Add cfgchip syscon node ahaslam@baylibre.com - 2016-10-24 19:00 +0200
[PATCH/RFT v2 03/17] ARM: davinci: da8xx: Add USB PHY platform declaration ahaslam@baylibre.com - 2016-10-24 19:00 +0200
Re: [PATCH/RFT v2 03/17] ARM: davinci: da8xx: Add USB PHY platform declaration Sekhar Nori <nsekhar@ti.com> - 2016-10-25 11:20 +0200
Re: [PATCH/RFT v2 03/17] ARM: davinci: da8xx: Add USB PHY platform declaration Axel Haslam <ahaslam@baylibre.com> - 2016-10-25 11:40 +0200
[PATCH/RFT v2 08/17] ARM: davinci: hawk: add full constraints for ohci plat boot ahaslam@baylibre.com - 2016-10-24 19:00 +0200
Re: [PATCH/RFT v2 08/17] ARM: davinci: hawk: add full constraints for ohci plat boot Sekhar Nori <nsekhar@ti.com> - 2016-10-25 12:40 +0200
Re: [PATCH/RFT v2 08/17] ARM: davinci: hawk: add full constraints for ohci plat boot Axel Haslam <ahaslam@baylibre.com> - 2016-10-25 12:40 +0200
[PATCH/RFT v2 06/17] ARM: davinci: da8xx: Fix some redefined symbol warnings ahaslam@baylibre.com - 2016-10-24 19:00 +0200
Re: [PATCH/RFT v2 06/17] ARM: davinci: da8xx: Fix some redefined symbol warnings Sekhar Nori <nsekhar@ti.com> - 2016-10-25 12:10 +0200
Re: [PATCH/RFT v2 06/17] ARM: davinci: da8xx: Fix some redefined symbol warnings Alexandre Bailon <abailon@baylibre.com> - 2016-10-25 14:20 +0200
[PATCH/RFT v2 05/17] ARM: DTS: da850: Add usb phy node ahaslam@baylibre.com - 2016-10-24 19:00 +0200
Re: [PATCH/RFT v2 00/17] Add DT support for ohci-da8xx Sekhar Nori <nsekhar@ti.com> - 2016-10-25 13:00 +0200
csiph-web