Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp686825pxv; Wed, 14 Jul 2021 13:05:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3aIaOVH9smUWEE46IIu580lMDxb/veUN+i0MptC7zSwsbDyaEBVtFtErTRn4KyLaCAzIF X-Received: by 2002:aa7:cac7:: with SMTP id l7mr15604edt.43.1626293101010; Wed, 14 Jul 2021 13:05:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626293101; cv=none; d=google.com; s=arc-20160816; b=DDHwPAs0Yi+rhVQNKCU15M8n5xAZcrEobuRg1UBbcLEt0K03QBohKvgn4UvvT6h2xq FTdZHChtmrXfWMFz2arB3q2s4ctG8PKwtJX+cZrow4TOIAR+X+LxrCMfXwPasqdmHJQS ltLnnJ2jOVUe3q9S9FTS0okzr9QfPqmo6E6QD06BTdV+zZ/vncvMxZai2QgwToPWp+s1 8COQRyrtiMgQeK08ABD1LL8f40dsle39sY7eSPprqs4KPuTYm45NZ326Jipv+FtXcgIR ccC2wkSYy3+FWmzNU0DFSx6xz9+Buh8CaYWXbrqXI7rGYaMFj40Mex1+OXMbk5WEvY2W 34aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Oo9epLt5fUt7lwJf3S9IsiqeVOAN7meTpPvSS9gxiQs=; b=SYAQuHqygkS6eoK9J9uu4cxBtLW0j71re+kP3z939Jz7GNl+xAVQm7GlhgLnFVBTJG lJ1veWZTWqRlongKLD4KGVshsIxPF17xDhfwWHuEIozm0v5kodePwIZMRkGY1sJfAQLN gN35DB6dFW8wVCI3zT5ScHPQhq0eIWEmWW0humDLcF+HL3G9bwKo7MQUqnRb5nTbxsKH T37bjvl0lIa1vpUMOkzgDTnCt5IJp1dRevI/Yg+wrtxwU2hICtKIO8bT+Ea9l3MPpvyu uNXodZv3pSI2EBtfqR0t/V75ZzW1UGBmAB+1AOf4xOIS/oRHK9jw+j1+Errv+uaLbUWf OjuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sSjqpTs0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f2si3610237edw.161.2021.07.14.13.04.15; Wed, 14 Jul 2021 13:05:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sSjqpTs0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242506AbhGNUEz (ORCPT + 99 others); Wed, 14 Jul 2021 16:04:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:49296 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238810AbhGNTvL (ORCPT ); Wed, 14 Jul 2021 15:51:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0113361370; Wed, 14 Jul 2021 19:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626292095; bh=GDnEEEcQ1Tq/dc2fRrBgmg5Ris4mUwmbiTAT6Pwjoc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sSjqpTs0DgQp5rUveTaXWiT4VnIdaMu6UbsTCx1f/I5ZfuArsLchX3dhTIaGuj8zb k0nBkFlrhG4oI5V9F9+bWBH6/Tl9+2UjCrD/1jrmcct2cDGkHan0fPsd7D/N4mw0lf FROO0cpgY0E8QB6E828sy8FwpGn5eiA2aG6lA7wAwC/38k+GmUMUMA78jzoDuhk0iu Z4YZAEZMdAwewKngdmt6o0HpECO0V16+Knx6IFfkr1PkIAf0eocNGlYenCKihO6ABD Nk13ercouBmbj8g52ooBgTUuuX+hH7pENkyobbhR5hDJnE1yue6LDDNfl7FzNHclZB VpuGi/zjZJJKA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Shawn Guo , Sasha Levin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 06/18] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F] Date: Wed, 14 Jul 2021 15:47:54 -0400 Message-Id: <20210714194806.55962-6-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194806.55962-1-sashal@kernel.org> References: <20210714194806.55962-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Uwe Kleine-König [ Upstream commit e0cdd26af8eb9001689a4cde4f72c61c1c4b06be ] The pinfunc definitions used GPIO_A as function instead of GPIO_1_0 as done for all the other pins with GPIO functionality. Fix for consistency. There are no mainline users that needs adaption. Signed-off-by: Uwe Kleine-König Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx25-pinfunc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx25-pinfunc.h b/arch/arm/boot/dts/imx25-pinfunc.h index f840f03ad171..161033ef5123 100644 --- a/arch/arm/boot/dts/imx25-pinfunc.h +++ b/arch/arm/boot/dts/imx25-pinfunc.h @@ -545,31 +545,31 @@ #define MX25_PAD_DE_B__DE_B 0x1f0 0x3ec 0x000 0x00 0x000 #define MX25_PAD_DE_B__GPIO_2_20 0x1f0 0x3ec 0x000 0x05 0x000 -#define MX25_PAD_GPIO_A__GPIO_A 0x1f4 0x3f0 0x000 0x00 0x000 +#define MX25_PAD_GPIO_A__GPIO_1_0 0x1f4 0x3f0 0x000 0x00 0x000 #define MX25_PAD_GPIO_A__CAN1_TX 0x1f4 0x3f0 0x000 0x06 0x000 #define MX25_PAD_GPIO_A__USBOTG_PWR 0x1f4 0x3f0 0x000 0x02 0x000 -#define MX25_PAD_GPIO_B__GPIO_B 0x1f8 0x3f4 0x000 0x00 0x000 +#define MX25_PAD_GPIO_B__GPIO_1_1 0x1f8 0x3f4 0x000 0x00 0x000 #define MX25_PAD_GPIO_B__USBOTG_OC 0x1f8 0x3f4 0x57c 0x02 0x001 #define MX25_PAD_GPIO_B__CAN1_RX 0x1f8 0x3f4 0x480 0x06 0x001 -#define MX25_PAD_GPIO_C__GPIO_C 0x1fc 0x3f8 0x000 0x00 0x000 +#define MX25_PAD_GPIO_C__GPIO_1_2 0x1fc 0x3f8 0x000 0x00 0x000 #define MX25_PAD_GPIO_C__PWM4_PWMO 0x1fc 0x3f8 0x000 0x01 0x000 #define MX25_PAD_GPIO_C__I2C2_SCL 0x1fc 0x3f8 0x51c 0x02 0x001 #define MX25_PAD_GPIO_C__KPP_COL4 0x1fc 0x3f8 0x52c 0x03 0x001 #define MX25_PAD_GPIO_C__CAN2_TX 0x1fc 0x3f8 0x000 0x06 0x000 -#define MX25_PAD_GPIO_D__GPIO_D 0x200 0x3fc 0x000 0x00 0x000 +#define MX25_PAD_GPIO_D__GPIO_1_3 0x200 0x3fc 0x000 0x00 0x000 #define MX25_PAD_GPIO_D__I2C2_SDA 0x200 0x3fc 0x520 0x02 0x001 #define MX25_PAD_GPIO_D__CAN2_RX 0x200 0x3fc 0x484 0x06 0x001 -#define MX25_PAD_GPIO_E__GPIO_E 0x204 0x400 0x000 0x00 0x000 +#define MX25_PAD_GPIO_E__GPIO_1_4 0x204 0x400 0x000 0x00 0x000 #define MX25_PAD_GPIO_E__I2C3_CLK 0x204 0x400 0x524 0x01 0x002 #define MX25_PAD_GPIO_E__LD16 0x204 0x400 0x000 0x02 0x000 #define MX25_PAD_GPIO_E__AUD7_TXD 0x204 0x400 0x000 0x04 0x000 #define MX25_PAD_GPIO_E__UART4_RXD 0x204 0x400 0x570 0x06 0x002 -#define MX25_PAD_GPIO_F__GPIO_F 0x208 0x404 0x000 0x00 0x000 +#define MX25_PAD_GPIO_F__GPIO_1_5 0x208 0x404 0x000 0x00 0x000 #define MX25_PAD_GPIO_F__LD17 0x208 0x404 0x000 0x02 0x000 #define MX25_PAD_GPIO_F__AUD7_TXC 0x208 0x404 0x000 0x04 0x000 #define MX25_PAD_GPIO_F__UART4_TXD 0x208 0x404 0x000 0x06 0x000 -- 2.30.2