From patchwork Thu Mar 23 16:50:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9641627 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 CB175602CA for ; Thu, 23 Mar 2017 16:52:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF62D1FF60 for ; Thu, 23 Mar 2017 16:52:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4373283FD; Thu, 23 Mar 2017 16:52:22 +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=ham 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 657C21FF60 for ; Thu, 23 Mar 2017 16:52:22 +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=F/qoWevuIKHxYYkynwO3bbkLojCw7EY951KWdQDOsA4=; b=sUsjtA5ZlNgSWPBd4b+pdjJXOp YIBmSNmBfMySpCMgHj7IExQ1tCWxRMR7G3OFlRlC+lJVrTBb6W0DNBE97MppaNaGE0qz2BhI+x5h2 zDYYL3EzoDo29KgRJ78nGCIykz/W0E8ZsbmhtagyCBCkOCcvJUxqSc4teUELkGmYpEe4g48qHc6io aoPqJjiZXSc79ylmG6sEU25NEhCYGVmG8AV6WEJ5HCJfg9/+AzDsu1QWXj/LJnlfol9R/cKT7jf4d faPJv/ZMXvZuf/+ldzPZbDf1oBsWnoxBlhjDD+3J/YowVO6EXgNTkYTp9S42RkyG3VYH3/fqB1ey+ QaAa17/A==; 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 1cr5yI-0000Tn-3W; Thu, 23 Mar 2017 16:52:22 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cr5xT-0008Cs-4x for linux-arm-kernel@lists.infradead.org; Thu, 23 Mar 2017 16:51:36 +0000 Received: by mail-wm0-x22e.google.com with SMTP id t189so1270325wmt.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=DqTGXDShAMlgfFe9D7Tu7K/c2OBrJ9su6qdQ1kx453o=; b=zMzW4SIN+nEhGQwuF+RKU55YlE9tbhmL/nUYs1tu5brxShSCQH+qGKuZD8VOkEZ102 m4jsOKteIdYLdwaSs9C4RMj9lj3xbWsVKwip9Ob7K4Ilnt4uOmWzoCq1pQk0Tr6q6ilg Wtk8SUVGSl9maEmsOTQfPhVHNXA3T3Mtn/PExfwSE8JRszXEnu5WDU9paG+NJZxBp/sL BBXgsRgkSTvKN51tqs7U4moA8QxtINqU8L9MirwhumgzZA0yDMlTiXskGlSuMKNmhrZ+ vyWvbbkYZG70FQ2bcekDDUuXavK+RCs1hwWsFSLBcAO/lAIoIPwQmk/y7fMD3GH0Bt9v GO3w== 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=DqTGXDShAMlgfFe9D7Tu7K/c2OBrJ9su6qdQ1kx453o=; b=SFVvlGQEMjeL/1jBVinAg2wImAeNGy3VCGQOdaEaCVfvVixEdGFY0NT2lxlRFQh65v Xme9vkFQoXWaPO75DNCW5H8XJelhO8VRJPNyXTBRqm9144j+TxnZXtU37bMI3On4snuP 3kihr3qBc8e1VdvVofJDKwqBlfRPMaCiioI7/yYLb0PYf7nGFHzBmYk3iBUd40wlEzaG gZFAK9ywVAza0fD2nSnm5iQAI2OCvIADJ0iQNGCvoMhBnWnaggr8pBN069qFLKMtLS4s KJpJJhzX/1vKLDnceuLSvPxqTiWuZeJtwpLeez2P6imAOrSi0ABYvA7cqfqiByDzY6KL rXvA== X-Gm-Message-State: AFeK/H2NKrJnDnNfsmnBrB5hl4PrWrfZoOKcpck+tOU9+IPYcKTxSXZO1nfmEbexf7hWzTNe X-Received: by 10.28.24.6 with SMTP id 6mr14696194wmy.142.1490287869158; Thu, 23 Mar 2017 09:51:09 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id e129sm5061893wma.13.2017.03.23.09.51.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Mar 2017 09:51:08 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Carlo Caione , Kevin Hilman Subject: [PATCH 4/8] pinctrl: meson: gxl: add spdif output pins Date: Thu, 23 Mar 2017 17:50:57 +0100 Message-Id: <20170323165101.29262-5-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_468664_475FE116 X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. 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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index a022a9e49113..a5a9b4f78636 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -220,6 +220,8 @@ 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 unsigned int spdif_out_h_pins[] = { PIN(GPIOH_4, EE_OFF) }; + static const struct pinctrl_pin_desc meson_gxl_aobus_pins[] = { MESON_PIN(GPIOAO_0, 0), MESON_PIN(GPIOAO_1, 0), @@ -252,6 +254,9 @@ 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 const unsigned int spdif_out_ao_6_pins[] = { PIN(GPIOAO_6, EE_OFF) }; +static const unsigned int spdif_out_ao_9_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), @@ -407,6 +412,7 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { GROUP(i2s_out_ao_clk, 6, 25), GROUP(i2s_out_lr_clk, 6, 24), GROUP(i2s_out_ch01, 6, 23), + GROUP(spdif_out_h, 6, 28), /* Bank DV */ GROUP(uart_tx_b, 2, 16), @@ -473,6 +479,8 @@ static struct meson_pmx_group meson_gxl_aobus_groups[] = { GROUP(pwm_ao_b, 0, 3), GROUP(i2s_out_ch23_ao, 1, 0), GROUP(i2s_out_ch45_ao, 1, 1), + GROUP(spdif_out_ao_6, 0, 16), + GROUP(spdif_out_ao_9, 0, 4), }; static const char * const gpio_periphs_groups[] = { @@ -594,6 +602,10 @@ static const char * const i2s_out_groups[] = { "i2s_out_ch01", "i2s_out_ch23_z", "i2s_out_ch45_z", "i2s_out_ch67_z", }; +static const char * const spdif_out_groups[] = { + "spdif_out_h", +}; + 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", @@ -623,6 +635,10 @@ static const char * const i2s_out_ao_groups[] = { "i2s_out_ch23_ao", "i2s_out_ch45_ao", }; +static const char * const spdif_out_ao_groups[] = { + "spdif_out_ao_6", "spdif_out_ao_9", +}; + static struct meson_pmx_func meson_gxl_periphs_functions[] = { FUNCTION(gpio_periphs), FUNCTION(emmc), @@ -645,6 +661,7 @@ static struct meson_pmx_func meson_gxl_periphs_functions[] = { FUNCTION(hdmi_hpd), FUNCTION(hdmi_i2c), FUNCTION(i2s_out), + FUNCTION(spdif_out), }; static struct meson_pmx_func meson_gxl_aobus_functions[] = { @@ -655,6 +672,7 @@ static struct meson_pmx_func meson_gxl_aobus_functions[] = { FUNCTION(pwm_ao_a), FUNCTION(pwm_ao_b), FUNCTION(i2s_out_ao), + FUNCTION(spdif_out_ao), }; static struct meson_bank meson_gxl_periphs_banks[] = {