From patchwork Fri Mar 7 19:13:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3794311 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 4F9539F369 for ; Fri, 7 Mar 2014 19:31:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4541020306 for ; Fri, 7 Mar 2014 19:31:13 +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 1380720304 for ; Fri, 7 Mar 2014 19:31:12 +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 1WM0GD-0004XE-A4; Fri, 07 Mar 2014 19:16:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WM0FU-0003OG-W1; Fri, 07 Mar 2014 19:16:01 +0000 Received: from mail-ig0-x235.google.com ([2607:f8b0:4001:c05::235]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WM0EV-0003ET-TZ for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2014 19:15:02 +0000 Received: by mail-ig0-f181.google.com with SMTP id h18so2691566igc.2 for ; Fri, 07 Mar 2014 11:14:38 -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=EqCP4gMb6zOe5DlylhuA/0sFesnqdo1KsdWG6aF0N9eaBsxxEi/GndbQSVojhugsJK Z0p/a3U7npbzJyK6Gw2GlG7a/tkpR4M5DbHkuuzxQrvAG6IfRL9PJPti/efW0qStG/RB /HsJOFn1K6k97EQ4jBMKlrseflMGCMHm7ELse09FX8PnFQXG5zcgY/0ZmcfA8L/i1wCO LI3vDPMqLr0vveBFs1vHdQIYgpo117AjoHEy/nzhh8FYBWY3k+UWxIZvX8asycXVd7un KeCF6HhbdVbYTnyIE/Zs4xcxG7ml7mAsfhKQnoUVlPdPCtEoJG6Jgtgxo3KGPPs5Ot// iy6w== X-Received: by 10.50.118.104 with SMTP id kl8mr4766262igb.22.1394219678578; Fri, 07 Mar 2014 11:14:38 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id mi2sm5377192igb.3.2014.03.07.11.14.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 07 Mar 2014 11:14:37 -0800 (PST) From: Soren Brinkmann To: Russell King , Greg Kroah-Hartman , Jiri Slaby , Arnd Bergmann , One Thousand Gnomes Subject: [PATCH RFC v2 09/11] ARM: multi_v7_defconfig: Adopt to UART driver renaming Date: Fri, 7 Mar 2014 11:13:32 -0800 Message-Id: <1394219614-3197-10-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.0.1.g4196000 In-Reply-To: <1394219614-3197-1-git-send-email-soren.brinkmann@xilinx.com> References: <1394219614-3197-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140307_141500_064959_DB82D066 X-CRM114-Status: UNSURE ( 9.69 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Peter Crosthwaite , Michal Simek , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, Soren Brinkmann 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 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