From patchwork Sun Mar 26 17:19:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9645101 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 93AE2602C8 for ; Sun, 26 Mar 2017 17:21:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DB1F27F10 for ; Sun, 26 Mar 2017 17:21:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71D8A27F9F; Sun, 26 Mar 2017 17:21:07 +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 EC41827F10 for ; Sun, 26 Mar 2017 17:21:06 +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=nZZvmuGWk4jNam5Y4y8g1eyPM22oyBLxlxwHjp6QAOk=; b=El0q9FvZosrtAqQ+Xx7pAr3m5D dclf2yhEstwDk2ZjAXL8ZNYXgCM4+TWpMtk9Udg2FqOsLbSy7hDKoPiTKDzOtiUxRwaedmUzRehCv EjUJ/qYzAq84WjvA6QLIEQnL7LoCpRKZjPJWm3hdOzpQzIvuBWRJAxmIu3YsxY3HoXlubzWLQFgH1 RhZbEcAxZjYrbWLHc0s9nLyT2UjWE2FC6+d1iiBG7ahjWT1Qk4WhZkrjMa97Lts/nS7ZkbzXZDefp VST0R9dRuy8dcFn6wbMzrTU/vNT7+YdKQUJXQ4KKK6i0i02S3zKVglW3/GyI9f3VPBUygfM3BV+ku O+aBchxg==; 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 1csBqj-0006Td-TU; Sun, 26 Mar 2017 17:21:05 +0000 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csBpd-0004Oo-42 for linux-arm-kernel@lists.infradead.org; Sun, 26 Mar 2017 17:19:59 +0000 Received: by mail-wr0-x229.google.com with SMTP id l43so25401378wre.1 for ; Sun, 26 Mar 2017 10:19:36 -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=xiOLIP9bVxV2CjJ6dInIDvVBHInRQ7au6FFtIV2f4yg=; b=Ax6v5isJeJiYwjetMoTf4TmCqogHhUh/G2I5YVbPEQJbPeevjDC7gCss9Xkejh+l/S kA/fVWP16xNBmnY3soosxvJa4YW0nQMDn900CQDOKV0y36YglwAHnX8v+0/dEfv/fy1M szIl/OHq04ZeTmndAfSspGAkAaXAZGw8zF9RX3bTwgsxXSOB/Qy8ci7E4shN7Jl7Sxdf 8/kMZa+Jx4DTpC82KWo6UY7MJvkv/OiMBQZUAVqbQrXvokdX7mz9YOwEE6ARkuRnsl8z e0ltQY8fJ0uHHzJBHh0S7oRsZ0Q2OH7j7QMW3Yxbu0GzELFJVZUtPniHA3nrTW/lsV/J Uf5A== 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=xiOLIP9bVxV2CjJ6dInIDvVBHInRQ7au6FFtIV2f4yg=; b=mzlEV/Ik9dBxSr4QGMXDTpez0ssDRccbgmEfZc+vKuJX7GTyV7l/oPmCaZOsvUm3u/ HfFY4RZ5K9UQd8lspCkvSrFIZ1RLoL7o7DQRcIqrn+hT5QcJ9bIoMaG+sL/qAY9QNKoz Rh5cw6LzD4ixhAmFQPjCbXkyhuP2isPSQB07GAf1ed7GYaIA11cm9wp246onDlgsyKzL ZpJCIbP8dyPT6D4gkhhbifLn9BGNn3tyqSd+AsGBekZZxqKUnOKZ8oQU0QRHRT+gaOyQ TFFOzHfCbZESO7ZuA5iAULQpu2IxetMjcMRVge7q6TYQ7NZeiUz7eh2VcBnZ1iyFw0GF 7FBQ== X-Gm-Message-State: AFeK/H3rz6casymSJ3s9T+UVEfcaCyDlGUP7vihYXynI1RSLltF86uwESH4Ld49O6oS7zEEc X-Received: by 10.28.109.93 with SMTP id i90mr6187516wmc.44.1490548775317; Sun, 26 Mar 2017 10:19:35 -0700 (PDT) Received: from localhost.localdomain (uluru.liltaz.com. [163.172.81.188]) by smtp.googlemail.com with ESMTPSA id t79sm10531214wmd.29.2017.03.26.10.19.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Mar 2017 10:19:34 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Carlo Caione , Kevin Hilman Subject: [PATCH v2 4/8] pinctrl: meson: gxl: add spdif output pins Date: Sun, 26 Mar 2017 19:19:19 +0200 Message-Id: <20170326171923.19269-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170326171923.19269-1-jbrunet@baylibre.com> References: <20170326171923.19269-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170326_101957_579292_3136E579 X-CRM114-Status: UNSURE ( 9.70 ) 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 Add EE and AO domains pins for the spdif output. Acked-by: Kevin Hilman 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 e472213fd673..998210eacf37 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -232,6 +232,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), @@ -272,6 +274,9 @@ static const unsigned int pwm_ao_b_6_pins[] = { PIN(GPIOAO_6, 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), @@ -429,6 +434,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), @@ -510,6 +516,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[] = { @@ -635,6 +643,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", @@ -673,6 +685,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), @@ -696,6 +712,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[] = { @@ -708,6 +725,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[] = {