From patchwork Thu Mar 24 18:05:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 8663641 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D45A29F44D for ; Thu, 24 Mar 2016 18:07:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1176720108 for ; Thu, 24 Mar 2016 18:07:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 03928200E5 for ; Thu, 24 Mar 2016 18:07:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aj9eC-0001EE-A7; Thu, 24 Mar 2016 18:06:16 +0000 Received: from mail-pf0-x235.google.com ([2607:f8b0:400e:c00::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aj9da-0000rm-Tu for linux-arm-kernel@lists.infradead.org; Thu, 24 Mar 2016 18:05:40 +0000 Received: by mail-pf0-x235.google.com with SMTP id 4so64151613pfd.0 for ; Thu, 24 Mar 2016 11:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1KDlDpnGuXr9X1XPJ1OccnHWZ76j1FUK3rV8aOoQ+b4=; b=PAtnaIWCKHS103PdColanV7QXl5du1oSta640IA3xPzM0NbJ9v8qCUtHQCMj4Kl4FS HDKDTOn/3mBfdpIUOXsfSmi0OtIw/qUYXZ4i0EXLR0nfiRP0Y9QXLvYBmmPo2T05+YBl cmi0nbKTbapx4M1AsUaHSA6wguP0AwCGgbbFbnU/Gn2n1+6LnJonjfWt7YqdpuVZQs/7 gYril5/Zf8fOp31KpQc/2lGQy0jF8yPFMIyxPQF1mu8NLe09R9VYNjcxDHXVWD+eWF8L 7OD4o+eCnL6eAOLrtHtB0CFTEt3ul8DuFhq4R1hqtv4qNr3ZxOrSp70FRbBJAB2nyZF8 LhSg== 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:mime-version:content-transfer-encoding; bh=1KDlDpnGuXr9X1XPJ1OccnHWZ76j1FUK3rV8aOoQ+b4=; b=RyXdjVfrR8s/Io1h1UbNX8l+jOOkJqSl9GzlgieAmxslU258Ai9JARE8nEVdJUegq0 DvLeZpPF2+x1Ucp6ZDjRS6cZRxSA1O3j+BX5CF7bDJ+AYHy85MFOuXF5L92f1c0MRwZP 8IXTbv1utAsS9mYC60WKv6TAgkPagoIhVrpYcp0JiHvWLjDvdXJA3CdEBYz6E6whL18k OkBWhdn7HX8RQ3vyUqhpivYpm6wj9Nd8k49Tzb1acLKNnrW8+2guYzAybuFs2ye1cajd 3qji6hLXc8krputmc9FbZXnqaIInC+sR08vv1zQxV9uZgeHUsJBOMRFw3ulbCvkOxz/G u0gg== X-Gm-Message-State: AD7BkJJ06pc6/HwQVewa/IdALfv/9MksmohHSvBCJNEEB87L2EJKt/AQRP9FOoK75DU0KrvF X-Received: by 10.98.33.203 with SMTP id o72mr14846269pfj.96.1458842718209; Thu, 24 Mar 2016 11:05:18 -0700 (PDT) Received: from localhost (c-76-104-183-97.hsd1.wa.comcast.net. [76.104.183.97]) by smtp.gmail.com with ESMTPSA id n11sm11558044pfb.74.2016.03.24.11.05.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Mar 2016 11:05:17 -0700 (PDT) From: Kevin Hilman To: linux-meson@googlegroups.com, afaerber@suse.com, carlo@endlessm.com Subject: [PATCH v2 1/4] ARM64: dts: amlogic: update serial aliases Date: Thu, 24 Mar 2016 11:05:12 -0700 Message-Id: <1458842715-27066-2-git-send-email-khilman@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1458842715-27066-1-git-send-email-khilman@baylibre.com> References: <1458842715-27066-1-git-send-email-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160324_110538_996292_1D59F263 X-CRM114-Status: GOOD ( 12.40 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org 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 Apparently, it's not valid to have an alias point to a disabled device. Fix this by moving the aliases that are used (serial0) into the files that use them, and remove aliases to disabled devices (serial1). Suggested-by: Arnd Bergmann Signed-off-by: Kevin Hilman Reviewed-by: Andreas Färber --- arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi index c1fa2667ec5c..012cdccc8a35 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi @@ -45,6 +45,10 @@ / { compatible = "tronsmart,vega-s95", "amlogic,meson-gxbb"; + aliases { + serial0 = &uart_AO; + }; + chosen { stdout-path = "serial0:115200n8"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index eaa0a4553734..832815d80462 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -50,11 +50,6 @@ #address-cells = <2>; #size-cells = <2>; - aliases { - serial0 = &uart_AO; - serial1 = &uart_A; - }; - cpus { #address-cells = <0x2>; #size-cells = <0x0>;