From patchwork Sun Apr 22 10:53:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 902605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="Zs1l1KHZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40TRKM2zJyz9s16 for ; Sun, 22 Apr 2018 20:53:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751350AbeDVKxl (ORCPT ); Sun, 22 Apr 2018 06:53:41 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:39086 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbeDVKxk (ORCPT ); Sun, 22 Apr 2018 06:53:40 -0400 Received: by mail-wr0-f193.google.com with SMTP id q3-v6so23556504wrj.6; Sun, 22 Apr 2018 03:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bHeAlqx4nm9o1zoy8/Y0HH4nrAJbg1j0FhalDAVXWvU=; b=Zs1l1KHZdxF2vZ9PeF8devSR81naa89yIown6mY97ZIcg0FYGVlQEwFRuQqySMgqZs YTpu2Z/aLi1NRB4ZzlbGWeF8dDvmTmAwGmOpA7ZcKzoN3pRWD9wdElJP+qIahQR7s00L s7wGAZf7N9Iavf8EzhPCdGGsTP5YmFpHzbFBjs66yj5RorFEqNjqH3KxL7tf7AcCKEGV jpBbzsuoncBWUhCZtTvwLF80bhI6ymhOZyQQWOJMsGTflXEQkzfKqOecOYQyYtTFfb7O pcXCf8uDZzoP8lDN1bZCR9rWHOMWjq7fznb6m6gt2aP1xJM906rqNnlwl7ULNvFZsKDw 1tdw== 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=bHeAlqx4nm9o1zoy8/Y0HH4nrAJbg1j0FhalDAVXWvU=; b=Q8ZaVyYDz8QLp9EZ2WIaU7McGY56OQV+FekeQ4cFm61LDxtcups+9lVRHlsOtxWCpH CKKatgd5FMjF4ndUp0QjPNew0+y/31l7jL1gR4FpYmAez5fcJgQ5KZyr5ygRO/+VHrDT j10b4wujeap+YncSOjxopwUkyP+PE9XGftf46m+Hr+W1z2CtpB84H1vRN/qkOZeqCi1x QYSKb9Z8PhXqAYD33WaDKBxsmFUlICMKPSLfXr4n7LBxcc1XLKmugTbOMN/Bvr2Q6p4U TUzkLzOCrDV1uKPSfxtddJ2r/8QGb0XdlSfN5NpkhKUP5OE9dGhk16v83nzQTH7EGkSc nzMQ== X-Gm-Message-State: ALQs6tBwjtLwizuc/O1rURnuETrsykbIrtKU7Qc9EMnN55G4CJomPpzg 5/mE5I8LAppQnZr93DVIcAk= X-Google-Smtp-Source: AIpwx4/bwoaz8IpD5Cl4vJdBWVl8U9/jBKIVDH/JsCtkDz6H5PID5mOxWa5g6TLRBmVN7T2nSpUukA== X-Received: by 2002:adf:83a2:: with SMTP id 31-v6mr14633737wre.19.1524394418594; Sun, 22 Apr 2018 03:53:38 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD74E1B04DD092444F21FA8F1.dip0.t-ipconnect.de. [2003:dc:d74e:1b04:dd09:2444:f21f:a8f1]) by smtp.googlemail.com with ESMTPSA id l53-v6sm21212086wrc.80.2018.04.22.03.53.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 03:53:38 -0700 (PDT) From: Martin Blumenstingl To: linus.walleij@linaro.org, robh+dt@kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org Cc: mark.rutland@arm.com, carlo@caione.org, khilman@baylibre.com, Martin Blumenstingl Subject: [PATCH 1/3] dt-bindings: pinctrl: meson: add support for the Meson8m2 SoC Date: Sun, 22 Apr 2018 12:53:28 +0200 Message-Id: <20180422105330.4712-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422105330.4712-1-martin.blumenstingl@googlemail.com> References: <20180422105330.4712-1-martin.blumenstingl@googlemail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Meson8m2 SoC is a variant of Meson8 with some updates from Meson8b (such as the Gigabit capable DesignWare MAC). It is mostly pin compatible with Meson8, only 10 (existing) CBUS pins get an additional function (four of these are Ethernet RXD2, RXD3, TXD2 and TXD3 which are required when the board uses an RGMII PHY). The AOBUS pins seem to be identical on Meson8 and Meson8m2. Signed-off-by: Martin Blumenstingl Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt index 2c12f9789116..54ecb8ab7788 100644 --- a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt @@ -3,8 +3,10 @@ Required properties for the root node: - compatible: one of "amlogic,meson8-cbus-pinctrl" "amlogic,meson8b-cbus-pinctrl" + "amlogic,meson8m2-cbus-pinctrl" "amlogic,meson8-aobus-pinctrl" "amlogic,meson8b-aobus-pinctrl" + "amlogic,meson8m2-aobus-pinctrl" "amlogic,meson-gxbb-periphs-pinctrl" "amlogic,meson-gxbb-aobus-pinctrl" "amlogic,meson-gxl-periphs-pinctrl" From patchwork Sun Apr 22 10:53:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 902607 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="FDHVFdkK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40TRKP5kYyz9s19 for ; Sun, 22 Apr 2018 20:53:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751710AbeDVKxn (ORCPT ); Sun, 22 Apr 2018 06:53:43 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:37879 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751281AbeDVKxl (ORCPT ); Sun, 22 Apr 2018 06:53:41 -0400 Received: by mail-wr0-f193.google.com with SMTP id f14-v6so33582213wre.4; Sun, 22 Apr 2018 03:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=trgEknwwdIUoGyYE9IP2dEn3nmxizPJivRc482RpzKg=; b=FDHVFdkKR1viujvxGvPjm1YRfCW+gAfVqJA7FHpbqIwFSbTmhs/KYJYWhNas9NeIET /6N32A7+PnRTfu+rzfaI2ylCtYSULK6jceNNhJEc1iaWiTzdmoZ7ZYJWg6D3ak+is7Sq T7i2HyvrN9tAU+tWFp8aMXLz2aiq1FKvywk+cmgLtwB3UjbJ3b2icYoWc4uuG7WcA/VA EqvsBM1qyTITjl7eiOIYkSSD1UZ/8k/N4sV1HyUdW+J3Aq359wkUux6Maa5+d0WnvR25 DvCdYnxW9tg5aag/e45EQOi/pb+UMwZfdnD+hV0vqP6CGT0bOuBEZj7EZXyoZFy3FoO1 aGJw== 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=trgEknwwdIUoGyYE9IP2dEn3nmxizPJivRc482RpzKg=; b=Cd0XcHoq/Plu7BLEyxFKhDbbMT1AsIFjHIqYk+JDE+GrrJH7Ula6p4r9bgy55sNuPR MlJb0tat64aTV258Eiz68DinGrGUnyW0JA1Qy+SZdoRZsu3gjVXYtc3ISSqFoTq3GUOX R7MmVFJPHC7+ZxKtImtLc4eUL2Wfb4e89ys65EBPjT6theFBG5ywugP+K/rzQJQYir// vpmzx0H6EpWiGp+vu3tn3lAY/KXu275mXb2WjM0hrUbh91bf2DaxUa7hqQJ7G8/XMEGI r7o3jHdOUbdvTrik3vUo7nwSnsy0QP8x4w/YrHuCyoARfJlXVN+ix7EaXfroSCFv91b3 5grw== X-Gm-Message-State: ALQs6tDs+TrEieByVRS0xvDBZBJQTv+u6dImK0aGtH4J7k9AQT1fckQq UQXi/9VDvZK8QhgpZJXCZuQ= X-Google-Smtp-Source: AIpwx4/h8aLyJcEYrS3g1IXnlxt7XnoCoCrinCWURPQ9En1vTu9nAGBP5PKBh/LpG+DU+suIYhx8jA== X-Received: by 2002:adf:87d4:: with SMTP id c20-v6mr14617600wrc.197.1524394419753; Sun, 22 Apr 2018 03:53:39 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD74E1B04DD092444F21FA8F1.dip0.t-ipconnect.de. [2003:dc:d74e:1b04:dd09:2444:f21f:a8f1]) by smtp.googlemail.com with ESMTPSA id l53-v6sm21212086wrc.80.2018.04.22.03.53.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 03:53:39 -0700 (PDT) From: Martin Blumenstingl To: linus.walleij@linaro.org, robh+dt@kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org Cc: mark.rutland@arm.com, carlo@caione.org, khilman@baylibre.com, Martin Blumenstingl Subject: [PATCH 2/3] pinctrl: meson: meson8: add support for the Meson8m2 SoC Date: Sun, 22 Apr 2018 12:53:29 +0200 Message-Id: <20180422105330.4712-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422105330.4712-1-martin.blumenstingl@googlemail.com> References: <20180422105330.4712-1-martin.blumenstingl@googlemail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add Meson8m2 support to the existing Meson8 pinctrl driver. Since there are only very few changes (Meson8m2 has an extra signal on 10 CBUS pins, no other differences were found so far). Add the new compatible strings for Meson8m2 to the existing Meson8 driver so we don't have to duplicate the whole driver. Signed-off-by: Martin Blumenstingl --- drivers/pinctrl/meson/pinctrl-meson8.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c index 49c7ce03547b..086082aeb796 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8.c +++ b/drivers/pinctrl/meson/pinctrl-meson8.c @@ -1,5 +1,5 @@ /* - * Pin controller and GPIO driver for Amlogic Meson8. + * Pin controller and GPIO driver for Amlogic Meson8 and Meson8m2. * * Copyright (C) 2014 Beniamino Galvani * @@ -1080,6 +1080,14 @@ static const struct of_device_id meson8_pinctrl_dt_match[] = { .compatible = "amlogic,meson8-aobus-pinctrl", .data = &meson8_aobus_pinctrl_data, }, + { + .compatible = "amlogic,meson8m2-cbus-pinctrl", + .data = &meson8_cbus_pinctrl_data, + }, + { + .compatible = "amlogic,meson8m2-aobus-pinctrl", + .data = &meson8_aobus_pinctrl_data, + }, { }, }; From patchwork Sun Apr 22 10:53:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 902608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="UZSGJCl2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40TRKR2gjkz9s16 for ; Sun, 22 Apr 2018 20:53:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751713AbeDVKxo (ORCPT ); Sun, 22 Apr 2018 06:53:44 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:43602 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbeDVKxm (ORCPT ); Sun, 22 Apr 2018 06:53:42 -0400 Received: by mail-wr0-f193.google.com with SMTP id v15-v6so15480081wrm.10; Sun, 22 Apr 2018 03:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=94Gy5568YufaRYvoXj2miHEQCoFbMeytI6druE3dFoA=; b=UZSGJCl25DhVyAHLXSeXFhARUf7Rb50PvTm/B54LLCFt7C4yWhQ5IJTPJrPVNZQoLR 9ip83nGjczFapd+JHq3juyXztBAxntjWxBHOH+Ya5vH/hBgw0KUJn4P8VxA12WQ6gdKD RfkMLvE+QxDlQcyvAx7j68x3nwtEmCIdyCYvIjj7/V3he6ZOElWDb5SASzZoqtv1ETcd R4FG856meSObec07x58LgvuwxcJzako/omXEoazXxYL09Zk2Z/bzJmJYPkWcm7tm05pa mn/gKR6lUj+Nu+h4gJ7S7XhmijQIAiguEKG4bmitRwVNIEzHq6s+KYp+M+Yw3puO4bIy 4wZQ== 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=94Gy5568YufaRYvoXj2miHEQCoFbMeytI6druE3dFoA=; b=f+E2eTjMboHI9UWS3qGtF2Kfk88FssUJKa6TTlku+5Hy1cTBSs82itswIttn7/GJoN dm16ZkbH34hv6AyJIrXm511PAinAfol03QpM8iJnOOKe/axJmzVPmvwQBAa6sHf5nMLD WXgxCVR7xsjc1Dy414BNNnTl3N4duJrja2JTsh6Emci/pw8kxxFxpv9Df7+1dlKTaPam qN9RQIvkXpFg8MrgDa2KQPR/HWzPmGGELFIb8tqxHKEny9nMcCqcd9sw+63FwwyZ1f/V 81o+UKbrImGuXz1N1/1PR+kbNPNQbkqx6PWMTXacZ0s60yg1Ixy+WTSLoqV2DA8BPETo qavw== X-Gm-Message-State: ALQs6tBOW4WHfrj0aLTFBfO69IcJ1P2o4G4LuVJ8qdV4Hip9gxG6oeNd /+v7AzLKC46SRm2vxMhtcto= X-Google-Smtp-Source: AIpwx4/XP+QtLSKPZLrrkmQdovYxU9I9ThvnPGG9nezQ2baognYjKJk1NISjfAY/Sia8EgtdzOTv5g== X-Received: by 10.28.210.193 with SMTP id j184mr4535667wmg.14.1524394420875; Sun, 22 Apr 2018 03:53:40 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD74E1B04DD092444F21FA8F1.dip0.t-ipconnect.de. [2003:dc:d74e:1b04:dd09:2444:f21f:a8f1]) by smtp.googlemail.com with ESMTPSA id l53-v6sm21212086wrc.80.2018.04.22.03.53.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 03:53:40 -0700 (PDT) From: Martin Blumenstingl To: linus.walleij@linaro.org, robh+dt@kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org Cc: mark.rutland@arm.com, carlo@caione.org, khilman@baylibre.com, Martin Blumenstingl Subject: [PATCH 3/3] pinctrl: meson: meson8: add the RGMII RXD2/RXD3 and TXD2/TXD3 signals Date: Sun, 22 Apr 2018 12:53:30 +0200 Message-Id: <20180422105330.4712-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422105330.4712-1-martin.blumenstingl@googlemail.com> References: <20180422105330.4712-1-martin.blumenstingl@googlemail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org These are only available on the Meson8m2 SoC (which uses the same DesignWare Ethernet MAC as Meson8b). The "eth_tx_clk_50m" signal either provides a 50MHz clock for the RMII PHYs or the RGMII TX clock (as far as we know the frequency is controlled by the PRG_ETHERNET registers in the Ethernet MAC "glue" IP block). Signed-off-by: Martin Blumenstingl --- drivers/pinctrl/meson/pinctrl-meson8.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c index 086082aeb796..c6d79315218f 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8.c +++ b/drivers/pinctrl/meson/pinctrl-meson8.c @@ -299,6 +299,10 @@ static const unsigned int spi_mosi_1_pins[] = { GPIOZ_12 }; static const unsigned int spi_miso_1_pins[] = { GPIOZ_13 }; static const unsigned int spi_ss2_1_pins[] = { GPIOZ_14 }; +static const unsigned int eth_txd3_pins[] = { GPIOZ_0 }; +static const unsigned int eth_txd2_pins[] = { GPIOZ_1 }; +static const unsigned int eth_rxd3_pins[] = { GPIOZ_2 }; +static const unsigned int eth_rxd2_pins[] = { GPIOZ_3 }; static const unsigned int eth_tx_clk_50m_pins[] = { GPIOZ_4 }; static const unsigned int eth_tx_en_pins[] = { GPIOZ_5 }; static const unsigned int eth_txd1_pins[] = { GPIOZ_6 }; @@ -650,6 +654,12 @@ static struct meson_pmx_group meson8_cbus_groups[] = { GROUP(eth_mdio, 6, 6), GROUP(eth_mdc, 6, 5), + /* NOTE: the following four groups are only available on Meson8m2: */ + GROUP(eth_rxd2, 6, 3), + GROUP(eth_rxd3, 6, 2), + GROUP(eth_txd2, 6, 1), + GROUP(eth_txd3, 6, 0), + GROUP(i2c_sda_a0, 5, 31), GROUP(i2c_sck_a0, 5, 30), @@ -877,7 +887,8 @@ static const char * const spi_groups[] = { static const char * const ethernet_groups[] = { "eth_tx_clk_50m", "eth_tx_en", "eth_txd1", "eth_txd0", "eth_rx_clk_in", "eth_rx_dv", - "eth_rxd1", "eth_rxd0", "eth_mdio", "eth_mdc" + "eth_rxd1", "eth_rxd0", "eth_mdio", "eth_mdc", "eth_rxd2", + "eth_rxd3", "eth_txd2", "eth_txd3" }; static const char * const i2c_a_groups[] = {