From patchwork Tue Mar 4 17:17:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3763981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9958F9F1EE for ; Tue, 4 Mar 2014 17:19:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6C8D20374 for ; Tue, 4 Mar 2014 17:19:06 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D7B3F20220 for ; Tue, 4 Mar 2014 17:19:05 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKszB-0002xL-Vi; Tue, 04 Mar 2014 17:18:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKsz6-0003lX-Rb; Tue, 04 Mar 2014 17:18:28 +0000 Received: from mail-ig0-x22e.google.com ([2607:f8b0:4001:c05::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKsyu-0003jL-0a for linux-arm-kernel@lists.infradead.org; Tue, 04 Mar 2014 17:18:17 +0000 Received: by mail-ig0-f174.google.com with SMTP id h18so10982800igc.1 for ; Tue, 04 Mar 2014 09:17:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TuJmAJ63kI91H6wWOuDZ44opqLa9L0UEAop9bBlxXDQ=; b=XWXylbOux5QPXyU7mO90a0+LF5lG0ifLLjhPuhEa5/49GqyA5B0fVJzFfYPiZE2v/5 6WlCsz9ayfRc6czO61w+xZwWbkeFgDTE0oI8KSQ1v6LXVJCKRH7sKiDBllDXzm0AffB3 xFTcBEfMYCy3aIq2ApWcVDbJJHK2th3A09tgjaJXirsz+59fKG8oZaCwd3n8XPf/B/a9 H1nk9jatRfqqOagzNKA/vpqYMYp6lVooMSo3BPxJ7giH0awgLbMLOR6oSFZ1Q4piYUrv p/dbRsdSvx/MPLHYP7jP6HYapdc/TBdlI4iezV8p5z8/mdMjtQNKmU0umzmtqomfS4oC SqxA== X-Received: by 10.42.232.206 with SMTP id jv14mr627628icb.52.1393953474954; Tue, 04 Mar 2014 09:17:54 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id bf7sm51745828igb.9.2014.03.04.09.17.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Mar 2014 09:17:54 -0800 (PST) From: Soren Brinkmann To: Russell King , Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH RFC 6/6] ARM: multi_v7_defconfig: Adopt to UART driver renaming Date: Tue, 4 Mar 2014 09:17:29 -0800 Message-Id: <1393953449-28551-7-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.0.1.g4196000 In-Reply-To: <1393953449-28551-1-git-send-email-soren.brinkmann@xilinx.com> References: <1393953449-28551-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140304_121816_112798_EFAAE4DD X-CRM114-Status: GOOD ( 10.49 ) X-Spam-Score: 1.1 (+) Cc: Peter Crosthwaite , Kevin Hilman , Arnd Bergmann , Michal Simek , linux-kernel@vger.kernel.org, Soren Brinkmann , linux-serial@vger.kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, KHOP_BIG_TO_CC,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no 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 Xilinx UARTPS driver has been renamed to Cadence UART. Remove the stale Xilinx UARTPS config options and add Cadence UART instead. Signed-off-by: Soren Brinkmann Acked-by: Peter Crosthwaite --- arch/arm/configs/multi_v7_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ee6982976d66..4054c97a97e8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -151,8 +151,8 @@ CONFIG_SERIAL_VT8500_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y +CONFIG_SERIAL_CADENCE_UART=y +CONFIG_SERIAL_CADENCE_UART_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_ST_ASC=y