From patchwork Thu Jun 13 18:02:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: afl1 X-Patchwork-Id: 10993387 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30E84924 for ; Thu, 13 Jun 2019 18:02:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22EE926256 for ; Thu, 13 Jun 2019 18:02:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16F6426538; Thu, 13 Jun 2019 18:02:11 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 9C91F262AE for ; Thu, 13 Jun 2019 18:02:10 +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=7PCKEpdv53leBILD9vQsh/9GDeNpz4jShDyccGKGhek=; b=UZ3F1izJJjIeCIgW5ucol1mSQC RQImmG+p5w5Qe21NmShhpUDae75cQ1gCAOw8KBKSFjfcBHulannO3/PZYlqIGVU2ajY9SkJR/6wFG buTn+75iJ255n7tPnqhJi9kJFwIrNk1M47qVCrO7pCsjIwY3d9pyZtYFf7wWYNj65u9jhBWvp6YKE q0JRt2YKTFotNAVb8/ixxm8btoVwSuBsXgM5ChjhRTXs6x07N9nC8h2IdTRAzMPgNOMZ1pSZrfKRQ lOcwHxAGcWE5oHsLEhZQw3KrNbInU/JjNx/duNKrQ+ref/SIUmxtHBFBtBgdIhE6iLoUe5LOMoCAz S0M7BZLA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hbU38-0002aV-4y; Thu, 13 Jun 2019 18:02:10 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hbU35-0002a7-5d for linux-amlogic@lists.infradead.org; Thu, 13 Jun 2019 18:02:08 +0000 Received: by mail-wm1-x341.google.com with SMTP id v19so11051998wmj.5 for ; Thu, 13 Jun 2019 11:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DeqhVdtaD0WNb5slV+JdqraC8aBA1NVBU0MN2j+wwj8=; b=uaDBvGjLoopLPcn9NSp70mZEMPLKjvnhJExTnPpuDQGNC//iT5NHm/5PXJJcHCCbxj XxjSxRWAYbJbJcMEqsTwumFqHFnxHGvElyyRrI+7vy6r2QUb7Z0WKtGN0tDG6YKTxyPv FIsgf1l4kUEjATIc4tT1ciDF8E96HIjT7brBKlU8vkhqye5UYYnPXoAuSmKrXBQ80luj MqyLEe6bBcaW5ZDRabZ3cJZHrvqqAbCSMwqmKaFk+zkPI8/qs7WCHE5BzMHBPIR6OeXC xgQwmIn5IIlA3a2U0O1gkdEx6jaeHt0LCgc5gdQ/bZRrp+dt7J2SFY9uuQboP3zEIJsr yUKQ== 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=DeqhVdtaD0WNb5slV+JdqraC8aBA1NVBU0MN2j+wwj8=; b=P6BDv6aFuvNPNhXw9jPq9IPnhe480LHEi+oeu87znoJTdT0j2LE/I5OW6Tq3LzzkeL tTfyyZlYRm5TPyq1mD8Wobdrl1gmmu3awzIijmhETUCMMFc6PRCEMyZyFHY3Ek9B6Bx1 yQ/kfoiLZC0+CCBQb9Zup/dalhA4WZPgy5EOl5z+okNn39pNBpbgfloLTKT5E00nM6x6 cc3vRctSqPK6HjISwtOHc7S2RS/EzBmGz7ki/JTo1SMcGbLIikb5yBuCv1fJYQpLpact n41p2Di1owmz6jDUaZJhH4dK0GZCQZ78O75fcVBvnxOTmardoRSsdb6599pDl7nf0T10 Uceg== X-Gm-Message-State: APjAAAUDVLXS9mQ+ehza2ZtCAHzRk700RsSP87DRkfcMgrLvz48eg8bb c7u3JEYZI2qFQYOstiNd6iqEcWhJ X-Google-Smtp-Source: APXvYqw4RiyXGB53grNGtwvg3we2cdH8XepoTk+NLjtLYXVw6T80zMElH7GxJGIqhsyNwSqUsZltOw== X-Received: by 2002:a1c:44d7:: with SMTP id r206mr4918036wma.164.1560448924917; Thu, 13 Jun 2019 11:02:04 -0700 (PDT) Received: from afl1.intra.ditec.sk (adsl-dyn95.78-98-50.t-com.sk. [78.98.50.95]) by smtp.googlemail.com with ESMTPSA id y133sm909635wmg.5.2019.06.13.11.02.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2019 11:02:04 -0700 (PDT) From: afl1 To: linux-amlogic@lists.infradead.org Subject: [PATCH] pinctrl: add tsin pins for meson-gxbb/gxl/gxm Date: Thu, 13 Jun 2019 20:02:00 +0200 Message-Id: <20190613180200.18287-1-afl2001@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190613175047.18176-1-afl2001@gmail.com> References: <20190613175047.18176-1-afl2001@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190613_110207_240728_E840BAA7 X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: afl1 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 --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 31 ++++++++++++++++++++++ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 13 +++++++++ 2 files changed, 44 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 4edeb4cae72a..6de3d58277a1 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -237,10 +237,21 @@ static const unsigned int hdmi_hpd_pins[] = { GPIOH_0 }; static const unsigned int hdmi_sda_pins[] = { GPIOH_1 }; static const unsigned int hdmi_scl_pins[] = { GPIOH_2 }; +static const unsigned int tsin_a_d_valid_pins[] = { GPIOY_0 }; +static const unsigned int tsin_a_sop_pins[] = { GPIOY_1 }; +static const unsigned int tsin_a_clk_pins[] = { GPIOY_2 }; +static const unsigned int tsin_a_d0_pins[] = { GPIOY_3 }; +static const unsigned int tsin_a_dp_pins[] = { GPIOY_4, GPIOY_5, GPIOY_6, GPIOY_7, GPIOY_8, GPIOY_9, GPIOY_10 }; +static const unsigned int tsin_a_fail_pins[] = { GPIOY_11 }; static const unsigned int i2s_out_ch23_y_pins[] = { GPIOY_8 }; static const unsigned int i2s_out_ch45_y_pins[] = { GPIOY_9 }; static const unsigned int i2s_out_ch67_y_pins[] = { GPIOY_10 }; +static const unsigned int tsin_b_d_valid_pins[] = { GPIOX_6 }; +static const unsigned int tsin_b_sop_pins[] = { GPIOX_7 }; +static const unsigned int tsin_b_clk_pins[] = { GPIOX_8 }; +static const unsigned int tsin_b_d0_pins[] = { GPIOX_9 }; + static const unsigned int spdif_out_y_pins[] = { GPIOY_12 }; static const unsigned int gen_clk_out_pins[] = { GPIOY_15 }; @@ -443,8 +454,18 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GROUP(pwm_a_x, 3, 17), GROUP(pwm_e, 2, 30), GROUP(pwm_f_x, 3, 18), + GROUP(tsin_b_d_valid, 3, 9), + GROUP(tsin_b_sop, 3, 8), + GROUP(tsin_b_clk, 3, 10), + GROUP(tsin_b_d0, 3, 7), /* Bank Y */ + GROUP(tsin_a_fail, 3, 3), + GROUP(tsin_a_d_valid, 3, 2), + GROUP(tsin_a_sop, 3, 1), + GROUP(tsin_a_clk, 3, 0), + GROUP(tsin_a_d0, 3, 4), + GROUP(tsin_a_dp, 3, 5), GROUP(uart_cts_c, 1, 19), GROUP(uart_rts_c, 1, 18), GROUP(uart_tx_c, 1, 17), @@ -607,6 +628,14 @@ static const char * const gpio_periphs_groups[] = { "GPIOX_20", "GPIOX_21", "GPIOX_22", }; +static const char * const tsin_a_groups[] = { + "tsin_a_clk", "tsin_a_sop", "tsin_a_d_valid", "tsin_a_d0", + "tsin_a_dp", "tsin_a_fail", +}; +static const char * const tsin_b_groups[] = { + "tsin_b_clk", "tsin_b_sop", "tsin_b_d_valid", "tsin_b_d0", +}; + static const char * const emmc_groups[] = { "emmc_nand_d07", "emmc_clk", "emmc_cmd", "emmc_ds", }; @@ -798,6 +827,8 @@ static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(i2s_out), FUNCTION(spdif_out), FUNCTION(gen_clk_out), + FUNCTION(tsin_a), + FUNCTION(tsin_b), }; static struct meson_pmx_func meson_gxbb_aobus_functions[] = { diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index 0c0a5018102b..c14090a56b61 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -246,6 +246,10 @@ static const unsigned int tsin_a_fail_pins[] = { GPIODV_11 }; static const unsigned int tsin_a_dp_pins[] = { GPIODV_1, GPIODV_2, GPIODV_3, GPIODV_4, GPIODV_5, GPIODV_6, GPIODV_7, }; +static const unsigned int tsin_b_clk_pins[] = { GPIOH_6 }; +static const unsigned int tsin_b_d0_pins[] = { GPIOH_7 }; +static const unsigned int tsin_b_sop_pins[] = { GPIOH_8 }; +static const unsigned int tsin_b_d_valid_pins[] = { GPIOH_9 }; static const struct pinctrl_pin_desc meson_gxl_aobus_pins[] = { MESON_PIN(GPIOAO_0), @@ -460,6 +464,10 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { GROUP(i2s_out_lr_clk, 6, 24), GROUP(i2s_out_ch01, 6, 23), GROUP(spdif_out_h, 6, 28), + GROUP(tsin_b_d0, 6, 17), + GROUP(tsin_b_sop, 6, 18), + GROUP(tsin_b_d_valid, 6, 19), + GROUP(tsin_b_clk, 6, 20), /* Bank DV */ GROUP(uart_tx_b, 2, 16), @@ -694,6 +702,10 @@ static const char * const tsin_a_groups[] = { "tsin_a_d_valid", "tsin_a_d0", "tsin_a_dp", "tsin_a_fail", }; +static const char * const tsin_b_groups[] = { + "tsin_b_clk", "tsin_b_sop", + "tsin_b_d_valid", "tsin_b_d0", +}; static const char * const gpio_aobus_groups[] = { "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4", @@ -770,6 +782,7 @@ static struct meson_pmx_func meson_gxl_periphs_functions[] = { FUNCTION(spdif_out), FUNCTION(eth_led), FUNCTION(tsin_a), + FUNCTION(tsin_b), }; static struct meson_pmx_func meson_gxl_aobus_functions[] = {