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: 4505821 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9376BBEEAA for ; Tue, 8 Jul 2014 15:14:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6AD92020E for ; Tue, 8 Jul 2014 15:14:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E16C5201EF for ; Tue, 8 Jul 2014 15:14:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750927AbaGHPOq (ORCPT ); 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-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=Xyz1aeZ+OZMlZnZ0sf/gHTKHf9zVVylzNlBNOLlkTXM=; b=bCdjuK98lwgUhEbCH+LSZbsQdxMfE/Gm3/A86WdwYVSHFIebLZkucsPxTuxpGJjq/7 dshdXZFcHmB8yO75kwKyZMXHrSRneVDIjUbeoFyhh+SAvIOgZjALyJf6gF59dsZUlBGL Wtv+1S8cs8sOAc0vMA8Y1AwP+5RDFT/n5MX2d/eEf0Tv1HrH5SCxPzrJIVYp+FKPRdCk Py7kJf/6tkcC4iys2aHQxmXJC+jHoU7RwEDP+2ujfnCtf4/52bVuvoGe0WFZMjqPXtOB b4Rt60TY2uRwi+z2u156rjnWb3KuDL5KIGqMHWJtCJYF/JctKq6mIb2MYWFljYXFln7E 7zwA== X-Gm-Message-State: ALoCoQnldYngMtDXF2IJ6y2aR7Is8u3G5QEvLgScBfkYdYp6yB7fkyiwsmp7Y6OBrVjsJqZHo0kG 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: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)