From patchwork Thu Mar 23 16:50:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9641657 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 BDF8760327 for ; Thu, 23 Mar 2017 17:02:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEF7D27F17 for ; Thu, 23 Mar 2017 17:02:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A39022841D; Thu, 23 Mar 2017 17:02: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 464AC27F17 for ; Thu, 23 Mar 2017 17:02:09 +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=xgpbov9DLVWsSc62/RfbvqjdYd/YkyXA211Dz03+rOg=; b=izuxXj0O1biJCr2Xv26JGGXzpI utNJ5E3JdpTBFb5tfNuYHU1Ucji8MF8cymOn0zzub+QHvCs++d4I51g7bIYaKwpuFZqtxjc0VcIaR 3WV91IH4Lq2dUo3EwV8BLjqPdx8DYTWLKHF1ji2gCdcXisa4tRjXhLrzSQhZs7rY5RmN7Q6AWQ9gZ 2M9KMFdlOTyO5m2InQwaGObD2OZEdzdL1hBnBgC3aafTbC646aKFgdn4gpBWpD9Luj3AXTMHXALZ4 n/8wCpebe6Lhb7pmtsu5Jj9x7Bh67vlIg77kOnFWuSCCRx1LeRntuuVccnwk8Mvygg/gLoPb1vcN0 jjcOk6tQ==; 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 1cr67j-0006dd-KD; Thu, 23 Mar 2017 17:02: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 1cr5xS-0008Cq-Nn for linux-arm-kernel@lists.infradead.org; Thu, 23 Mar 2017 16:51:34 +0000 Received: by mail-wr0-x22e.google.com with SMTP id l37so151744825wrc.1 for ; Thu, 23 Mar 2017 09:51:10 -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=ylHyyGKcVtB9jFLmEQnO95zvUCOV4vd1Mykk1kzxV5o=; b=zpeJtL3ZTEVO6i9J5T4peaElFBdcPPGJ0VFk57FxXe35Kw15r5/OhA+Kg7BegWK+9K qDTAKh5VZbgTiFJE+QyWHtTkx5R8d3DJ7TcQ610CkEavllE5uw3Idl1/DaOJL2AfTRrQ ZV56Syi5rly/u4+HwBOmpSuRL4Bj9XmQsaWIFoF1uShv0B2XcS0XkirYU53AOaxARTLj Al8lxBowhwSv6vFxrR6tlB4ScmHzFI9+aZ2vmyajL3Qi/wU5eoZn/g3D3AqK9Vh5uUsB BcDO3vArs1IILHJUlzJuVsB/AWuRp8tLLl1HvlSBsizg2RSq19tDy6C39i9VQXrTh3Lr rPTw== 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=ylHyyGKcVtB9jFLmEQnO95zvUCOV4vd1Mykk1kzxV5o=; b=TEp+bN8awLeZjO1IG+jY8Y+Lq07znYa5sGsGPn/EY6dBxKNznvheD0CfPKm1JeRO0i r0hQ6a/yrbhBu07cc+ouuTKhMqLSBQNYKgSAZuZCIzN8G9ajqDYin40b3vUbGRAD4KuM U3UsI5gb7BG+BlowokTI1WLngTs5jrbo4jHcE2O9SSFMVZRJFkzFTEtm3igZTdeeUrun hc7p6JbYHQyhgbz2alawbHnPgfR7bbO/agwKBV9OX9SKCav4SH+XaLry+YfmZByAbWBF mQSBQP1GvBpEnS7RomuGN8enGKJzBcN7R/wcyO+yvCkX+GCPJk8qD1S/KYd/UXUCLsY7 r7mA== X-Gm-Message-State: AFeK/H2do7ndRi1+XWORmlC/+s4hAZdXNbJ+lrfUOZuQkdiyclKdNLwkwdiukcWFdDM413PN X-Received: by 10.223.142.18 with SMTP id n18mr3483115wrb.188.1490287868084; Thu, 23 Mar 2017 09:51:08 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id e129sm5061893wma.13.2017.03.23.09.51.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Mar 2017 09:51:07 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Carlo Caione , Kevin Hilman Subject: [PATCH 3/8] pinctrl: meson: gxl: add i2s output pins Date: Thu, 23 Mar 2017 17:50:56 +0100 Message-Id: <20170323165101.29262-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170323165101.29262-1-jbrunet@baylibre.com> References: <20170323165101.29262-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170323_095131_082425_A27EB4BF X-CRM114-Status: GOOD ( 10.05 ) 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: linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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 Signed-off-by: Jerome Brunet --- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index a0a7936f8f0d..a022a9e49113 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -212,6 +212,14 @@ static const unsigned int hdmi_hpd_pins[] = { PIN(GPIOH_0, EE_OFF) }; static const unsigned int hdmi_sda_pins[] = { PIN(GPIOH_1, EE_OFF) }; static const unsigned int hdmi_scl_pins[] = { PIN(GPIOH_2, EE_OFF) }; +static const unsigned int i2s_am_clk_pins[] = { PIN(GPIOH_6, EE_OFF) }; +static const unsigned int i2s_out_ao_clk_pins[] = { PIN(GPIOH_7, EE_OFF) }; +static const unsigned int i2s_out_lr_clk_pins[] = { PIN(GPIOH_8, EE_OFF) }; +static const unsigned int i2s_out_ch01_pins[] = { PIN(GPIOH_9, EE_OFF) }; +static const unsigned int i2s_out_ch23_z_pins[] = { PIN(GPIOZ_5, EE_OFF) }; +static const unsigned int i2s_out_ch45_z_pins[] = { PIN(GPIOZ_6, EE_OFF) }; +static const unsigned int i2s_out_ch67_z_pins[] = { PIN(GPIOZ_7, EE_OFF) }; + static const struct pinctrl_pin_desc meson_gxl_aobus_pins[] = { MESON_PIN(GPIOAO_0, 0), MESON_PIN(GPIOAO_1, 0), @@ -241,6 +249,9 @@ static const unsigned int pwm_ao_a_8_pins[] = { PIN(GPIOAO_8, 0) }; static const unsigned int pwm_ao_b_pins[] = { PIN(GPIOAO_9, 0) }; +static const unsigned int i2s_out_ch23_ao_pins[] = { PIN(GPIOAO_8, EE_OFF) }; +static const unsigned int i2s_out_ch45_ao_pins[] = { PIN(GPIOAO_9, EE_OFF) }; + static struct meson_pmx_group meson_gxl_periphs_groups[] = { GPIO_GROUP(GPIOZ_0, EE_OFF), GPIO_GROUP(GPIOZ_1, EE_OFF), @@ -384,11 +395,18 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { GROUP(eth_txd2, 4, 11), GROUP(eth_txd3, 4, 10), GROUP(pwm_c, 3, 20), + GROUP(i2s_out_ch23_z, 3, 26), + GROUP(i2s_out_ch45_z, 3, 25), + GROUP(i2s_out_ch67_z, 3, 24), /* Bank H */ GROUP(hdmi_hpd, 6, 31), GROUP(hdmi_sda, 6, 30), GROUP(hdmi_scl, 6, 29), + GROUP(i2s_am_clk, 6, 26), + GROUP(i2s_out_ao_clk, 6, 25), + GROUP(i2s_out_lr_clk, 6, 24), + GROUP(i2s_out_ch01, 6, 23), /* Bank DV */ GROUP(uart_tx_b, 2, 16), @@ -453,6 +471,8 @@ static struct meson_pmx_group meson_gxl_aobus_groups[] = { GROUP(pwm_ao_a_3, 0, 22), GROUP(pwm_ao_a_8, 0, 17), GROUP(pwm_ao_b, 0, 3), + GROUP(i2s_out_ch23_ao, 1, 0), + GROUP(i2s_out_ch45_ao, 1, 1), }; static const char * const gpio_periphs_groups[] = { @@ -569,6 +589,11 @@ static const char * const hdmi_i2c_groups[] = { "hdmi_sda", "hdmi_scl", }; +static const char * const i2s_out_groups[] = { + "i2s_am_clk", "i2s_out_ao_clk", "i2s_out_lr_clk", + "i2s_out_ch01", "i2s_out_ch23_z", "i2s_out_ch45_z", "i2s_out_ch67_z", +}; + static const char * const gpio_aobus_groups[] = { "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9", @@ -594,6 +619,10 @@ static const char * const pwm_ao_b_groups[] = { "pwm_ao_b", }; +static const char * const i2s_out_ao_groups[] = { + "i2s_out_ch23_ao", "i2s_out_ch45_ao", +}; + static struct meson_pmx_func meson_gxl_periphs_functions[] = { FUNCTION(gpio_periphs), FUNCTION(emmc), @@ -615,6 +644,7 @@ static struct meson_pmx_func meson_gxl_periphs_functions[] = { FUNCTION(pwm_f), FUNCTION(hdmi_hpd), FUNCTION(hdmi_i2c), + FUNCTION(i2s_out), }; static struct meson_pmx_func meson_gxl_aobus_functions[] = { @@ -624,6 +654,7 @@ static struct meson_pmx_func meson_gxl_aobus_functions[] = { FUNCTION(remote_input_ao), FUNCTION(pwm_ao_a), FUNCTION(pwm_ao_b), + FUNCTION(i2s_out_ao), }; static struct meson_bank meson_gxl_periphs_banks[] = {