From patchwork Wed Mar 14 06:35:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuhiro Suzuki X-Patchwork-Id: 131553 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp479706ljb; Tue, 13 Mar 2018 23:36:42 -0700 (PDT) X-Google-Smtp-Source: AG47ELsfFO3039r9GLFKyMLCH2q5aHVfSkPkIGUG1cPBs5XcXOBaFFvBJwl260Ybh07BaftjVueG X-Received: by 10.98.157.199 with SMTP id a68mr191311pfk.237.1521009402677; Tue, 13 Mar 2018 23:36:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521009402; cv=none; d=google.com; s=arc-20160816; b=X/26g76T1LNSzKVCkZo0YAsImmkInGtR5ok7UBLALYsFmN34KgsPC0QSfWI8EpqoP/ NXliCs8DJZrr4fOFzkh+WTfQhq+7Ki9ERlg+uabIjprfoAXVqN7ZtChr5XM9IBgkxmHt APGAjV5sTHdaA+COe3MUVl/upcpuPQ/SyXod/Rwf+ETPBmWpEIeED4TO9ooyo7Xk2PvQ 8LBpYK7AiotuhmbSxTSa2rUo6HPh0HntUWM1tlyKthVIwu9QyxMXu14DAsZ3C4XAF6DZ 2/OkWgE6824rsUBL3x63BfxE25/ltDemssdIXrGxGQMopGVYrn/KaJvEF1EKOcB8MrTa gqxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=IoN1e1l8CSAzKSd6fEmIxH1rJwoWXC/ABX2yNGdGpDE=; b=Ek89GET57gy8X+sVg4yLB48Vq80CkKFmWxgQPkRXM9KkSrkJIGPkN07lM1220rQlHC fDWp29ynF8bkGHAAb5fnDAkh9P6JCDtTlVQfgA3WreRuEjSyI5v8ZHDitn2mNtDgwC1s Jd5qg2WOY4v9y/WMrQmL5rK5ElxSoYdASDy0VCsJ8pwepA13SIJGAe40jRk3cFqp9pZx oa/v2W/Ybl92Vywos8hxpD+oMRFU9oRfZgRJxN/VV5v63jwvpf/MEv2rzOTf2yScrlUl A4zVaCVNkN+A3LUjFiSVAhzfR9GT51wQ7gyILYWSe3fijhl/EGoj7QdHqsU07E3mLO3P 69/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s12si1360260pgq.491.2018.03.13.23.36.42; Tue, 13 Mar 2018 23:36:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753302AbeCNGgl (ORCPT + 5 others); Wed, 14 Mar 2018 02:36:41 -0400 Received: from mx.socionext.com ([202.248.49.38]:51856 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbeCNGgl (ORCPT ); Wed, 14 Mar 2018 02:36:41 -0400 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 14 Mar 2018 15:36:39 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id D1117180230; Wed, 14 Mar 2018 15:36:39 +0900 (JST) Received: from 172.31.9.53 (172.31.9.53) by m-FILTER with ESMTP; Wed, 14 Mar 2018 15:37:21 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by iyokan.css.socionext.com (Postfix) with ESMTP id 41AE240389; Wed, 14 Mar 2018 15:36:39 +0900 (JST) Received: from aegis.e01.socionext.com (unknown [10.213.134.210]) by yuzu.css.socionext.com (Postfix) with ESMTP id 19031120534; Wed, 14 Mar 2018 15:36:39 +0900 (JST) From: Katsuhiro Suzuki To: linux-gpio@vger.kernel.org, Linus Walleij , Masahiro Yamada , linux-arm-kernel@lists.infradead.org Cc: Masami Hiramatsu , Jassi Brar , linux-kernel@vger.kernel.org, Katsuhiro Suzuki Subject: [PATCH] pinctrl: uniphier: divide I2S and S/PDIF audio out pin-mux group Date: Wed, 14 Mar 2018 15:35:35 +0900 Message-Id: <20180314063535.13303-1-suzuki.katsuhiro@socionext.com> X-Mailer: git-send-email 2.16.1 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This patch divides large pin-mux group 'aio' of UniPhier LD11/LD20 to 2 groups as following: aout1 : 8ch I2S output: AO1DACCK, AO1BCK, AO1LRCK, AO1D[0-2] aoutiec1: S/PDIF output : AO1IEC, AO1ARC Signed-off-by: Katsuhiro Suzuki --- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 15 ++++++++++----- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) -- 2.16.1 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Masahiro Yamada diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c index 8a5ecd6277d8..5ec5afa70413 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c @@ -470,8 +470,10 @@ static const struct pinctrl_pin_desc uniphier_ld11_pins[] = { 166, UNIPHIER_PIN_PULL_DOWN), }; -static const unsigned aout_pins[] = {135, 136, 137, 138, 139, 140, 141, 142}; -static const int aout_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0}; +static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142}; +static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0}; +static const unsigned aoutiec1_pins[] = {135, 136}; +static const int aoutiec1_muxvals[] = {0, 0}; static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25}; static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0}; static const unsigned emmc_dat8_pins[] = {26, 27, 28, 29}; @@ -547,7 +549,8 @@ static const unsigned int gpio_range5_pins[] = { }; static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = { - UNIPHIER_PINCTRL_GROUP(aout), + UNIPHIER_PINCTRL_GROUP(aout1), + UNIPHIER_PINCTRL_GROUP(aoutiec1), UNIPHIER_PINCTRL_GROUP(emmc), UNIPHIER_PINCTRL_GROUP(emmc_dat8), UNIPHIER_PINCTRL_GROUP(ether_rmii), @@ -573,7 +576,8 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = { UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range5), }; -static const char * const aout_groups[] = {"aout"}; +static const char * const aout1_groups[] = {"aout1"}; +static const char * const aoutiec1_groups[] = {"aoutiec1"}; static const char * const emmc_groups[] = {"emmc", "emmc_dat8"}; static const char * const ether_rmii_groups[] = {"ether_rmii"}; static const char * const i2c0_groups[] = {"i2c0"}; @@ -592,7 +596,8 @@ static const char * const usb1_groups[] = {"usb1"}; static const char * const usb2_groups[] = {"usb2"}; static const struct uniphier_pinmux_function uniphier_ld11_functions[] = { - UNIPHIER_PINMUX_FUNCTION(aout), + UNIPHIER_PINMUX_FUNCTION(aout1), + UNIPHIER_PINMUX_FUNCTION(aoutiec1), UNIPHIER_PINMUX_FUNCTION(emmc), UNIPHIER_PINMUX_FUNCTION(ether_rmii), UNIPHIER_PINMUX_FUNCTION(i2c0), diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 3be7967edae0..eb5d4cc6a3ba 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -551,8 +551,10 @@ static const struct pinctrl_pin_desc uniphier_ld20_pins[] = { 175, UNIPHIER_PIN_PULL_DOWN), }; -static const unsigned aout_pins[] = {135, 136, 137, 138, 139, 140, 141, 142}; -static const int aout_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0}; +static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142}; +static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0}; +static const unsigned aoutiec1_pins[] = {135, 136}; +static const int aoutiec1_muxvals[] = {0, 0}; static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25}; static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0}; static const unsigned emmc_dat8_pins[] = {26, 27, 28, 29}; @@ -631,7 +633,8 @@ static const unsigned int gpio_range2_pins[] = { }; static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { - UNIPHIER_PINCTRL_GROUP(aout), + UNIPHIER_PINCTRL_GROUP(aout1), + UNIPHIER_PINCTRL_GROUP(aoutiec1), UNIPHIER_PINCTRL_GROUP(emmc), UNIPHIER_PINCTRL_GROUP(emmc_dat8), UNIPHIER_PINCTRL_GROUP(ether_rgmii), @@ -657,7 +660,8 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range2), }; -static const char * const aout_groups[] = {"aout"}; +static const char * const aout1_groups[] = {"aout1"}; +static const char * const aoutiec1_groups[] = {"aoutiec1"}; static const char * const emmc_groups[] = {"emmc", "emmc_dat8"}; static const char * const ether_rgmii_groups[] = {"ether_rgmii"}; static const char * const ether_rmii_groups[] = {"ether_rmii"}; @@ -679,7 +683,8 @@ static const char * const usb2_groups[] = {"usb2"}; static const char * const usb3_groups[] = {"usb3"}; static const struct uniphier_pinmux_function uniphier_ld20_functions[] = { - UNIPHIER_PINMUX_FUNCTION(aout), + UNIPHIER_PINMUX_FUNCTION(aout1), + UNIPHIER_PINMUX_FUNCTION(aoutiec1), UNIPHIER_PINMUX_FUNCTION(emmc), UNIPHIER_PINMUX_FUNCTION(ether_rgmii), UNIPHIER_PINMUX_FUNCTION(ether_rmii),