From patchwork Thu Mar 23 16:50:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9641651 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 A39AB60327 for ; Thu, 23 Mar 2017 17:01:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9416B27F17 for ; Thu, 23 Mar 2017 17:01:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 883CE2841D; Thu, 23 Mar 2017 17:01:44 +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 10A7A27F17 for ; Thu, 23 Mar 2017 17:01:44 +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=3p1sdEoIiw8lGQssKTO3FQAh8XEiFQq/jGG2jG3rrYk=; b=BDgXjXheiJ8VqTPXIkbiqMx4v4 q+prGiYmiHk3qjOgNdJP3tjpCykyJi8EDGInaBQSn7Y1vE+yRGOGsJmnxL2qf67XD+tSnFwpKad4S sqYzN6b4inzjiYOGAtz/P3HdINs+hgKgu1HfC4qRkshrW3nk0pJuQYDYFGtTOgyezV7tvSKxBa4ZA vfDb5LzwNSHxJxzIxVAF+2fGdOs1PtDcgr91xMuivX2LkLtD/ZwHPAgiMXrH2v93apBFj05D40tZH mwGVpDTPAYODzrb5BaZ23oCwgkX+FHgaFtLZQeCEDJ++/2LpVsgxL2mXN9hJGYLx2QkC7HtQYXxas Ag0DePBQ==; 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-00064I-Qx; Thu, 23 Mar 2017 17:01:41 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cr5xP-000896-BL for linux-arm-kernel@lists.infradead.org; Thu, 23 Mar 2017 16:51:32 +0000 Received: by mail-wm0-x233.google.com with SMTP id u132so66609935wmg.0 for ; Thu, 23 Mar 2017 09:51:07 -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=5TVWDCZfdT9WazDTbt2mz1VKK1A/t3iZtnWpQpubPv0=; b=W426x+e7+dt28uludTK+F8qd5GyY4KqQ4Iw12O3W4J0ec5ILWwvAYvk14SEoDKmrmR PAhYkzkQ7xY1ZkIorOnaXZk7ovIN3GcuTD0aMzH3oA63VqgpuECjpFKluniJ+LzZ02no YbHoOWMVyKYkqJs//HAXWQwksfO/lWsCvYdFbZvXhADGIGtCIWLQgfhHOkFMLOimHq+n T5zr4879h1j7312fV+JR5U/GKsjtG2I3+k+avi+CWIYgqJ1l94kQyLjzh12qTPtjbV+H ZE402ysOEjUoW6TcvIcfBH51uXBk32Vc7praPG1DRkA8OVf72wjFb1KpxeqGn1Ho0jgz 0yxQ== 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=5TVWDCZfdT9WazDTbt2mz1VKK1A/t3iZtnWpQpubPv0=; b=hYNZvYeifnMtGDmGbI0Cqnr7n1gyiWPyI7ysg2wVFDAi+6uEx6kTCCVWSL8ek+WjYC c6+9ruTuzIBju4oKJ9eTkWWjqzeXhLKThgxPv702wZQWd8SV2jc1rrAU8ex/F9wPSmf+ NsQs/eLWyK9FN9bBFAbUlWdhfT1KcHCM47TQmD7uwHI6TwgFM9ycEyB1qNCOAGvQCl4U EnE4InjzXx+Q2JV0UEYk1p1sjTmrePlwfqFuWHLBrsnDKEqjIDVkqLS9qGyiwy9rmtA/ 17Zl07c/pLLNuRMt7t1MUDqP5giURdwufX2DXZz6aK6K1vz44rlYhJk3xMWRW+RYpG+T 6bOg== X-Gm-Message-State: AFeK/H2RLzNKudet7KIcHReLuTiQqIPl2kTfpvkjs4Nu1pHxF9CM3RYjekPSugVW3JypnMmq X-Received: by 10.28.156.140 with SMTP id f134mr3719407wme.40.1490287866132; Thu, 23 Mar 2017 09:51:06 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id e129sm5061893wma.13.2017.03.23.09.51.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Mar 2017 09:51:05 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Carlo Caione , Kevin Hilman Subject: [PATCH 1/8] pinctrl: meson: gxbb: add i2s output pins Date: Thu, 23 Mar 2017 17:50:54 +0100 Message-Id: <20170323165101.29262-2-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_095128_313812_206CE64F X-CRM114-Status: GOOD ( 10.21 ) 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 | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 7671424d46cb..8d5dd4772042 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -236,6 +236,10 @@ 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_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 struct pinctrl_pin_desc meson_gxbb_aobus_pins[] = { MESON_PIN(GPIOAO_0, 0), MESON_PIN(GPIOAO_1, 0), @@ -274,6 +278,13 @@ static const unsigned int pwm_ao_a_6_pins[] = { PIN(GPIOAO_6, 0) }; static const unsigned int pwm_ao_a_12_pins[] = { PIN(GPIOAO_12, 0) }; static const unsigned int pwm_ao_b_pins[] = { PIN(GPIOAO_13, 0) }; +static const unsigned int i2s_am_clk_pins[] = { PIN(GPIOAO_8, 0) }; +static const unsigned int i2s_out_ao_clk_pins[] = { PIN(GPIOAO_9, 0) }; +static const unsigned int i2s_out_lr_clk_pins[] = { PIN(GPIOAO_10, 0) }; +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 struct meson_pmx_group meson_gxbb_periphs_groups[] = { GPIO_GROUP(GPIOZ_0, EE_OFF), GPIO_GROUP(GPIOZ_1, EE_OFF), @@ -426,6 +437,9 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GROUP(uart_rx_c, 1, 16), GROUP(pwm_a_y, 1, 21), GROUP(pwm_f_y, 1, 20), + GROUP(i2s_out_ch23_y, 1, 5), + GROUP(i2s_out_ch45_y, 1, 6), + GROUP(i2s_out_ch67_y, 1, 7), /* Bank Z */ GROUP(eth_mdio, 6, 1), @@ -523,6 +537,12 @@ static struct meson_pmx_group meson_gxbb_aobus_groups[] = { GROUP(pwm_ao_a_6, 0, 18), GROUP(pwm_ao_a_12, 0, 17), GROUP(pwm_ao_b, 0, 3), + GROUP(i2s_am_clk, 0, 30), + GROUP(i2s_out_ao_clk, 0, 29), + GROUP(i2s_out_lr_clk, 0, 28), + GROUP(i2s_out_ch01_ao, 0, 27), + GROUP(i2s_out_ch23_ao, 1, 0), + GROUP(i2s_out_ch45_ao, 1, 1), }; static const char * const gpio_periphs_groups[] = { @@ -652,6 +672,10 @@ static const char * const hdmi_i2c_groups[] = { "hdmi_sda", "hdmi_scl", }; +static const char * const i2s_out_groups[] = { + "i2s_out_ch23_y", "i2s_out_ch45_y", "i2s_out_ch67_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", @@ -694,6 +718,11 @@ static const char * const pwm_ao_b_groups[] = { "pwm_ao_b", }; +static const char * const i2s_out_ao_groups[] = { + "i2s_am_clk", "i2s_out_ao_clk", "i2s_out_lr_clk", + "i2s_out_ch01_ao", "i2s_out_ch23_ao", "i2s_out_ch45_ao", +}; + static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(gpio_periphs), FUNCTION(emmc), @@ -717,6 +746,7 @@ static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(pwm_f_y), FUNCTION(hdmi_hpd), FUNCTION(hdmi_i2c), + FUNCTION(i2s_out), }; static struct meson_pmx_func meson_gxbb_aobus_functions[] = { @@ -730,6 +760,7 @@ static struct meson_pmx_func meson_gxbb_aobus_functions[] = { FUNCTION(pwm_ao_a_6), FUNCTION(pwm_ao_a_12), FUNCTION(pwm_ao_b), + FUNCTION(i2s_out_ao), }; static struct meson_bank meson_gxbb_periphs_banks[] = {