Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp673443pxv; Wed, 14 Jul 2021 12:42:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1iqjWQzEMHTCFlcOxDQdxhozEgoA8Al83ZN42nqihgvpVTfPatBg32iOzRyyGRnAZFDTv X-Received: by 2002:a17:906:b094:: with SMTP id x20mr12990037ejy.257.1626291777168; Wed, 14 Jul 2021 12:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626291777; cv=none; d=google.com; s=arc-20160816; b=AZkCwQ9S7v4htgvRPBGlEu7iq6T9oyGHRl9kcGnDMCx7DUsXSYDMWjHG5fC8h5mDHo epxyy0opoXxi5PUSkgMIVwQ3tN+Emg/lK4FJjQsE1o9j05qRz+9W79cSb+GaxoF4TWpb jQ7d8+ZD7OZNo1v8JUCh1NIn+WbaqJT46Xdm9UDdg/kkFHiL4I+48crANcHd/B1XHni5 dCS8x3AEyjJqmq0X7noZ68SElAEnj6dZOeepXaBceMaGY9/BozzbMZ+Fe4Fzu+KhYL0z zQN6Yne43J2wZqSqNeIwRGtqj5ZDz2mrP0PUhCHxd/5RGLjpRJSbl8sCl0IIrOq34Tle 1xsg== 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=vZqxbWAorgxdTNLWFj8NXvJQSgXdWhzQBgOwy5z+LuI=; b=dlBCfuglKIQAcAqPbv6Byv0/tU6ZmqIwBHpSEYElJ+FWdYaIgP9HZ+ehtqBTZFf/re WjxGAaDTfiIrSMCo/HTPljgns14PxdSAveNWnwrWK/1RX+ZkeolCfSfDV4Pg7joBL0dT cUu80qUpJJWxGTs5pJKxsdFvWE0y78fdM/IkScA8uRMXmOAfPITJKg8PTnNsviDKeVmm H3AXnfp/KHriDOE4R3D+dcKaiEpV0S78b5dDF8MLcsOiTExwogydeRLXmBL/fVlkkq3T ydR98zVE2IiwZaccojl3OzoT+T2qC2P2pPi+IkKCvdQXIDP44n09LWVRmtQRTqqfmjre CwjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jjwu29pS; 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 g20si3684656edw.5.2021.07.14.12.42.33; Wed, 14 Jul 2021 12:42:57 -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=jjwu29pS; 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 S234274AbhGNTly (ORCPT + 99 others); Wed, 14 Jul 2021 15:41:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:35824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232710AbhGNTl3 (ORCPT ); Wed, 14 Jul 2021 15:41:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 294C1613E8; Wed, 14 Jul 2021 19:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291517; bh=/Y5p+u3HuN6J545R6s3d4Yr2Bp7btNdWGc+nyZL8xjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jjwu29pSiZ5DUbq68XkrhcZtd4xtJpNcdLiT3XbHzYrunhbXf49e0hG8DJmyzsTzm iXZLdRGF53GQA15JOAc/SnM2yPsu8UexpkYeDa+GhTPqsNpv5DeVmRgos9KDNfm2AS x15DofVEclbRNJiDpdSSRxgGL+WcxJez7TTSjLMApggU6tY0FDjCXKrULaCsOX2ddP SW6KkQXAwp4dyVbWed1tt9cJKtjS1vR77kaFyBdR150C9FDUkYIfHahAdx/GtBu5er R7mgQdLJi9Tr8CUsnCHDjkVXVYzHkOCR6IwbMPB0xgy9QFiCGnJvf9OKQXkVz9rI3Z ghX0n8Vl1MOLg== 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 5.13 024/108] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F] Date: Wed, 14 Jul 2021 15:36:36 -0400 Message-Id: <20210714193800.52097-24-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714193800.52097-1-sashal@kernel.org> References: <20210714193800.52097-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 f984b702efc5..908caf810351 100644 --- a/arch/arm/boot/dts/imx25-pinfunc.h +++ b/arch/arm/boot/dts/imx25-pinfunc.h @@ -563,15 +563,15 @@ #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 @@ -580,18 +580,18 @@ #define MX25_PAD_GPIO_C__CAN2_TX 0x1fc 0x3f8 0x000 0x06 0x000 #define MX25_PAD_GPIO_C__CSPI2_SS2 0x1fc 0x3f8 0x000 0x07 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_D__CSPI3_SS2 0x200 0x3fc 0x4c4 0x07 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