From patchwork Mon Oct 24 16:46:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 79007 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp2679759qge; Mon, 24 Oct 2016 09:49:21 -0700 (PDT) X-Received: by 10.99.1.23 with SMTP id 23mr25325251pgb.37.1477327761042; Mon, 24 Oct 2016 09:49:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e14si16228878pfl.105.2016.10.24.09.49.20; Mon, 24 Oct 2016 09:49:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965434AbcJXQsY (ORCPT + 4 others); Mon, 24 Oct 2016 12:48:24 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:38773 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941162AbcJXQqz (ORCPT ); Mon, 24 Oct 2016 12:46:55 -0400 Received: by mail-wm0-f48.google.com with SMTP id c78so125387911wme.1 for ; Mon, 24 Oct 2016 09:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ALm9UiSAf3E/P0DYnfzSOO41X034PTm3p3TnyWtMBeo=; b=doz5GgCR6hqjcAm9ufvT7rR8aVFxJkK6CEzk5SL1F7TUnel3lJYfOBBbAM0T5R2mNo F6SFRCz8F5yCWP2Np4FmCz9sDqVyL5io9bbGgOE5+QNb81UVw5Ch0QlpWQkWl3XteFFl rcFyTBZ6grIUXpAstXnZ0a4F/GWk+WGU8Pm0uVYNZDv6zOWdHH5yatCradIw5+RKp/fS AE8SlZPaD74i7GJiuLxIO2mTwS1cLSJVT7W7D+h7V8b9MfIJyiuF6FhjWdCuJQlvK+ea 6+NCza42WxfHtn4aBaC4d9XRkqimRhlKZaOWiiTrhgM4PhOFcgm1Mv2aLpmeHJfrzXWj 7xXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ALm9UiSAf3E/P0DYnfzSOO41X034PTm3p3TnyWtMBeo=; b=Yq4PfVdleQOm0jCPz/NnphfOaAgk9p4GwIc0rb6a815DF0FspKpGyUwvT3UH+5VqO6 0bokdq6VvmqMSoXVAxatnfEYYjfYrpc7Dcd2joVopH4gJLjtD1j8MouWASWiyjBTdciK fA3DKxBKqn274jXHLaUYTNB2VZDnq+5E7xuXXw1kCARVhoKnXzO1DrSQ0x7kYAmdpty1 9ac/WOWlgGBBad+cIMw5ChTZXbSkBR7tXujYq+3a9qlDhFCJfSPXFEfN3Zf4h7sdy1bZ Br5PSqh8MgfpllJT5XtZnyA9nGbkdbtZZDWz6LoNobVYgS16PymAUKH9lF9vYSrs/VhN 5FAg== X-Gm-Message-State: ABUngvednqNUqzOWu9N47hdOUCu6qLV5bHU8MrvQ8ohBHdSsZ2oJowlqJd40siUcTRymjukm X-Received: by 10.194.36.103 with SMTP id p7mr12590712wjj.214.1477327607485; Mon, 24 Oct 2016 09:46:47 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id o62sm15710148wmg.9.2016.10.24.09.46.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Oct 2016 09:46:47 -0700 (PDT) From: ahaslam@baylibre.com To: gregkh@linuxfoundation.org, johan@kernel.org, robh+dt@kernel.org, nsekhar@ti.com, stern@rowland.harvard.edu, khilman@baylibre.com, sshtylyov@ru.mvista.com, david@lechnology.com, manjunath.goudar@linaro.org, broonie@kernel.org, abailon@baylibre.com Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH/RFT v2 06/17] ARM: davinci: da8xx: Fix some redefined symbol warnings Date: Mon, 24 Oct 2016 18:46:23 +0200 Message-Id: <20161024164634.4330-7-ahaslam@baylibre.com> X-Mailer: git-send-email 2.10.1.502.g6598894 In-Reply-To: <20161024164634.4330-1-ahaslam@baylibre.com> References: <20161024164634.4330-1-ahaslam@baylibre.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Alexandre Bailon 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 --- include/linux/platform_data/usb-davinci.h | 23 ----------------------- 1 file changed, 23 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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,