From patchwork Fri Jun 9 09:49: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: 9777825 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 839A560350 for ; Fri, 9 Jun 2017 09:51:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74DF32852E for ; Fri, 9 Jun 2017 09:51:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6986C285DD; Fri, 9 Jun 2017 09:51: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 A57B22852E for ; Fri, 9 Jun 2017 09:51: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=mI9XAglqPnfttUHJoetbMTohqYdENo3z3WYMTU4CNEk=; b=TcyctvzFXD+oMghDZuuloxiwdn m5aCDzOg53chnct6SsSzyt4MmtSoIoxUIsmrwKragjLNvatS9q8V/1k9AK0OhuC9if5wbmkPd28A0 QquSJ7ilJtLNrzqN9Ime/YovnxzjERquTtvPIr4nCH28oFwjjxB3RpTzXFsh4f4mu0Eqz3iuD/PXt dbhmToFLPmwwZQoQXPv/NUjS+2XDYOEL0cT06LjMD1Jkyveqa8ELaQT1vrEsSKsaJrGmAGUutDxJg EuokiriFrscOp5OhWsSVoF9XpeVEUZB6DVLuSj0srCB4DjKmoILAhOmhy/JW7tSaFHJoAZIs1Vxr5 wF9BjEcg==; 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 1dJGZP-0000bz-5d; Fri, 09 Jun 2017 09:51:07 +0000 Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dJGYC-0006Hu-4L for linux-arm-kernel@lists.infradead.org; Fri, 09 Jun 2017 09:49:58 +0000 Received: by mail-wr0-x22e.google.com with SMTP id q97so28192176wrb.2 for ; Fri, 09 Jun 2017 02:49:31 -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=xW1yle4YNVbG4udF/Y9jNzLR6JD8+nQn0iE6C3s8+Mk=; b=2MOxgc6tkAIcqw/uOTD5HHShKm/PZIWBfpgdX/jakQ7JZ/C3iqAPi2YS4O5GzcNQVE FGb9EY8OfNTZV0MBkoF8+LVsXWM1GCNNYFug3mgkng6UGDDI8Znq6uV0mDY984fvBJx7 aX50lijiuMw+GgF06kWxJT7Q4nUS/l2/h9pDwy7Nd79e9KCkg1QjUYm2BPP18aa8sxtn hLElCZ+iGCyhMvy03LWK85YnKhJ8dqWsgs+HpE57mHoyCnQsMHzPBRwmTmjfKruoH8UQ /JVUYkNgCBV1MvIN6d56rTJ+qLkSaNy+CXMj/HzbMxLNcAixuktsN34r2xKUqvQkxiWU bIbg== 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=xW1yle4YNVbG4udF/Y9jNzLR6JD8+nQn0iE6C3s8+Mk=; b=gJNeM03fdJga5sr/Ql/bnJlX7iwH/tpvY6JIBwyAJPiwvvL5CQnqnXBWl+TXWa6K4n 7dsm74Ttd+GzjeiTsW9Imk+A3/8OlcJ1s39eon+tliyWnC2IgJfD7jMuc86VPi+GDe3I voUb1V/bI5r7b5/Fd2wRiWj0HEcyHdoJf0RtnM6BAdZnJgckv6zDCCDMqK2Fw/Ws2Lkw 23S3vE5BVDU+TKdpiZ89ADMGnPn2/koaOZAGSOJRKD6SL7n980Zgu/ub5dnpv4Q3bt1D KG5uPOuPcZVr0hJM1BMxTNuYjF45X9pmW5N7AaIzy/BUHDQJAuPJ1YEajD7CpjOiPCu5 OLDA== X-Gm-Message-State: AODbwcCKSZtD/0utKDjsNsclwHjGvfFqCNkpXhSX+YLBIjzK3Ahl3mT9 Jpk3bL/VSVSMtAwr X-Received: by 10.223.168.2 with SMTP id l2mr28711835wrc.94.1497001769949; Fri, 09 Jun 2017 02:49:29 -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:29 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org, khilman@baylibre.com Subject: [PATCH v4 3/7] ARM64: dts: meson-gx: use stable UART bindings with correct gate clock Date: Fri, 9 Jun 2017 11:49:12 +0200 Message-Id: <1497001756-942-4-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_364585_5C1BF134 X-CRM114-Status: GOOD ( 10.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, Helmut Klein , 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 From: Helmut Klein This patch switches to the stable UART bindings but also add the correct gate clock to the non-AO UART nodes for GXBB and GXL SoCs. Signed-off-by: Helmut Klein Signed-off-by: Neil Armstrong Acked-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 12 +++++------- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 +++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 436b875..d2b8d52 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -225,7 +225,7 @@ }; uart_A: serial@84c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson-gx-uart"; reg = <0x0 0x84c0 0x0 0x14>; interrupts = ; clocks = <&xtal>; @@ -233,7 +233,7 @@ }; uart_B: serial@84dc { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson-gx-uart"; reg = <0x0 0x84dc 0x0 0x14>; interrupts = ; clocks = <&xtal>; @@ -279,7 +279,7 @@ }; uart_C: serial@8700 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson-gx-uart"; reg = <0x0 0x8700 0x0 0x14>; interrupts = ; clocks = <&xtal>; @@ -366,18 +366,16 @@ }; uart_AO: serial@4c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; reg = <0x0 0x004c0 0x0 0x14>; interrupts = ; - clocks = <&xtal>; status = "disabled"; }; uart_AO_B: serial@4e0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; reg = <0x0 0x004e0 0x0 0x14>; interrupts = ; - clocks = <&xtal>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index dbd300f..1ae8da7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -675,6 +675,31 @@ clocks = <&clkc CLKID_SPI>; }; +&uart_A { + clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_AO { + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_AO_B { + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_B { + clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; + clock-names = "xtal", "core", "baud"; +}; + +&uart_C { + clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; + clock-names = "xtal", "core", "baud"; +}; + &vpu { compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 4dfc22b..0c601f8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -616,6 +616,31 @@ clocks = <&clkc CLKID_SPI>; }; +&uart_A { + clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; + clock-names = "xtal", "core", "baud"; +}; + +&uart_AO { + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_AO_B { + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; +}; + +&uart_B { + clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; + clock-names = "xtal", "core", "baud"; +}; + +&uart_C { + clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; + clock-names = "xtal", "core", "baud"; +}; + &vpu { compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; };