From patchwork Fri Oct 6 08:31:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9988431 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 763D460244 for ; Fri, 6 Oct 2017 08:32:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62F5B28D7B for ; Fri, 6 Oct 2017 08:32:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5698A28D8E; Fri, 6 Oct 2017 08:32:27 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED 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 DA2EC28D7B for ; Fri, 6 Oct 2017 08:32:26 +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: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:In-Reply-To: References:List-Owner; bh=yzuTe2IfS0fbHrULlBTtTlz9qHgQLKPxrELiedl4b6g=; b=l8n 4ZfibzQAaDc0CcCu1LWVKOp0U6wDgtEdj41vEMeAG419DSF8quS+Aoefb1BuqxuCQMFjc/ZisantD r/+8kuorD43cpvhBlKV3kNMb9xvPpWQ0uH3s3EKqLohRg1xmeLxsahRD+Hyz9Ti7x+3mO9t6pHtem jijPc185GlRZv7JYlqRcaOuSUJ65Z/Ppja80BLtvCsqSHgr/+1nlv9nG39hBzF7TrqUtGznOnsX8H A9kCntgE3uPsA/PF9Y6R31HXP1LYxae/UptIwi6cpHKlaF1fx31zJvPN6ct5D4s/3TWO4YDLDa7RF MYqc2XWikJULQsiULu7uZLj5MJXii7A==; 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 1e0O3N-0000Kr-Lr; Fri, 06 Oct 2017 08:32:17 +0000 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e0O3F-00008p-NS for linux-amlogic@lists.infradead.org; Fri, 06 Oct 2017 08:32:16 +0000 Received: by mail-wr0-x232.google.com with SMTP id u5so12365424wrc.5 for ; Fri, 06 Oct 2017 01:31:49 -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; bh=Fc7U7qv7qWuRmyA6FgUT2REiAOvseS1fc9hM88kiPnk=; b=GnejUm0fKjJVRv/7uR18R6LHCgQAX4+A2tgNxJDy09sKye256dPbMqHcDoZ2I4280H UPBrSxqGV+6ntwFbt5McwKM0T8EMc2rgBEF85ON52jfNhZQAIbPMQoQrJYVwY7CB35aR kNh/XgCzmRLlw2556wvOtiTJDR0XOpRFzJOAoVibtn3KydUmFFHmSurmXI4zcKWxCsYE Ixn2tfz0tQAE9tvRWlZLKGUz+vXrctoPRy9g3Jj1AJ59TX9OrnUQxmyhQI6/DEeLy5KL /QMsM6Hi3uXNfWx5ka9AhQQEEbF1BHC2yEHSnFPejVNl1B6yxDYGpj8cIxo/WMxGDt+m LF8A== 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; bh=Fc7U7qv7qWuRmyA6FgUT2REiAOvseS1fc9hM88kiPnk=; b=Ac7uogVLyvjw7HYXiTIQecQldc70K+2miz1v7eg+hMXHAlEbDOtbAqieEtggbEw/Nm V3cRV1HV/+9Hpd07sNlxbCt8UEXrgSihttTPhUUwYdrh2drrMk0OlYzVTrB5h92i68JR dKlY1OfeHGAj8C9xc2yCVG6GkPS9imtjrh7p9CzgraNMrZaFbMEdtwAkajQPvy52WH6v y+e1jNtGiMhWbTZvAOs9Q6Q13LqKLpPL5UjwRG9Qn66mpn/XZ4Tn9exxefz2F1n0EvzW XENYlcH/4kQhv0cnFXVhSCEGCj6KSl4/C5SDEBnHfPhWSn8+wrzbVXm+15bK2IqAcEj9 FOug== X-Gm-Message-State: AMCzsaWS1UV3OPg/XEWp/HMN3w4azQgolsrcu67cQpORjjO0aJ5CZBVU z/nU92l+2URCvohmvULKvj+Vxg== X-Google-Smtp-Source: AOwi7QAnjy2WcVsd/c+HXecL1QqnFXjsBA1+odllRG8UMo/3YnSA1nmzps0mlU49oUPf4oPQGgcKTg== X-Received: by 10.223.184.204 with SMTP id c12mr1280256wrg.197.1507278707852; Fri, 06 Oct 2017 01:31:47 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id d17sm779031wrc.13.2017.10.06.01.31.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2017 01:31:47 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Kevin Hilman , Carlo Caione Subject: [PATCH] pinctrl: meson-gx: add TEST_N i2s pinmux Date: Fri, 6 Oct 2017 10:31:42 +0200 Message-Id: <20171006083142.19325-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171006_013209_959989_2B43DB3A X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@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, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add TEST_N pinmux for channel 6 and 7 of the i2s output Signed-off-by: Jerome Brunet Reviewed-by: Kevin Hilman --- Hi Linus, FYI, This change depends on clean-up series you've just merged. Cheers, Jerome drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 5 +++++ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 62483b67f114..1881d4a0eca2 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -288,6 +288,7 @@ static const unsigned int i2s_out_lr_clk_pins[] = { GPIOAO_10 }; static const unsigned int i2s_out_ch01_ao_pins[] = { GPIOAO_11 }; static const unsigned int i2s_out_ch23_ao_pins[] = { GPIOAO_12 }; static const unsigned int i2s_out_ch45_ao_pins[] = { GPIOAO_13 }; +static const unsigned int i2s_out_ch67_ao_pins[] = { GPIO_TEST_N }; static const unsigned int spdif_out_ao_6_pins[] = { GPIOAO_6 }; static const unsigned int spdif_out_ao_13_pins[] = { GPIOAO_13 }; @@ -562,6 +563,9 @@ static struct meson_pmx_group meson_gxbb_aobus_groups[] = { GROUP(spdif_out_ao_13, 0, 4), GROUP(ao_cec, 0, 15), GROUP(ee_cec, 0, 14), + + /* test n pin */ + GROUP(i2s_out_ch67_ao, 1, 2), }; static const char * const gpio_periphs_groups[] = { @@ -748,6 +752,7 @@ static const char * const pwm_ao_b_groups[] = { 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", + "i2s_out_ch67_ao", }; static const char * const spdif_out_ao_groups[] = { diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index 04334e807170..3a14ecae9f31 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -291,6 +291,7 @@ static const unsigned int pwm_ao_b_6_pins[] = { GPIOAO_6 }; static const unsigned int i2s_out_ch23_ao_pins[] = { GPIOAO_8 }; static const unsigned int i2s_out_ch45_ao_pins[] = { GPIOAO_9 }; +static const unsigned int i2s_out_ch67_ao_pins[] = { GPIO_TEST_N }; static const unsigned int spdif_out_ao_6_pins[] = { GPIOAO_6 }; static const unsigned int spdif_out_ao_9_pins[] = { GPIOAO_9 }; @@ -557,6 +558,9 @@ static struct meson_pmx_group meson_gxl_aobus_groups[] = { GROUP(spdif_out_ao_9, 0, 4), GROUP(ao_cec, 0, 15), GROUP(ee_cec, 0, 14), + + /* test n pin */ + GROUP(i2s_out_ch67_ao, 1, 2), }; static const char * const gpio_periphs_groups[] = { @@ -735,7 +739,7 @@ static const char * const pwm_ao_b_groups[] = { }; static const char * const i2s_out_ao_groups[] = { - "i2s_out_ch23_ao", "i2s_out_ch45_ao", + "i2s_out_ch23_ao", "i2s_out_ch45_ao", "i2s_out_ch67_ao", }; static const char * const spdif_out_ao_groups[] = {