From patchwork Wed Jun 21 14:42:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9802059 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 8DBFA6038C for ; Wed, 21 Jun 2017 14:43:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DDC3285C9 for ; Wed, 21 Jun 2017 14:43:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7291E285E0; Wed, 21 Jun 2017 14:43:09 +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=unavailable 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 F0488285C9 for ; Wed, 21 Jun 2017 14:43:08 +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=MV4rhm9Ol2R3+nBlK33T5lsB0xMMfXlo8Y0UEnOKUPc=; b=UUZLVmCmjUWoBg7mMeqIu1cbSg gTwVuTQM7st3P28wb5en71D9z3/e50u/afHBsCfvm8ygvT60lA+fpGilfuHYANejKR7kyakFDHgtB AYKjBI4JnDW+C44BUhWysf6cIeklqKby6iVzhT97U/JC/f8n2dQB2GToQKkrEpkzoL4e1oah8+izp e7q69aXwWRFUKd8eVTtwR0a1okT9LUJ5sfP55c3x/xTE4akgTHvBlcALkcvrDYarkGTZsr7ruk3iU DJhgbVnZIp4Eevu0VlfD4zBbp4e29Rc9cijIvedzLnrgVeePLCWosSoXvcHkT0S40/K/LUs/aqxKC h8q8n5Lg==; 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 1dNgqY-0003yo-IA; Wed, 21 Jun 2017 14:43:06 +0000 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dNgq8-0003wk-S6 for linux-arm-kernel@lists.infradead.org; Wed, 21 Jun 2017 14:42:43 +0000 Received: by mail-wr0-x22a.google.com with SMTP id y25so98687145wrd.2 for ; Wed, 21 Jun 2017 07:42:23 -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=mjAIHAID0V1qFN7Ke+g5oB05StsizUGwzyY+VNJ72Bc=; b=ibrc38dePMyk5FxNkCrdXqJzu2EJ7ORAL2ThOhsPYnN8fRq7BIl1daYXgqHQFJ1GGY hiQfQJLuzUHkGfdJHS0kpH3EuFgjkxgmVvuUd13Kl6OU9Gv7Msm12fhv1p7d/8Wg6+Pq ZS3rwyp3YW22xn0rAeCVmlCalcXAdsEWGT1hrQzUOvyGjHcPC3MOMwp1hm380og0Y0k4 k1SZM8ZR5hs9aoSwWPMH+/QMsCBe/h4Od8D2geM8AioJ/Y358IZRKcORQhwpsWA56b/Y mGQUCIsEn1+fRo5jXXJr1ThLS4a1eIg72TxjsXhk5fc1RC4x0PjJKxxKMeogMbiuEGdh APrA== 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=mjAIHAID0V1qFN7Ke+g5oB05StsizUGwzyY+VNJ72Bc=; b=ciFW5G1ID9B8WuXeXdV7r2b+F26tEkI53XllhY1IsfrYYD3gzxRCo2gMlh727jiLpK kt+CEB8eCc803Smkl1k6yMGTxMTWFYyq/BPRi5bBRuRWlY3IrTbPCeUGyKZ4iDv5MO6J XAbKjc7UtRed9nQPU8xEkJgroccPPy9UhLx4rSPqOp6XLjDDvcpmUiUd6dU7CofPS4YP PyWG8JFuTeT8PXsqnnfHjG60Es7wr/G80iN+gbaKpqucTLPrOlOn5xF+ZW/iqWE1Nxlp qJDeIH77FYlFmHDfao0QXj5jRXL6uOa1LgHD52dkz9FCpR7pgAjMbY2O8trUgnpzK0bS Yr6w== X-Gm-Message-State: AKS2vOx01Y13gedcuFme3indeHcXtEm9HVlDCaR2cd7YWn5dYAx6Ux4H KRx4aYfU48rQ38OS X-Received: by 10.28.32.5 with SMTP id g5mr5522831wmg.70.1498056140349; Wed, 21 Jun 2017 07:42:20 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 194sm17351570wmx.27.2017.06.21.07.42.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jun 2017 07:42:19 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v5.1 2/2] ARM: dts: meson6: use stable UART bindings Date: Wed, 21 Jun 2017 16:42:12 +0200 Message-Id: <1498056132-18508-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498056132-18508-1-git-send-email-narmstrong@baylibre.com> References: <1498056132-18508-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170621_074241_105364_6BA42A0E X-CRM114-Status: GOOD ( 11.90 ) 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-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. Switch to the stable UART bindings for meson6 by adding a XTAL node and using the proper compatible strings. Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/meson.dtsi | 8 ++++---- arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 15204e4..1ce9aa0 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -86,14 +86,14 @@ }; uart_A: serial@84c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; reg = <0x84c0 0x18>; interrupts = ; status = "disabled"; }; uart_B: serial@84dc { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; reg = <0x84dc 0x18>; interrupts = ; status = "disabled"; @@ -117,7 +117,7 @@ }; uart_C: serial@8700 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; reg = <0x8700 0x18>; interrupts = ; status = "disabled"; @@ -182,7 +182,7 @@ }; uart_AO: serial@4c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart"; reg = <0x4c0 0x18>; interrupts = ; status = "disabled"; diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi index 8557b61..ef281d2 100644 --- a/arch/arm/boot/dts/meson6.dtsi +++ b/arch/arm/boot/dts/meson6.dtsi @@ -70,9 +70,37 @@ }; }; + xtal: xtal-clk { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "xtal"; + #clock-cells = <0>; + }; + clk81: clk@0 { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <200000000>; }; }; /* end of / */ + + +&uart_AO { + clocks = <&xtal>, <&clk81>, <&clk81>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_A { + clocks = <&xtal>, <&clk81>, <&clk81>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_B { + clocks = <&xtal>, <&clk81>, <&clk81>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_C { + clocks = <&xtal>, <&clk81>, <&clk81>; + clock-names = "xtal", "pclk", "baud"; +};