From patchwork Wed Jun 14 08:29:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9785773 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 0E7AE60325 for ; Wed, 14 Jun 2017 08:34:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7EA81FF81 for ; Wed, 14 Jun 2017 08:34:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCCA728560; Wed, 14 Jun 2017 08:34:05 +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 5D73E1FF81 for ; Wed, 14 Jun 2017 08:34:05 +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=hFNl7gFaYi3iNnSyB7F2zOdwXrsFRiIsO6X6kmhU/Yc=; b=GZPdyVf/c/oq+ykoK2Qo9schtK Jh1tgj5oEYJbVjWQ4IyntzuSs/8mk5//OTNnuSEBtntzFzbPGmQ0URh2bwWeQg3O79ekZk1ZAwzXR bSj6aXAKRd2PUaaVA287HpbHqWC0kdiJbTonfDV2e+WA3MX6IhVbWM4axh+RZrmzd7phVaXPPXc6V qSa94FasvnRIs0nni3Y/nhS7EGXP0KTCEabi4KImf/pHJyC26G1zihYzJ8CZejIDit5IzxbqrniBN V2JuUAiheVEIyptSqqYfCC79O+WEzwNvwzdfC2+sIDVcVnVfDrozM3ZQ2NRsi7Zz7laROpoT5O4Nr 0kEqpo6Q==; 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 1dL3ka-00021u-Hr; Wed, 14 Jun 2017 08:34:04 +0000 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dL3gT-0006a4-0E for linux-arm-kernel@lists.infradead.org; Wed, 14 Jun 2017 08:29:53 +0000 Received: by mail-wr0-x22c.google.com with SMTP id 36so56320125wry.3 for ; Wed, 14 Jun 2017 01:29:28 -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=a2InEJiWYxpxlhuubndxoAyINL0uTsExMS15wfkDtlI=; b=Zvqf0CAs5DlPk/qMx73gutOxI6uA+0/HY/sZgg+DMP35i8FFV8skQ3FpLdK6iJ1rT3 WjoeKpNAdKHQaXUkXA1O6BqwT16e4JImmNUH2+XhlSY4b6d5VzJVdZjAL5VfSO3oFA8y NvBdjwUvmS14IjUjlkWecw++22mEGM14OokEcEiH8Ie6tYxnjIdBJZocZsmcPBeo1SSx DsT7AhnkhwpwOKBxkzBeneQOIZRaIsIKNyRQOoUlTxxhI/4H+rJ9Fnk73e6SuJ3xFElN XYiWBKgO7ptPhTXhZj8XkzGNquFKvRN5HlELgSOVC5tbBl3DpgY00hLiF5CDiLvjdjOl GxwA== 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=a2InEJiWYxpxlhuubndxoAyINL0uTsExMS15wfkDtlI=; b=iCyUL7xK0ediMrDLkWj3Q8Ck2uTXd8ByZvaQ535m/Ee8M5yp6RfLW7TRlGlyfnOs61 Tq7W8lYeGGxkKXjLFZL4zhxWtdWhZCw0E4Y8R39ZLSQhGCDGxpyNAvyFPhJpLmK+Uz7k sRMYXapl2M5CgLk9YlU3eDFI9hjA97+GxrbDAEJ/3i5ZL9FW9Ijv0CueQq0IGdiX3xVt puJ7QrDXs+szpt5iu6oZuJ42+9CKDFiUGyqS8EMuofNnvkeJLjBrJkJ4gkakRX1Vg9nT uw6EP788ztSJSyJLtPH/CIZxHSrkXfjsb3KFk8Wq9JVMetcxbeG/dAhF+8hDPUWPhqs3 /sZg== X-Gm-Message-State: AKS2vOzU7e4W5FlKokfs9f6hRDxSUjPu/SJgpr4Pr5scnd728rzSFkTG B+DJWopCg78kpMVM X-Received: by 10.28.142.15 with SMTP id q15mr115310wmd.28.1497428967190; Wed, 14 Jun 2017 01:29:27 -0700 (PDT) Received: from localhost.localdomain (home.amouriers.starnux.net. [82.228.250.61]) by smtp.gmail.com with ESMTPSA id 62sm321192wra.44.2017.06.14.01.29.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 01:29:26 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org, khilman@baylibre.com Subject: [PATCH v5 4/4] ARM: dts: meson6: use stable UART bindings Date: Wed, 14 Jun 2017 10:29:17 +0200 Message-Id: <1497428957-19942-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497428957-19942-1-git-send-email-narmstrong@baylibre.com> References: <1497428957-19942-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170614_012949_291327_CCB036A3 X-CRM114-Status: GOOD ( 11.41 ) 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. 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 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"; diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi index b0fc91f..a334fbe 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"; +};