From patchwork Sat Mar 18 12:27:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9632145 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 9050C601E9 for ; Sat, 18 Mar 2017 12:28:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F62C28446 for ; Sat, 18 Mar 2017 12:28:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 741C4284FA; Sat, 18 Mar 2017 12:28: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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham 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 D31C028446 for ; Sat, 18 Mar 2017 12:28:43 +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=5JHmnmNw5VJu4I1CUPAZyYI/KEtoq297TVeYm9EXwCw=; b=punNHV1JoMvpj5jdTHT+I25x21 kThlT0+/4IC8vfbUSmcR6PJ9xI/GZ6BlbtPlxrcUyfPA1jbJMe0h28iMwNIQEtHFRN+kvoD8BDH8N GBP8wtYPBQAkKsc9ybPO7l0VZlf9W5V9TFbBukxRqXpaMYvMLteu10E4xs9iftCOwPerct/5sh0oQ hwqp3UKntKXmkkje+8tr1DluXRLlq6hsvxoy9I0Q9DXDmcC7T+Kg3oGHRWa3IO+thS/oMQhO8cIKu gRJPzT/V/KsObMO0LFyr6CZhgMSNgOPG4dv8tKqAYY9aHlIkoX0qF5cm+PQ+kXlVD7g3PiVZA1R0q MfFA/BQw==; 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 1cpDTI-0006XD-Su; Sat, 18 Mar 2017 12:28:36 +0000 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cpDT5-0006KC-61; Sat, 18 Mar 2017 12:28:25 +0000 Received: by mail-wr0-x244.google.com with SMTP id l37so12425983wrc.3; Sat, 18 Mar 2017 05:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+SMQMDP3esQii7FH76SIBtl5cLbvhyh3GREDpO+Xkb0=; b=rTrtDCrlOtOFbJPm87OQUHCy+gSBiKafEcXqkQhVGYGXmG0wjfLLln6LjOX2ihgVCt Ok0xTABG+pWgEJ8burQ3M3PffOicMgKWN6l9HIZAZ+QrZWQYIoW6/obPA0tfknCcCVbI 0HnXEKDseGOoi8TskoorUDt4XlSJvdnOQTa0VQsurkjdgnHulIbI16WWy2H+yZZEbn8p jJsaK7lZ7HGMEXZ0h4gxrSKuVZQ7OeoqjpwSGcE07xgxwvmcqe7HDH0gW8cuPNpPpKrX PmqfmUWs6eMaPy2MRGU/OxkN5Ofn6glLgr7ODztiV45LWIcZDseyKeZlNT0DXypzhXUx AMDw== 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=+SMQMDP3esQii7FH76SIBtl5cLbvhyh3GREDpO+Xkb0=; b=kJprrZbJ8s4sUvyiBykhRHd7Q0Uogap/2MCNXyPTK0R4d+1wDnwpmIjknAdiKKX6Fb tnrVwE0BlBg+0xn3pd1BEOz3lBAIFUDmJRI6RpA4pcrRUIm1t0egCjbhrbJ+uz6E4CF3 83XdaxwIvauDkIYzrcYIwhtvdONMMo8lzHOGmlUa6UDAeOy4C+vD/I9M/qz8fnMW3T6U e50SXIvJOjbc8aOC5vIN+SiB5busyYBleGd61thIMZun0b8oAJKiWreVPsQSC1EaO39w k+MSkEahlujC/CXp5Q4oSo3dZfjVqJYHuxkHzti3new+TySRjUbXeltX71wppND0Z2LM y9sA== X-Gm-Message-State: AFeK/H2ye5M36BuiT60wjeJkns8YqBJA81al3YCbQP3Zzyhh2WzK6i2iqBk1qHh6askPLg== X-Received: by 10.223.130.214 with SMTP id 80mr17828971wrc.43.1489840077064; Sat, 18 Mar 2017 05:27:57 -0700 (PDT) Received: from blackbox.darklights.net (p5DE38642.dip0.t-ipconnect.de. [93.227.134.66]) by smtp.googlemail.com with ESMTPSA id v18sm13306712wrc.41.2017.03.18.05.27.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Mar 2017 05:27:56 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-gpio@vger.kernel.org, linus.walleij@linaro.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH v2 1/2] pinctrl: meson: gxl: add the missing PWM pin definitions Date: Sat, 18 Mar 2017 13:27:35 +0100 Message-Id: <20170318122736.11592-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170318122736.11592-1-martin.blumenstingl@googlemail.com> References: <20170304212318.27076-1-martin.blumenstingl@googlemail.com> <20170318122736.11592-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170318_052823_381460_F8C5749B X-CRM114-Status: UNSURE ( 9.41 ) 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: mark.rutland@arm.com, devicetree@vger.kernel.org, narmstrong@baylibre.com, Martin Blumenstingl , catalin.marinas@arm.com, will.deacon@arm.com, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, jbrunet@baylibre.com 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 This adds support for the missing PWM pins on Meson GXL SoCs, namely: - PWM_A - PWM_B - PWM_C - PWM_F (GPIOX_7 and GPIOCLK_1 can be selected as output) - PWM_AO_A (GPIOAO_3 and GPIOAO_8 can be selected as output) Signed-off-by: Martin Blumenstingl Tested-by: Neil Armstrong Reviewed-by: Neil Armstrong --- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 54 +++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index 4ab94a85e306..a0a7936f8f0d 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -195,8 +195,19 @@ static const unsigned int eth_txd1_pins[] = { PIN(GPIOZ_11, EE_OFF) }; static const unsigned int eth_txd2_pins[] = { PIN(GPIOZ_12, EE_OFF) }; static const unsigned int eth_txd3_pins[] = { PIN(GPIOZ_13, EE_OFF) }; +static const unsigned int pwm_a_pins[] = { PIN(GPIOX_6, EE_OFF) }; + +static const unsigned int pwm_b_pins[] = { PIN(GPIODV_29, EE_OFF) }; + +static const unsigned int pwm_c_pins[] = { PIN(GPIOZ_15, EE_OFF) }; + +static const unsigned int pwm_d_pins[] = { PIN(GPIODV_28, EE_OFF) }; + static const unsigned int pwm_e_pins[] = { PIN(GPIOX_16, EE_OFF) }; +static const unsigned int pwm_f_clk_pins[] = { PIN(GPIOCLK_1, EE_OFF) }; +static const unsigned int pwm_f_x_pins[] = { PIN(GPIOX_7, EE_OFF) }; + 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) }; @@ -225,6 +236,9 @@ static const unsigned int uart_rts_ao_b_pins[] = { PIN(GPIOAO_3, 0) }; static const unsigned int remote_input_ao_pins[] = {PIN(GPIOAO_7, 0) }; +static const unsigned int pwm_ao_a_3_pins[] = { PIN(GPIOAO_3, 0) }; +static const unsigned int pwm_ao_a_8_pins[] = { PIN(GPIOAO_8, 0) }; + static const unsigned int pwm_ao_b_pins[] = { PIN(GPIOAO_9, 0) }; static struct meson_pmx_group meson_gxl_periphs_groups[] = { @@ -350,7 +364,9 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { GROUP(uart_rts_a, 5, 16), GROUP(uart_tx_c, 5, 13), GROUP(uart_rx_c, 5, 12), + GROUP(pwm_a, 5, 25), GROUP(pwm_e, 5, 15), + GROUP(pwm_f_x, 5, 14), /* Bank Z */ GROUP(eth_mdio, 4, 22), @@ -367,6 +383,7 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { GROUP(eth_txd1, 4, 12), GROUP(eth_txd2, 4, 11), GROUP(eth_txd3, 4, 10), + GROUP(pwm_c, 3, 20), /* Bank H */ GROUP(hdmi_hpd, 6, 31), @@ -382,6 +399,8 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { GROUP(i2c_sda_b, 1, 12), GROUP(i2c_sck_c, 1, 11), GROUP(i2c_sda_c, 1, 10), + GROUP(pwm_b, 2, 11), + GROUP(pwm_d, 2, 12), /* Bank BOOT */ GROUP(emmc_nand_d07, 7, 31), @@ -404,6 +423,9 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { GROUP(sdcard_d2, 6, 0), GROUP(sdcard_cmd, 6, 2), GROUP(sdcard_clk, 6, 3), + + /* Bank CLK */ + GROUP(pwm_f_clk, 8, 30), }; static struct meson_pmx_group meson_gxl_aobus_groups[] = { @@ -428,6 +450,8 @@ static struct meson_pmx_group meson_gxl_aobus_groups[] = { GROUP(uart_cts_ao_b, 0, 8), GROUP(uart_rts_ao_b, 0, 7), GROUP(remote_input_ao, 0, 0), + GROUP(pwm_ao_a_3, 0, 22), + GROUP(pwm_ao_a_8, 0, 17), GROUP(pwm_ao_b, 0, 3), }; @@ -513,10 +537,30 @@ static const char * const eth_groups[] = { "eth_txd0", "eth_txd1", "eth_txd2", "eth_txd3", }; +static const char * const pwm_a_groups[] = { + "pwm_a", +}; + +static const char * const pwm_b_groups[] = { + "pwm_b", +}; + +static const char * const pwm_c_groups[] = { + "pwm_c", +}; + +static const char * const pwm_d_groups[] = { + "pwm_d", +}; + static const char * const pwm_e_groups[] = { "pwm_e", }; +static const char * const pwm_f_groups[] = { + "pwm_f_clk", "pwm_f_x", +}; + static const char * const hdmi_hpd_groups[] = { "hdmi_hpd", }; @@ -542,6 +586,10 @@ static const char * const remote_input_ao_groups[] = { "remote_input_ao", }; +static const char * const pwm_ao_a_groups[] = { + "pwm_ao_a_3", "pwm_ao_a_8", +}; + static const char * const pwm_ao_b_groups[] = { "pwm_ao_b", }; @@ -559,7 +607,12 @@ static struct meson_pmx_func meson_gxl_periphs_functions[] = { FUNCTION(i2c_b), FUNCTION(i2c_c), FUNCTION(eth), + FUNCTION(pwm_a), + FUNCTION(pwm_b), + FUNCTION(pwm_c), + FUNCTION(pwm_d), FUNCTION(pwm_e), + FUNCTION(pwm_f), FUNCTION(hdmi_hpd), FUNCTION(hdmi_i2c), }; @@ -569,6 +622,7 @@ static struct meson_pmx_func meson_gxl_aobus_functions[] = { FUNCTION(uart_ao), FUNCTION(uart_ao_b), FUNCTION(remote_input_ao), + FUNCTION(pwm_ao_a), FUNCTION(pwm_ao_b), };