From patchwork Thu Mar 16 16:51:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salter X-Patchwork-Id: 95402 Delivered-To: patch@linaro.org Received: by 10.140.89.134 with SMTP id v6csp905328qgd; Thu, 16 Mar 2017 09:51:57 -0700 (PDT) X-Received: by 10.98.78.7 with SMTP id c7mr11328676pfb.138.1489683117418; Thu, 16 Mar 2017 09:51:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si5831800plj.254.2017.03.16.09.51.57; Thu, 16 Mar 2017 09:51:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320AbdCPQv4 (ORCPT + 2 others); Thu, 16 Mar 2017 12:51:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43072 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235AbdCPQv4 (ORCPT ); Thu, 16 Mar 2017 12:51:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 15B9B624D4; Thu, 16 Mar 2017 16:51:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 15B9B624D4 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=msalter@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 15B9B624D4 Received: from t540.localdomain (unknown [10.10.124.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8270560A99; Thu, 16 Mar 2017 16:51:50 +0000 (UTC) From: Mark Salter To: Russell King Cc: Greg Kroah-Hartman , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla Subject: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Date: Thu, 16 Mar 2017 12:51:34 -0400 Message-Id: <20170316165134.1501-1-msalter@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 16 Mar 2017 16:51:51 +0000 (UTC) Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b. It completely breaks PL011 SPCR support (a console=ttyAMA0 is required to get a console even with a valid SPCR table). Aleksey Makarov also noticed this: https://lkml.org/lkml/2017/3/1/324 and he is working on a more generalized patch to fix the original "double printing" problem which this reverted patch was trying to fix. https://lkml.org/lkml/2017/3/15/223 So, let's revert the broken patch and live with the double printing until Aleksey's patch gets upstream. Signed-off-by: Mark Salter --- drivers/tty/serial/amba-pl011.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 8789ea4..a81631f 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2373,9 +2373,8 @@ static int __init pl011_console_match(struct console *co, char *name, int idx, if (strcmp(name, "qdf2400_e44") == 0) { pr_info_once("UART: Working around QDF2400 SoC erratum 44"); qdf2400_e44_present = true; - } else if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) { + } else if (strcmp(name, "pl011") != 0) return -ENODEV; - } if (uart_parse_earlycon(options, &iotype, &addr, &options)) return -ENODEV;