From patchwork Sun Dec 9 19:50:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10720219 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 9B545112E for ; Sun, 9 Dec 2018 19:51:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D3122A09A for ; Sun, 9 Dec 2018 19:51:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F5CF2A0BE; Sun, 9 Dec 2018 19:51:55 +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 DEAF72A09A for ; Sun, 9 Dec 2018 19:51:54 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=CKXUSdPGr2cWJ0o50104SwXSYftMKSqRzErs9vxg6WU=; b=lNnb51sayQ9CjY b0o1vEy9AK3uk9W4XjLTz4VptdKo6ENkgVtIj/vYFC4zQrZ4J8zyBr6MJtNElUw/JSDQPUf3VAPDD gnSG+NJyJzjGFWPeRuBI3wGpJKtMvJ/IzkYnQ8Mfa4i1ueq6b0b3nSULnsdsYkxT8QZlKViVuw3sC blQ+EXU331h515Jn8A1XyTz7NcDoqd1ZwDyUh5c34WyrrU4mPgrC74PyQhHODbVi2EM24/wCljEyu ap18jdOaZsgj9TZYPQolhcfIIm06xSpBCim7NPkTN0BOf6bHnQB4uRSHglNtDHWwu1ka5jFbDnZKv ptFBnVMjxdpFWazuQ+fQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW57I-0006fE-P0; Sun, 09 Dec 2018 19:51:53 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW56i-00064I-Op; Sun, 09 Dec 2018 19:51:18 +0000 Received: by mail-wr1-x441.google.com with SMTP id p4so8415722wrt.7; Sun, 09 Dec 2018 11:51:08 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=uWw97g7ElUgJ2je8JI19vSCNfFEnazDluRAzx8g6jHM=; b=qigJXV7eykLEw2HNvRSnSafNDXB74tVhzTxsoMna/5OFyTN4EHbbjF69nWhsKLz5H7 Bl6SLcqokgsLdjP6pm3tlArBxEM0Mh5+XMW8U2R8Jjz86zF7K5f9gr0+mM0mIkSacKZD xaeNDnVtGwmKLhRkHnG3SnEX0AU8SrbtxumT16OGjySJxdAafY1+CkMv0k0XARHKRjox 4sYaesWY2NgENwweK5m//iXkcvYAIsFWEwZ9qAzlqvjTbyPE2WbhRy97/YBA3dkKO2Dn vLmX5cequ3KYMDn6l5bjId7bnrrggCwKy46DqP2fU7HHhfMowjYFjnYXKvW+cQ2oGV9x 4saw== 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:mime-version:content-transfer-encoding; bh=uWw97g7ElUgJ2je8JI19vSCNfFEnazDluRAzx8g6jHM=; b=glj+tUBh2NIv2iexc84rmmlEEzxJvgzVXr/MhA8MKy+ACcsHnSZAWiekBeX+AZSER/ JOSIROu7sUeZwlAxCdWR6HLpzjdsuD+MzapZUB0+LJMRFEWA1wWfV0MR2mX823D5yEqq wtkRYh3BFfYqD5ydv9gjW+64CYFw0bVOWXTw56pMbvIZF0bcfl9n3s714WLjysWaM2x7 2uVda9u6N4LMPmneN4PBKOl79n2mV4SFfTGTAZ0NcgwJ/ShmSIn6gcvJL3O934C9lPip KMROWxrPCYVqlt0NXejwG8q8gXQYcrUb54Ha6OfA33gDHMUjaiopWSAV7Hmfm56bVioe mPMw== X-Gm-Message-State: AA+aEWbuBocSEhZD+c4XpSsE5WJKx6tHhghGeJYMTFNWekLLsMzCsSb+ sHumt0xMK9/EWPSBX7gIz561K4g4 X-Google-Smtp-Source: AFSGD/WuNWoIvyybaMiPYlUdNs8S2clBrxB604ziXFmNaZ4F3Fc5rQZqWqB7gs3uAhxj38Z0YZd5OQ== X-Received: by 2002:a05:6000:10d1:: with SMTP id b17mr7593184wrx.306.1544385066607; Sun, 09 Dec 2018 11:51:06 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD73FBA00428D5CFFFEB99DB8.dip0.t-ipconnect.de. [2003:dc:d73f:ba00:428d:5cff:feb9:9db8]) by smtp.googlemail.com with ESMTPSA id x20sm20270941wme.6.2018.12.09.11.51.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Dec 2018 11:51:06 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-gpio@vger.kernel.org, linus.walleij@linaro.org Subject: [PATCH 4/6] pinctrl: meson: meson8: rename the "gpio" function to "gpio_periphs" Date: Sun, 9 Dec 2018 20:50:53 +0100 Message-Id: <20181209195055.26813-5-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181209195055.26813-1-martin.blumenstingl@googlemail.com> References: <20181209195055.26813-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181209_115116_822800_48A24EE0 X-CRM114-Status: GOOD ( 12.69 ) 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: carlo@caione.org, Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jbrunet@baylibre.com Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Rename the existing "gpio" function to "gpio_periphs". This makes it consistent with the "gpio_aobus" function. Also GXBB and GXL are also using the "gpio_periphs" naming, so this makes the code here consistent with other Amlogic pinctrl drivers. No functional changes since thee "gpio" function is currently not used. Signed-off-by: Martin Blumenstingl --- drivers/pinctrl/meson/pinctrl-meson8b.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c index 91cffc051055..b455e0c7a282 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8b.c +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c @@ -622,7 +622,7 @@ static struct meson_pmx_group meson8b_aobus_groups[] = { GROUP(i2s_lr_clk_in, 0, 14), }; -static const char * const gpio_groups[] = { +static const char * const gpio_periphs_groups[] = { "GPIOX_0", "GPIOX_1", "GPIOX_2", "GPIOX_3", "GPIOX_4", "GPIOX_5", "GPIOX_6", "GPIOX_7", "GPIOX_8", "GPIOX_9", "GPIOX_10", "GPIOX_11", "GPIOX_16", "GPIOX_17", "GPIOX_18", @@ -839,7 +839,7 @@ static const char * const tsin_b_groups[] = { }; static struct meson_pmx_func meson8b_cbus_functions[] = { - FUNCTION(gpio), + FUNCTION(gpio_periphs), FUNCTION(sd_a), FUNCTION(sdxc_a), FUNCTION(pcm_a),