From patchwork Thu Mar 23 16:50:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9641655 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 C10C860327 for ; Thu, 23 Mar 2017 17:01:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1CC527F17 for ; Thu, 23 Mar 2017 17:01:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A599A2841D; Thu, 23 Mar 2017 17:01:56 +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 7BC5227F17 for ; Thu, 23 Mar 2017 17:01:55 +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=rSYEDeOULtGsG3etpjKls1LTImWzpnaZXACaL97wq14=; b=BFPvQHV8v73FmXyLEHinhrviyC dj521Y/bozpfDhuwB6Yai8leqbCLV9KvF/fyFSoOnQxrcSlzIwibkInMXLoT8ZzzpAYxKp8CwCdKw aSz3TgX2iYpv/mYKJ3yMZhosokSOOaoRXREvKvPDO7nTA6gQM9+r1aRt18SiQWl76uFX4+ays+HPQ nslX+8mCL7TKWisj3FeGcckzTbLigrfuMMhTpsvojP/g5mfl4kRcv+6gzKuUrI7m4n9CEFR5eELcI 2AbTtFgb+zFAylV5MkYZEn4GyETylH/Zgd7M3cVhVtu3srkVk8XK+mgoJPkzmCg0wmK4J0hVOgHL2 vwuJFzPg==; 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 1cr67W-0006L4-6T; Thu, 23 Mar 2017 17:01:54 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cr5xQ-0008AX-Pg for linux-arm-kernel@lists.infradead.org; Thu, 23 Mar 2017 16:51:32 +0000 Received: by mail-wm0-x231.google.com with SMTP id n11so1289726wma.0 for ; Thu, 23 Mar 2017 09:51:08 -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=MEdoTxzuZ+oWq+m8ABnRdi+cPfLJ7xLrbbQ7jZir99I=; b=XgyFxKd1mn2kArAazy6jlB7DRhxQLaikVXw/Ws2jgzDaR9udJqK6IUCHhk1tuYTzy4 Vvl+j32ZXnRReSitE0x1FTSjMQr9CUFRIlrel+Xf22r3QcGT/1p99NK1WxOTW+RFNabA ONLfiQ6FlN4fRbf5xoFqXB+mZZ2+rVHwUFzJ5++uviHZMuxahwjUHMtiel55mDYY2lom tFrEtY+xQIH6z7tbC/mnK3VacX9EsfXpcKYcyhdIL3fBexHabsQXq0iHuFmzxy51VKLw /WT4e7ACDmVp+KWhFW8VCg7oLd+7XWiFm2YbDhn9AcdsYA9nlbHVTP9RzD+C7vs0xByO 6dxg== 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=MEdoTxzuZ+oWq+m8ABnRdi+cPfLJ7xLrbbQ7jZir99I=; b=bZLSoBPcdpTGkU6+q1LfkEzyR2ZX1X3arRHxryYH41LRB24M8bE1poq8JGIm4iZAVU DOBmmWsFuV6P7U2GpwKmF85Y2UBCF9Nb64LtlFfpvos5ZrVS6bkOmTkFZDWlXxbUoATp rv6zak6yp0Oi6MEfAdHQWkXa7Lys8ICa0We3R8+IUW6fdmUbSwGHKSvJ+zWohRAtVRv/ 9RZsUt/sAetaNFIVKupRbwi8MwUaGo6tYTby79ausZN+G++E877zCwYEvWft8kZ6kBB/ 7uLpMwnA1rLXw3ECxyooJjbiBYf33jm3XD7+hldyH4pMq1u7k9nYa3RNKKpJ5YXL//KD 3bNA== X-Gm-Message-State: AFeK/H0aThNukogPu4cYpDhtiC3Rr3Yb+diVOYbQk3uMnMbFbA4zL7hWecGQHNtDONYyUlhg X-Received: by 10.28.43.129 with SMTP id r123mr3998006wmr.13.1490287867262; Thu, 23 Mar 2017 09:51:07 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id e129sm5061893wma.13.2017.03.23.09.51.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Mar 2017 09:51:06 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Carlo Caione , Kevin Hilman Subject: [PATCH 2/8] pinctrl: meson: gxbb: add spdif output pins Date: Thu, 23 Mar 2017 17:50:55 +0100 Message-Id: <20170323165101.29262-3-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_095129_004500_F1F8FE5C X-CRM114-Status: GOOD ( 10.10 ) 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-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 8d5dd4772042..9bae2e3968af 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[] = {