From patchwork Sun Mar 26 17:19:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9645105 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 2C8DC602C8 for ; Sun, 26 Mar 2017 17:21:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16D7127F10 for ; Sun, 26 Mar 2017 17:21:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09DBD27F9F; Sun, 26 Mar 2017 17:21:36 +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 7C45F27F10 for ; Sun, 26 Mar 2017 17:21:35 +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=t81Ax51XH10wFuEX1tXnkFnVTLsaJWJ7OJ8nZVAM5BA=; b=LvbFo7oNNmRek5dlCOdNpUIV4c 5OyluuQdJruCk44YP+9kHYLB0Z0zzfxE3+yYgqd5JMWulWsBs52Lz5nhPdI5I/aLVZl4fqK7OHN6D 4fgNWyM0wWGD1pK6ubpLKmEhnxEVyQyOP76qmh3EkCA2rVAcPMkTu1zghNjmoq8Rd0U9TfE9kGoc5 uE5Cb7uTFuyZrX3RYG/XdpNWydlHu71cUAItRScp/9uYUA1S6PZQVhW78/4wa77KATNIXJN3GtmDj 1KG6GbEHoNsGZP1GWTA8bDCW4nZIBTwCl5EUmOgOPdqJT9tByXiEkeHIRTnqmPwlNjq61ThoEt1bt 7i6KF+UQ==; 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 1csBrB-0006nN-Dz; Sun, 26 Mar 2017 17:21:33 +0000 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csBpY-0004OU-VW for linux-arm-kernel@lists.infradead.org; Sun, 26 Mar 2017 17:19:57 +0000 Received: by mail-wr0-x22f.google.com with SMTP id w43so14103603wrb.0 for ; Sun, 26 Mar 2017 10:19:32 -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=ppQyJzUJ2FsZVfZdFG0lMGj/g06x8VylTaRdpNAK5FY=; b=L4RmfWOcZVBaLFB7TM8iiMFNDxv6NoErSib9CfMoIFFCBV6u/tMBia7xGAylBWa3Hb Z/QTAxhFq8nJMJ/O7WGela8AGVWFXMC+xha2NqhWEk+2acuzdr9il0L2Hv5ZXgxOHw3h P1CL9laWZd1QAoFQ3F2Hi9Ad3tYBUKPLZ5jJRtI2GjgnJ3+wTsIrPp7ajseKYDlePM4P ZBmhm9nxvSfDRem2oI+sxyJbjUWyJFSZNKTltIaJ86IApCQUGwtW4K3BvuXPiu5yhrcD d9Ys8Nj6IwE3rKWxe1LpJMHba+Bbts3X9qHxVoo3Bou5F3rJ7XHZR/VMKmwJxTgLsxE+ 9ENQ== 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=ppQyJzUJ2FsZVfZdFG0lMGj/g06x8VylTaRdpNAK5FY=; b=Kb3vuJiCF2w7l9nNSl9gCKEp6JC6sbEsYSGi+WK3iZzHpjX41TSzbAmpgZt5w0y7Co y2pZlROXd5ACaIVOaEyHhEczwWfXbXEGtJqTtdJwMVjvHhOaWtUDW7FDhXRhWWY6eb6M cnpqaDt2c/zrCUD6QAw3oEhhSdqBDVCn4sHBfSblBDCpqJk+KJq+mFws7NrIgGvN7Jgv taiaUA4LYqzGOom7TBwx1Dd/b+dtrYkupXxc9gGx/NkzXBOnw7y/ojJmAYcf1x/+f5Ne +J7CdJ7mJfDAKdaVa9yL2oswDaqCAwo8jRoeq44tOykjOmv/Z/axw8KT97WYw5f52qZo dCBg== X-Gm-Message-State: AFeK/H1PoRKQCnMa5rad+JT9YEiYxxIueyL3N2gHMY3gCMZ6zHTwVj8twM0uDUWdU1GgZopo X-Received: by 10.223.148.35 with SMTP id 32mr16814187wrq.82.1490548771213; Sun, 26 Mar 2017 10:19:31 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Mar 2017 10:19:30 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Carlo Caione , Kevin Hilman Subject: [PATCH v2 1/8] pinctrl: meson: gxbb: add i2s output pins Date: Sun, 26 Mar 2017 19:19:16 +0200 Message-Id: <20170326171923.19269-2-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_101953_179075_F8B56A5F X-CRM114-Status: GOOD ( 10.51 ) 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 i2s output clocks and data. I2S output channel 6/7 on TEST_N pin is missing from this patch and will be added later on. Acked-by: Kevin Hilman 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 31a3a98d067c..b9772a124a82 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[] = {