From patchwork Tue Jul 8 15:11:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 33233 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5745A20969 for ; Tue, 8 Jul 2014 15:14:49 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf42565499pab.7 for ; Tue, 08 Jul 2014 08:14:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=jRGhfae+4dgenO3+z1rtB0+H3MUZtkWggDa7BTLAP2k=; b=kJbhXMeiZJ1yNyJek1dESVhrGeTKUXNjCO7ow1UEpAQwPBMobFB3lsrBvhjsblYgBb aYEHtg1ULZ+Tz+GRKDH05fIpiEEgEZN7CdKuMOOT5hW+sZje8UMFc3THgQS90jd4ZzXV jHy848m/5GmZ+eLjz6zPAKGu5T2Lq2+GDCf8KhU/NFVr84kHrIGGNzd8vDsFksyTyGQY 7BhVIxmgWHiGtzfrbBVzivV9BpFVPYyokfRbJJPkRBC2YgxPXdAW6UqVAH4TOeTU0I6w axdybKyfOUGAAdU+OBMjaXMTcVp8jK5hGP2n2NFg7ElonWKYv5w+MhTlcJtkYwTjB/QL v4vQ== X-Gm-Message-State: ALoCoQnFHGPGtTKbmpvM0G2rGn4q6x/Ywkgkl23A/ExTcwabbPj0E3rLIoNIEA6n1sqUAZd3yvbB X-Received: by 10.66.230.226 with SMTP id tb2mr16051252pac.41.1404832488518; Tue, 08 Jul 2014 08:14:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.241 with SMTP id 104ls2125672qgv.21.gmail; Tue, 08 Jul 2014 08:14:48 -0700 (PDT) X-Received: by 10.220.1.70 with SMTP id 6mr897094vce.62.1404832488418; Tue, 08 Jul 2014 08:14:48 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id p10si15819358vck.17.2014.07.08.08.14.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Jul 2014 08:14:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so5817422veb.34 for ; Tue, 08 Jul 2014 08:14:48 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr95523vcf.71.1404832488341; Tue, 08 Jul 2014 08:14:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp778715vcb; Tue, 8 Jul 2014 08:14:47 -0700 (PDT) X-Received: by 10.70.134.165 with SMTP id pl5mr2966808pdb.140.1404832487517; Tue, 08 Jul 2014 08:14:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cl2si6169495pdb.280.2014.07.08.08.14.46; Tue, 08 Jul 2014 08:14:46 -0700 (PDT) Received-SPF: none (google.com: linux-arm-msm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750927AbaGHPOq (ORCPT + 3 others); Tue, 8 Jul 2014 11:14:46 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38291 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707AbaGHPOp (ORCPT ); Tue, 8 Jul 2014 11:14:45 -0400 Received: by mail-wi0-f177.google.com with SMTP id ho1so1184424wib.10 for ; Tue, 08 Jul 2014 08:14:44 -0700 (PDT) X-Received: by 10.180.14.162 with SMTP id q2mr4768120wic.54.1404832484379; Tue, 08 Jul 2014 08:14:44 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id ft2sm8102647wib.1.2014.07.08.08.14.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2014 08:14:42 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Daniel Walker Cc: David Brown , Bryan Huntsman , Linus Walleij Subject: [PATCH 3/3] ARM: msm: delete dangling debug UART code Date: Tue, 8 Jul 2014 17:11:43 +0200 Message-Id: <1404832303-14850-4-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404832303-14850-1-git-send-email-linus.walleij@linaro.org> References: <1404832303-14850-1-git-send-email-linus.walleij@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The config symbols CONFIG_MSM_DEBUG_UART1 and *UART3 are used in the Trout board code, but these symbols are not defined anywhere in the kernel so cleaning them out. This is not to be confused with CONFIG_DEBUG_MSM_UART1 and CONFIG_DEBUG_MSM_UART2 which do exist. Signed-off-by: Linus Walleij --- arch/arm/mach-msm/board-trout-gpio.c | 5 ----- arch/arm/mach-msm/board-trout.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c index 2c25050209ce..cc3f26a64f81 100644 --- a/arch/arm/mach-msm/board-trout-gpio.c +++ b/arch/arm/mach-msm/board-trout-gpio.c @@ -94,13 +94,8 @@ static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset) } static struct msm_gpio_chip msm_gpio_banks[] = { -#if defined(CONFIG_MSM_DEBUG_UART1) - /* H2W pins <-> UART1 */ - TROUT_GPIO_BANK("MISC2", 0x00, TROUT_GPIO_MISC2_BASE, 0x40), -#else /* H2W pins <-> UART3, Bluetooth <-> UART1 */ TROUT_GPIO_BANK("MISC2", 0x00, TROUT_GPIO_MISC2_BASE, 0x80), -#endif /* I2C pull */ TROUT_GPIO_BANK("MISC3", 0x02, TROUT_GPIO_MISC3_BASE, 0x04), TROUT_GPIO_BANK("MISC4", 0x04, TROUT_GPIO_MISC4_BASE, 0), diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index f72b07de2152..96226570715f 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -87,11 +87,6 @@ static void __init trout_map_io(void) { msm_map_common_io(); iotable_init(trout_io_desc, ARRAY_SIZE(trout_io_desc)); - -#ifdef CONFIG_MSM_DEBUG_UART3 - /* route UART3 to the "H2W" extended usb connector */ - writeb(0x80, TROUT_CPLD_BASE + 0x00); -#endif } static void __init trout_init_late(void)