From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756392AbeAROSZ (ORCPT ); Thu, 18 Jan 2018 09:18:25 -0500 Received: from mail-sh2.amlogic.com ([58.32.228.45]:63279 "EHLO mail-sh2.amlogic.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756232AbeAROSX (ORCPT ); Thu, 18 Jan 2018 09:18:23 -0500 From: Yixun Lan To: Linus Walleij CC: Kevin Hilman , Neil Armstrong , Jerome Brunet , Carlo Caione , Yixun Lan , Xingyu Chen , , , , Subject: [PATCH] pinctrl: meson-axg: adjust uart_ao_b pin group naming Date: Thu, 18 Jan 2018 22:17:57 +0800 Message-ID: <20180118141757.41290-1-yixun.lan@amlogic.com> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.18.20.235] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simply adjust the pin group to _x _y _z style, as to keep the consistency in DT with previous naming scheme. Fixes: 83c566806a68 ("pinctrl: meson-axg: Add new pinctrl driver for Meson AXG SoC") Signed-off-by: Yixun Lan --- Hi Linus, Please also consider merging this patch into 'for-next', since it fixes issue added in the same cycle. This patch will also obsolete previous one patches [1] [1] pinctrl: meson: use one uniform 'function' name http://lkml.kernel.org/r/20180108073328.205769-1-yixun.lan@amlogic.com --- drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c index 1fda9d6c7ea3..4b91ff74779b 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c @@ -716,7 +716,7 @@ static const char * const uart_b_groups[] = { "uart_tx_b_x", "uart_rx_b_x", "uart_cts_b_x", "uart_rts_b_x", }; -static const char * const uart_ao_b_gpioz_groups[] = { +static const char * const uart_ao_b_z_groups[] = { "uart_ao_tx_b_z", "uart_ao_rx_b_z", "uart_ao_cts_b_z", "uart_ao_rts_b_z", }; @@ -855,7 +855,7 @@ static struct meson_pmx_func meson_axg_periphs_functions[] = { FUNCTION(nand), FUNCTION(uart_a), FUNCTION(uart_b), - FUNCTION(uart_ao_b_gpioz), + FUNCTION(uart_ao_b_z), FUNCTION(i2c0), FUNCTION(i2c1), FUNCTION(i2c2), -- 2.15.1