From patchwork Tue Oct 25 12:11:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 79163 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3077218qge; Tue, 25 Oct 2016 05:12:11 -0700 (PDT) X-Received: by 10.98.5.195 with SMTP id 186mr6569514pff.117.1477397530987; Tue, 25 Oct 2016 05:12:10 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a66si20398945pfe.90.2016.10.25.05.12.10; Tue, 25 Oct 2016 05:12:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965871AbcJYML6 (ORCPT + 27 others); Tue, 25 Oct 2016 08:11:58 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36347 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965400AbcJYML4 (ORCPT ); Tue, 25 Oct 2016 08:11:56 -0400 Received: by mail-wm0-f44.google.com with SMTP id b80so160057438wme.1 for ; Tue, 25 Oct 2016 05:11:55 -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=2OGjcpIdUzGfdPTlN9jHbzcuzVD20EW+H+Was22BXZQ=; b=dwM4smmEN/eg3wAaNhoZ4rfY2+W+X30rDuYFsDW8+fUhWyciootP9M8++I+ZbLKVjN xGXZtJ/SQ5vVt+eGX5vYo59wgeHVhI8hlZcwq3SyiwBlMvA41QYaFQbv+Sop17jNjCLG Ow7rFgJfVZ60UkjjxLwq/FY3VJ20+YU8SEhiDnipYbIrZ0ZTX3c5FaDASSIfRNFDOz63 gosA+2AjERpYBlxC2wN05QoG7BwUU6MiPFIg8w6WegAcsJoEW8BCIh7AK7mjffPmbkRP CaWInqeE6V0fF9+muUFsUw9uYJ7+wc92n7ulSOMQqDJoy7L1u5mfclfNhng6pNuyZJKB pE7g== 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=2OGjcpIdUzGfdPTlN9jHbzcuzVD20EW+H+Was22BXZQ=; b=c0ZRmW6580ckIZpjTwEy042CKzBFPVAoYuX2Bv3y8lgh8eZOOaDletB5KaC4mQLxPh DZbD/545sqwXhg1jkMEiWT3FCxCNJ7jAHAWWk61i2JcFOVAFKXaEQgOp+CmqRW42kPTB dPaUgXpDbw9KUt5TPyINxie68j+dyWteiOmfeLhRny6QQKckLoleMn3k31/YMEL9ptWj ZXuWmjEsSl9gr1Oo5ulQsUa6iVVQF3HTrNpnVh+5vnCsmTc0ZKQgr7yM3t1l1rAQjb4d PCt8UofADiOqRu1sxHYAJpiG7Ku22mCNiwmQC+nLkMaJS9l0dB5nLQLC72ibCWR5Vm9p QLww== X-Gm-Message-State: ABUngvdGwcAoogEE6Nrpa86FXXPn2FM4CSvoYbhCrGePq7WtTJoBCnYZa+AiMHzi8n9xoBax X-Received: by 10.194.51.163 with SMTP id l3mr15959181wjo.125.1477397509636; Tue, 25 Oct 2016 05:11:49 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 18sm3352056wmr.6.2016.10.25.05.11.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 05:11:49 -0700 (PDT) From: Alexandre Bailon To: gregkh@linuxfoundation.org, khilman@baylibre.com, nsekhar@ti.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexandre Bailon Subject: [PATCH v2] ARM: davinci: da8xx: Fix some redefined symbol warnings Date: Tue, 25 Oct 2016 14:11:32 +0200 Message-Id: <1477397492-7925-2-git-send-email-abailon@baylibre.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1477397492-7925-1-git-send-email-abailon@baylibre.com> References: <1477397492-7925-1-git-send-email-abailon@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/mach-davinci/board-da830-evm.c | 3 ++- include/linux/platform_data/usb-davinci.h | 23 ----------------------- 2 files changed, 2 insertions(+), 24 deletions(-) -- 2.7.3 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 #include #include +#include #include #include @@ -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,