From patchwork Sun Mar 26 17:19:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9645093 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 AF40D602C8 for ; Sun, 26 Mar 2017 17:20:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99D7E27F10 for ; Sun, 26 Mar 2017 17:20:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E8DC27F9F; Sun, 26 Mar 2017 17:20:39 +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 411F927F10 for ; Sun, 26 Mar 2017 17:20:39 +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=/X1ke7fowisMLkhdiKKRJb7Po5rrUWgIfVEVmCZvVWA=; b=XxIbFKRM+4OpCYOeZ1ib6hADPK 0yJh06DDEWOjKkOJhoIBi+b5logvhImqoPIoW5z+6mT+nf+1ObtnJbWA1s8kV5Nicdx9rwurENvVQ 0Y3OMnZUDEkcuwuogschGFq3QXYJ9ohEMLv2WOzoXSVT8HMAtXJRZbNJj2DIpFJyq50mcYNb8TNfN VXrgO2G28UVRtQB0VSY0efhJv1d/e0vD9y48bRUuFuyIows1uPWRvQRrA5UnfyazEn7CWGzoPGl/b 266Won5nNXRAZoUcPdGWETwvTPozwN0nxFem7J0dDDT7nSYtpHtAkCz0fZHMl+J0QKIPqefbK3zi3 2V+zw6qw==; 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 1csBqD-00065c-0W; Sun, 26 Mar 2017 17:20:33 +0000 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csBpa-0004Ob-BS for linux-arm-kernel@lists.infradead.org; Sun, 26 Mar 2017 17:19:57 +0000 Received: by mail-wr0-x22c.google.com with SMTP id w11so13730758wrc.3 for ; Sun, 26 Mar 2017 10:19:33 -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=lg2Yb8UbH7qz0TtLFcMU2PbZlbgPSrxgceeFyrfYeoI=; b=POBNBuToxpj2TweHTsygKsQSKLVYFG3zcZZjQSxqkCE9jOWbYORNvUg0/pPJnhpP/6 90G7xT1HTeXFouQK6gk8iyBE514hcVSnkp+309HhrMb6Ef5p3VjEi/mPyOR4EyIfqnOv 1CqRNTUuFoSKG63N1SXSdFnQnAp1l4X8Gl9JQYE67di/UEBqwgEXE4kCD1fIlpEZabBG lNII1AB96sMWCYiIRek29WY4EfeGP4Bxkp/L6CYiN4smg3lSLUDMcOu4mPl5Xwv8dFAN wDq+ilBKY15t7vR1nj92FCl9sOPlfr50wtnj76jkoxsz6wJ+1Cz+YW6YbOK+c/sCvBNJ gitw== 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=lg2Yb8UbH7qz0TtLFcMU2PbZlbgPSrxgceeFyrfYeoI=; b=eoqrc2WPlBmeyh/qKI6BygDxzklteyJkyrWZnHORX/axGAC3gSFtxzd/hpUvo8lmnS 2GUhj3HVx8DHIimbQY5b3+7DB+mMtD932HTbZoal82S3cokZE+zhpSZk+Q1tz9kvRdex UrC/uo8RwoSCgEJUN1e3XIYFsk10kWolxOU1aGB29pmGBLE5XY/pehAQZglsQE/PiqOz kBIjQ+CmsDNEz1RMiki0HSiP/e9ElmaSDKvRxy0zFt9lPr2u0WQHU4LEMbDyQLOCPgg/ xmVff2IFbaYp07WCs2TYGcFLAZoqedgw4wiUaRN0bHLZPCcyT6/1ME9sEGBUgUBMmmhY 0A+Q== X-Gm-Message-State: AFeK/H3iL4dXs+XbzWHD5Whsjl4VBFqzojO0vPEeB8U8rOdzUjelOleBWW/j+t4gGno91vH3 X-Received: by 10.28.156.140 with SMTP id f134mr5887529wme.40.1490548772571; Sun, 26 Mar 2017 10:19:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Mar 2017 10:19:31 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Carlo Caione , Kevin Hilman Subject: [PATCH v2 2/8] pinctrl: meson: gxbb: add spdif output pins Date: Sun, 26 Mar 2017 19:19:17 +0200 Message-Id: <20170326171923.19269-3-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_101954_545177_54326892 X-CRM114-Status: UNSURE ( 9.81 ) 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-gxbb.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index b9772a124a82..9b00be15d258 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -240,6 +240,8 @@ static const unsigned int i2s_out_ch23_y_pins[] = { PIN(GPIOY_8, EE_OFF) }; static const unsigned int i2s_out_ch45_y_pins[] = { PIN(GPIOY_9, EE_OFF) }; static const unsigned int i2s_out_ch67_y_pins[] = { PIN(GPIOY_10, EE_OFF) }; +static const unsigned int spdif_out_y_pins[] = { PIN(GPIOY_12, EE_OFF) }; + static const struct pinctrl_pin_desc meson_gxbb_aobus_pins[] = { MESON_PIN(GPIOAO_0, 0), MESON_PIN(GPIOAO_1, 0), @@ -285,6 +287,9 @@ static const unsigned int i2s_out_ch01_ao_pins[] = { PIN(GPIOAO_11, 0) }; static const unsigned int i2s_out_ch23_ao_pins[] = { PIN(GPIOAO_12, 0) }; static const unsigned int i2s_out_ch45_ao_pins[] = { PIN(GPIOAO_13, 0) }; +static const unsigned int spdif_out_ao_6_pins[] = { PIN(GPIOAO_6, 0) }; +static const unsigned int spdif_out_ao_13_pins[] = { PIN(GPIOAO_13, 0) }; + static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GPIO_GROUP(GPIOZ_0, EE_OFF), GPIO_GROUP(GPIOZ_1, EE_OFF), @@ -440,6 +445,7 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GROUP(i2s_out_ch23_y, 1, 5), GROUP(i2s_out_ch45_y, 1, 6), GROUP(i2s_out_ch67_y, 1, 7), + GROUP(spdif_out_y, 1, 9), /* Bank Z */ GROUP(eth_mdio, 6, 1), @@ -543,6 +549,8 @@ static struct meson_pmx_group meson_gxbb_aobus_groups[] = { GROUP(i2s_out_ch01_ao, 0, 27), 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_13, 0, 4), }; static const char * const gpio_periphs_groups[] = { @@ -676,6 +684,10 @@ static const char * const i2s_out_groups[] = { "i2s_out_ch23_y", "i2s_out_ch45_y", "i2s_out_ch67_y", }; +static const char * const spdif_out_groups[] = { + "spdif_out_y", +}; + 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", @@ -723,6 +735,10 @@ static const char * const i2s_out_ao_groups[] = { "i2s_out_ch01_ao", "i2s_out_ch23_ao", "i2s_out_ch45_ao", }; +static const char * const spdif_out_ao_groups[] = { + "spdif_out_ao_6", "spdif_out_ao_13", +}; + static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(gpio_periphs), FUNCTION(emmc), @@ -747,6 +763,7 @@ static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(hdmi_hpd), FUNCTION(hdmi_i2c), FUNCTION(i2s_out), + FUNCTION(spdif_out), }; static struct meson_pmx_func meson_gxbb_aobus_functions[] = { @@ -761,6 +778,7 @@ static struct meson_pmx_func meson_gxbb_aobus_functions[] = { FUNCTION(pwm_ao_a_12), FUNCTION(pwm_ao_b), FUNCTION(i2s_out_ao), + FUNCTION(spdif_out_ao), }; static struct meson_bank meson_gxbb_periphs_banks[] = {