From patchwork Fri Jun 9 09:49:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9777871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5D5960393 for ; Fri, 9 Jun 2017 10:07:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A494328396 for ; Fri, 9 Jun 2017 10:07:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97A192852E; Fri, 9 Jun 2017 10:07:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A2CA28396 for ; Fri, 9 Jun 2017 10:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=HCVhsLP9vH6W+2RU7tOdn24tZ4nKAHdcjAFwNZrTczA=; b=X4+lq/hH9H/uWivQBcr2bPwQRu rgyUmPeuwV3LUtJH0dMPUqFg6BQRquZppA/LrVMZzjMI3JdVpof7/ZX/W0CC+Vm7fweBSS4YuYhoJ LoTc93nooBuxWZoKjuKbwH/IXKSG+nDpgw5IEXn81MO1Ed3WYzmNiitKCaWLV+Faw0YrAyyTdTVIb 3N1gi6N9krQlyqLw6ZmZsSX0AK76/tg3nDMzSs419M7b5q/Rf1U8KJ2G8HCIf5UOYsdQwDI7kUubg o9izNNwc8tjvstlhtmuqoj+2cY9vS0HupVTimdPp0Fk0IWPaHopd11VDOFd8GPmKXuZQql4oJ3SuX buBcP/Kg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dJGpB-0002AB-RQ; Fri, 09 Jun 2017 10:07:25 +0000 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dJGYC-0006Hw-GK for linux-arm-kernel@lists.infradead.org; Fri, 09 Jun 2017 09:49:56 +0000 Received: by mail-wm0-x22d.google.com with SMTP id d73so46416659wma.0 for ; Fri, 09 Jun 2017 02:49:32 -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; bh=TP6CnkKCt6nhuYZWVNaYqa/tC9SAABWxGAqCr4dD4yc=; b=B5ARUZpR43fwpUdcgooEngfpBZH+8+XpInf6B8xk7HMAiVUYekmHyLB/KK7HQYsDNT uVQdXN2/wKlpTbb+ExHtG3QSYEFg4dk/ESpg9bn24RNI6enyVNvjYctrNk/Uq2tSqSjn 4MQ6q7dao/O6yPA78csIGVOdFhu4jITfdv1wITK621qQkOZeFYKRllZe7KSb2lS0DTXG 82Hatzhq+bCpd1NRVwAMANt0qllEiHpPEZG3AhIuFLHp3Lw2yj/NeRW9TPuNjBzoJFda n9pQecjm/Rdv7iLhldwWfX1FcLbFgDu98O5IXVE6+Y7u0e+cgrPuJxzU0PjB3vYUEdY3 UCtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TP6CnkKCt6nhuYZWVNaYqa/tC9SAABWxGAqCr4dD4yc=; b=EvLX+ZrVpOoJstH3jyHwTtXp3Nf/jaxCWj3lbpDZTg0opUy+FhBVeJYGDFQW1iwWY3 YiGZPiW0HUxVD9XRzPV4OEKzhx8FZiO1NSne0Lru4gNaDkFfbgHHD25/E/tR+WUL6AZO rI89XIcqISer2soTPT/+veViXMAg02pOtizoD4WkBT+kGc5aR5tZ78KFT3ETAeom+xWb UYavOLGoePn+kraADmPfIF/Q0tQgnC0Ohhm9KFS7nB2utmFQnwC/fqozu4i3MS+11u58 8o14tEiLYGCMWPLASIfUvhAggNiLW57Way4LzKD/dootxCjdusJsgcHh31bk0XgqHuAk BDRg== X-Gm-Message-State: AODbwcDKuoXHq4xXE8EUyewZSHlj7Ug/PcEiowQ/rUZ9INhI7DZLAn+W 955W6a6YhVNGPVrb X-Received: by 10.28.93.79 with SMTP id r76mr6527663wmb.64.1497001770852; Fri, 09 Jun 2017 02:49:30 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id n92sm968983wrb.62.2017.06.09.02.49.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Jun 2017 02:49:30 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org, khilman@baylibre.com Subject: [PATCH v4 4/7] ARM: dts: meson: use meson6 UART compatible like other nodes Date: Fri, 9 Jun 2017 11:49:13 +0200 Message-Id: <1497001756-942-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497001756-942-1-git-send-email-narmstrong@baylibre.com> References: <1497001756-942-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170609_024952_887492_28910568 X-CRM114-Status: GOOD ( 10.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Neil Armstrong , linux-kernel@vger.kernel.org, hgkr.klein@gmail.com, linux-serial@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The UART bindings needs specifying a SoC family, use the meson6 family for the UART nodes like the other nodes. Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/meson.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 8d9c369..ecc9330 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -79,14 +79,14 @@ ranges = <0x0 0xc1100000 0x200000>; uart_A: serial@84c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0x84c0 0x18>; interrupts = <0 26 1>; status = "disabled"; }; uart_B: serial@84dc { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0x84dc 0x18>; interrupts = <0 75 1>; status = "disabled"; @@ -102,7 +102,7 @@ }; uart_C: serial@8700 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0x8700 0x18>; interrupts = <0 93 1>; status = "disabled"; @@ -153,7 +153,7 @@ }; uart_AO: serial@4c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart"; reg = <0x4c0 0x18>; interrupts = <0 90 1>; status = "disabled";