From nobody Wed Jul 1 03:07:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DBEAC433F5 for ; Mon, 3 Jan 2022 15:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233889AbiACPq5 (ORCPT ); Mon, 3 Jan 2022 10:46:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230160AbiACPqz (ORCPT ); Mon, 3 Jan 2022 10:46:55 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5645C061761 for ; Mon, 3 Jan 2022 07:46:54 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id w7so24588668plp.13 for ; Mon, 03 Jan 2022 07:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mGd2tehqllUPXzMzPxa45XALLgMArX9xtGYlZrmeREY=; b=WvtxB1ung9NzUxIWNt+S8bbVr7Oo/WYuoF1OH9gg15H9VGzCZDxkFMYB6WJB0j54PM Eb9HjuoT5rA5xMB3aY1+5NI5/68dutfwSltaz1WOMLZGjc9BOAqXKEF7NDoZRUGGmm7e u3crLy0GnKkTWuD2EUHEusSLAhntfBkG3uAYI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mGd2tehqllUPXzMzPxa45XALLgMArX9xtGYlZrmeREY=; b=yiKlm8+GYYzKH7LOW1PZz4UGsuJ0M+nAVAQprYtNK+jbIHo+0opmz9KLGz+W6sodpw RbWmcLvyhgUs6z7CrVWRnRjEsO0g73dP5sUN0v+D1xvz06d90RlUZhxf+/0AO+qtf/yP k/2ZiE4sQ2f14jogN7LF0urIFV2BapkaBYJ1MudpDGAg3C52w/N0avqI8hVXsuQw0tE4 XBkBc10wnGNtIM7iNgw41CSSrh9EO0vHJhjKpGopVyQaU7Hh3Cytm07upsoya5Il8FRE 1/Z+9RizSllzMUOqvlss6vNsUDVjFDe9/jB01/eB3e+bW1XWQzkop3ztAS3st4i4/3fn c7AQ== X-Gm-Message-State: AOAM533fIEqFfbbxCOm9SwReD98RQqpkPEeLAfEi8o+9W6T9qMW9RoDf /TKBqfhchu82CZT5q5WOpxyJqg== X-Google-Smtp-Source: ABdhPJzUBnOMa3u341HSV7yD1MmYO/74k9hrxYCcrAiKRckCANPf4WLP8hN5nqUEW6OFbqayue0rVQ== X-Received: by 2002:a17:902:8e82:b0:149:b26a:b9c8 with SMTP id bg2-20020a1709028e8200b00149b26ab9c8mr10850854plb.143.1641224814429; Mon, 03 Jan 2022 07:46:54 -0800 (PST) Received: from localhost.localdomain (lfbn-idf1-1-1088-186.w82-125.abo.wanadoo.fr. [82.125.191.186]) by smtp.gmail.com with ESMTPSA id l2sm41080153pfc.42.2022.01.03.07.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 07:46:54 -0800 (PST) From: Gary Bisson To: linux-amlogic@lists.infradead.org Cc: Gary Bisson , Linus Walleij , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] pinctrl: meson-g12a: add more pwm_f options Date: Mon, 3 Jan 2022 16:46:14 +0100 Message-Id: <20220103154616.308376-2-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220103154616.308376-1-gary.bisson@boundarydevices.com> References: <20220103154616.308376-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12. Signed-off-by: Gary Bisson Reviewed-by: Neil Armstrong --- Cc: Linus Walleij Cc: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: Martin Blumenstingl Cc: linux-gpio@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/m= eson/pinctrl-meson-g12a.c index cd9656b13836..d182a575981e 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -283,6 +283,8 @@ static const unsigned int pwm_d_x6_pins[] =3D { GPIOX_= 6 }; static const unsigned int pwm_e_pins[] =3D { GPIOX_16 }; =20 /* pwm_f */ +static const unsigned int pwm_f_z_pins[] =3D { GPIOZ_12 }; +static const unsigned int pwm_f_a_pins[] =3D { GPIOA_11 }; static const unsigned int pwm_f_x_pins[] =3D { GPIOX_7 }; static const unsigned int pwm_f_h_pins[] =3D { GPIOH_5 }; =20 @@ -618,6 +620,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups= [] =3D { GROUP(tdm_c_dout2_z, 4), GROUP(tdm_c_dout3_z, 4), GROUP(mclk1_z, 4), + GROUP(pwm_f_z, 5), =20 /* bank GPIOX */ GROUP(sdio_d0, 1), @@ -768,6 +771,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups= [] =3D { GROUP(tdm_c_dout3_a, 2), GROUP(mclk0_a, 1), GROUP(mclk1_a, 2), + GROUP(pwm_f_a, 3), }; =20 /* uart_ao_a */ @@ -1069,7 +1073,7 @@ static const char * const pwm_e_groups[] =3D { }; =20 static const char * const pwm_f_groups[] =3D { - "pwm_f_x", "pwm_f_h", + "pwm_f_z", "pwm_f_a", "pwm_f_x", "pwm_f_h", }; =20 static const char * const cec_ao_a_h_groups[] =3D { --=20 2.34.1 From nobody Wed Jul 1 03:07:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71D8CC433EF for ; Mon, 3 Jan 2022 15:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234293AbiACPrA (ORCPT ); Mon, 3 Jan 2022 10:47:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234277AbiACPq6 (ORCPT ); Mon, 3 Jan 2022 10:46:58 -0500 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A5CC061761 for ; Mon, 3 Jan 2022 07:46:57 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id w7so24588781plp.13 for ; Mon, 03 Jan 2022 07:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DuinLQ82u9Ll4xBW8hohWni8CpDThAMqaisLf3sqjiw=; b=Kkolr/5fSCKwJ4AF6i6ciBiCFTzyg3CmMMSYRrUfD0D0Ih8pTE0FRQaVS8k6LwaWLS ePUreY/P0N4LNOx12Kzs9xYlg9X/jEHJYXEjqUC9Jj/dSznmL12TB3wNK3VF85Wn7nId OwXbl3OZsd2qiM0LzCd8CKaxFADRZ2ifCQqTE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DuinLQ82u9Ll4xBW8hohWni8CpDThAMqaisLf3sqjiw=; b=j8P93LlgnXoD+RRZQ654xPnClNJnyuGTnyDBzhfEck2pZQUYLqWZ0hKXo5bKr5iMvF tVVhkb+k87IvpqG7P94gnLBL0d4OaTNiUsLs10vi9nhDNNNCETjTe8fRIZRFIDrTsHB6 WSFhHFrbEye0BqYu11V8pVj22mudpKWwkl0Ha9VEuTx17cugE06IZmLg8KtVXpfLoksy 7ylAeUKM5eZBuVTMeycjwoJr8p2w93V8d9nwU2T8gRWyJFI52zxQHq3RXfhOdIeUYxmz qHx9n9tr6TyEiUyJuKuWiMVrPS1v9noPvDCcSSOj6kyIQcR5Tg/+xhQmBGDdtZN/jfnZ 22jg== X-Gm-Message-State: AOAM530ZaYVCePDROnkM2SnegMwEMhyLEAVie4wpfrhCES9beiNhPq7U JHIxUipLRlddDwx8Z0sok2vkRQ== X-Google-Smtp-Source: ABdhPJz2tbfvAdwQ5b5as5ZgbBIZRiJhaS6MhPLzuzfwJHOg6gxQ/AN0OK7D3ctvxBQi1c8X8Fbyug== X-Received: by 2002:a17:90b:210:: with SMTP id fy16mr37090944pjb.202.1641224817454; Mon, 03 Jan 2022 07:46:57 -0800 (PST) Received: from localhost.localdomain (lfbn-idf1-1-1088-186.w82-125.abo.wanadoo.fr. [82.125.191.186]) by smtp.gmail.com with ESMTPSA id l2sm41080153pfc.42.2022.01.03.07.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 07:46:57 -0800 (PST) From: Gary Bisson To: linux-amlogic@lists.infradead.org Cc: Gary Bisson , Rob Herring , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] arm64: dts: meson-g12-common: add more pwm_f options Date: Mon, 3 Jan 2022 16:46:15 +0100 Message-Id: <20220103154616.308376-3-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220103154616.308376-1-gary.bisson@boundarydevices.com> References: <20220103154616.308376-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12. Signed-off-by: Gary Bisson --- Cc: Rob Herring Cc: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: Martin Blumenstingl Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- .../arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index 00c6f53290d4..af1357c48bee 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -894,6 +894,22 @@ mux { }; }; =20 + pwm_f_z_pins: pwm-f-z { + mux { + groups =3D "pwm_f_z"; + function =3D "pwm_f"; + bias-disable; + }; + }; + + pwm_f_a_pins: pwm-f-a { + mux { + groups =3D "pwm_f_a"; + function =3D "pwm_f"; + bias-disable; + }; + }; + pwm_f_x_pins: pwm-f-x { mux { groups =3D "pwm_f_x"; --=20 2.34.1 From nobody Wed Jul 1 03:07:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 032AFC433FE for ; Mon, 3 Jan 2022 15:47:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234320AbiACPrG (ORCPT ); Mon, 3 Jan 2022 10:47:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234296AbiACPrB (ORCPT ); Mon, 3 Jan 2022 10:47:01 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2A64C061785 for ; Mon, 3 Jan 2022 07:47:00 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id t123so29718823pfc.13 for ; Mon, 03 Jan 2022 07:47:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LuC6I612TLZwEINCPwWyZhF1G85K2gAYC1IKzQ9Ubwg=; b=GRfk+w2ob9enhOcSB7G/ep4S1ROT5GfJoq0yFqlZEMr2APjXxmcSoqt3o4Pynd02JB iYIOn8TwYE3aU2fgGpMxqi+ZkGopJzSz9ViJI6mAr6cNZ+Nr1B/iE5+SXcKg373MHo2U pzHX1mC5YMj6dbFb4W3HcwRreytUsqfp/KVrM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LuC6I612TLZwEINCPwWyZhF1G85K2gAYC1IKzQ9Ubwg=; b=is+Ecipva41oH4S3pwoC1YaRut9bZokvHkBtcfTmU9nOa4P88yIVSXmR9ElFtVCTSJ OeSf/qENd0xzZZdiz2ABoNeyZGTA4etc8G/cKxM54bDadvjhRDMpSBsYIZIPfhGuV67A K/ABzpHNt9lMCqtCYwhsQbA8dVuQT64U6D5KE5jL0NVAOlQGh5okX2AsRt/6uBx0Mdyf Q7qrazBHo9dMdi4obp571Omhhr7GupqWKnHtMkfg38oAO51yywhCBMkVWX602Ch7775P mMgiXOqm2qdNX+L1jMCjzheHPi5s/gJaPa1bVgdLHmczCMlF4TSFXZyX5NQJJHlXpZen ozvg== X-Gm-Message-State: AOAM531Ln9qvK95Pdec1e1DXEP/Fxl18DHCbw1Puqjv/x0aGwi15ah9W taQbTP3YAjbr9pRp62+fE3YyyA== X-Google-Smtp-Source: ABdhPJwLI+NLuZ8zgVbA9INKDpuqIVAAWlzG6A08J97tHUyvcwYodufjPg5kieTeJIacj/Q74nw0Xw== X-Received: by 2002:a63:bf0b:: with SMTP id v11mr26213644pgf.144.1641224820490; Mon, 03 Jan 2022 07:47:00 -0800 (PST) Received: from localhost.localdomain (lfbn-idf1-1-1088-186.w82-125.abo.wanadoo.fr. [82.125.191.186]) by smtp.gmail.com with ESMTPSA id l2sm41080153pfc.42.2022.01.03.07.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 07:47:00 -0800 (PST) From: Gary Bisson To: linux-amlogic@lists.infradead.org Cc: Gary Bisson , Rob Herring , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] arm64: dts: meson-g12-common: add uart_ao_b pins muxing Date: Mon, 3 Jan 2022 16:46:16 +0100 Message-Id: <20220103154616.308376-4-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220103154616.308376-1-gary.bisson@boundarydevices.com> References: <20220103154616.308376-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" - RX/TX signals can be mapped on 2 different pairs of pins so supporting both options - RTS/CTS signals however only have 1 option available Signed-off-by: Gary Bisson --- Cc: Rob Herring Cc: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: Martin Blumenstingl Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- .../boot/dts/amlogic/meson-g12-common.dtsi | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index af1357c48bee..3a7773ffbd08 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -1952,6 +1952,33 @@ mux { }; }; =20 + uart_ao_b_1_pins: uart-ao-b-1 { + mux { + groups =3D "uart_ao_b_tx_2", + "uart_ao_b_rx_3"; + function =3D "uart_ao_b"; + bias-disable; + }; + }; + + uart_ao_b_2_pins: uart-ao-b-2 { + mux { + groups =3D "uart_ao_b_tx_8", + "uart_ao_b_rx_9"; + function =3D "uart_ao_b"; + bias-disable; + }; + }; + + uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts { + mux { + groups =3D "uart_ao_b_cts", + "uart_ao_b_rts"; + function =3D "uart_ao_b"; + bias-disable; + }; + }; + pwm_a_e_pins: pwm-a-e { mux { groups =3D "pwm_a_e"; --=20 2.34.1