From: Eric Nelson <eric.nelson@boundarydevices.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH RFC 06/22] i.MX6: MX6Q: update OBSERVE_MUX pad declarations to match MX6DL
Date: Sat, 31 Aug 2013 14:38:34 -0700 [thread overview]
Message-ID: <1377985130-17239-7-git-send-email-eric.nelson@boundarydevices.com> (raw)
In-Reply-To: <1377985130-17239-1-git-send-email-eric.nelson@boundarydevices.com>
The OBSERVE_MUX pad declarations were abbreviated differently
in mx6q_pins.h than in mx6dl_pins.h.
This patch adopts the slightly more verbose form from mx6dl_pins,
because they match the Linux 3.x headers.
No functional changes are introduced by this patch and
there are no current users of these declarations.
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
arch/arm/include/asm/arch-mx6/mx6q_pins.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/arch-mx6/mx6q_pins.h b/arch/arm/include/asm/arch-mx6/mx6q_pins.h
index 78b33ba..819f46b 100644
--- a/arch/arm/include/asm/arch-mx6/mx6q_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6q_pins.h
@@ -997,7 +997,7 @@ enum {
MX6_PAD_GPIO_9__USDHC1_WP = IOMUX_PAD(0x05F8, 0x0228, 6, 0x094C, 1, 0),
MX6_PAD_GPIO_9__SRC_EARLY_RST = IOMUX_PAD(0x05F8, 0x0228, 7, 0x0000, 0, 0),
MX6_PAD_GPIO_3__ESAI1_HCKR = IOMUX_PAD(0x05FC, 0x022C, 0, 0x0864, 1, 0),
- MX6_PAD_GPIO_3__OBSERVE_MUX_INT_OUT0 = IOMUX_PAD(0x05FC, 0x022C, 1, 0x0000, 0, 0),
+ MX6_PAD_GPIO_3__OBSERVE_MUX_OBSRV_INT_OUT0 = IOMUX_PAD(0x05FC, 0x022C, 1, 0x0000, 0, 0),
MX6_PAD_GPIO_3__I2C3_SCL = IOMUX_PAD(0x05FC, 0x022C, 18, 0x08A8, 1, 0),
MX6_PAD_GPIO_3__ANATOP_24M_OUT = IOMUX_PAD(0x05FC, 0x022C, 3, 0x0000, 0, 0),
MX6_PAD_GPIO_3__CCM_CLKO2 = IOMUX_PAD(0x05FC, 0x022C, 4, 0x0000, 0, 0),
@@ -1005,7 +1005,7 @@ enum {
MX6_PAD_GPIO_3__USBOH3_USBH1_OC = IOMUX_PAD(0x05FC, 0x022C, 6, 0x0948, 1, 0),
MX6_PAD_GPIO_3__MLB_MLBCLK = IOMUX_PAD(0x05FC, 0x022C, 7, 0x0900, 1, 0),
MX6_PAD_GPIO_6__ESAI1_SCKT = IOMUX_PAD(0x0600, 0x0230, 0, 0x0870, 1, 0),
- MX6_PAD_GPIO_6__OBSERVE_MUX_INT_OUT1 = IOMUX_PAD(0x0600, 0x0230, 1, 0x0000, 0, 0),
+ MX6_PAD_GPIO_6__OBSERVE_MUX_OBSRV_INT_OUT1 = IOMUX_PAD(0x0600, 0x0230, 1, 0x0000, 0, 0),
MX6_PAD_GPIO_6__I2C3_SDA = IOMUX_PAD(0x0600, 0x0230, 18, 0x08AC, 1, 0),
MX6_PAD_GPIO_6__CCM_CCM_OUT_0 = IOMUX_PAD(0x0600, 0x0230, 3, 0x0000, 0, 0),
MX6_PAD_GPIO_6__CSU_CSU_INT_DEB = IOMUX_PAD(0x0600, 0x0230, 4, 0x0000, 0, 0),
@@ -1013,7 +1013,7 @@ enum {
MX6_PAD_GPIO_6__USDHC2_LCTL = IOMUX_PAD(0x0600, 0x0230, 6, 0x0000, 0, 0),
MX6_PAD_GPIO_6__MLB_MLBSIG = IOMUX_PAD(0x0600, 0x0230, 7, 0x0908, 1, 0),
MX6_PAD_GPIO_2__ESAI1_FST = IOMUX_PAD(0x0604, 0x0234, 0, 0x0860, 1, 0),
- MX6_PAD_GPIO_2__OBSERVE_MUX_INT_OUT2 = IOMUX_PAD(0x0604, 0x0234, 1, 0x0000, 0, 0),
+ MX6_PAD_GPIO_2__OBSERVE_MUX_OBSRV_INT_OUT2 = IOMUX_PAD(0x0604, 0x0234, 1, 0x0000, 0, 0),
MX6_PAD_GPIO_2__KPP_ROW_6 = IOMUX_PAD(0x0604, 0x0234, 2, 0x08F8, 1, 0),
MX6_PAD_GPIO_2__CCM_CCM_OUT_1 = IOMUX_PAD(0x0604, 0x0234, 3, 0x0000, 0, 0),
MX6_PAD_GPIO_2__CSU_CSU_ALARM_AUT_0 = IOMUX_PAD(0x0604, 0x0234, 4, 0x0000, 0, 0),
@@ -1021,7 +1021,7 @@ enum {
MX6_PAD_GPIO_2__USDHC2_WP = IOMUX_PAD(0x0604, 0x0234, 6, 0x0000, 0, 0),
MX6_PAD_GPIO_2__MLB_MLBDAT = IOMUX_PAD(0x0604, 0x0234, 7, 0x0904, 1, 0),
MX6_PAD_GPIO_4__ESAI1_HCKT = IOMUX_PAD(0x0608, 0x0238, 0, 0x0868, 1, 0),
- MX6_PAD_GPIO_4__OBSERVE_MUX_INT_OUT3 = IOMUX_PAD(0x0608, 0x0238, 1, 0x0000, 0, 0),
+ MX6_PAD_GPIO_4__OBSERVE_MUX_OBSRV_INT_OUT3 = IOMUX_PAD(0x0608, 0x0238, 1, 0x0000, 0, 0),
MX6_PAD_GPIO_4__KPP_COL_7 = IOMUX_PAD(0x0608, 0x0238, 2, 0x08F0, 1, 0),
MX6_PAD_GPIO_4__CCM_CCM_OUT_2 = IOMUX_PAD(0x0608, 0x0238, 3, 0x0000, 0, 0),
MX6_PAD_GPIO_4__CSU_CSU_ALARM_AUT_1 = IOMUX_PAD(0x0608, 0x0238, 4, 0x0000, 0, 0),
@@ -1029,7 +1029,7 @@ enum {
MX6_PAD_GPIO_4__USDHC2_CD = IOMUX_PAD(0x0608, 0x0238, 6, 0x0000, 0, 0),
MX6_PAD_GPIO_4__OCOTP_CRL_WRAR_FUSE_LA = IOMUX_PAD(0x0608, 0x0238, 7, 0x0000, 0, 0),
MX6_PAD_GPIO_5__ESAI1_TX2_RX3 = IOMUX_PAD(0x060C, 0x023C, 0, 0x087C, 1, 0),
- MX6_PAD_GPIO_5__OBSERVE_MUX_INT_OUT4 = IOMUX_PAD(0x060C, 0x023C, 1, 0x0000, 0, 0),
+ MX6_PAD_GPIO_5__OBSERVE_MUX_OBSRV_INT_OUT4 = IOMUX_PAD(0x060C, 0x023C, 1, 0x0000, 0, 0),
MX6_PAD_GPIO_5__KPP_ROW_7 = IOMUX_PAD(0x060C, 0x023C, 2, 0x08FC, 1, 0),
MX6_PAD_GPIO_5__CCM_CLKO = IOMUX_PAD(0x060C, 0x023C, 3, 0x0000, 0, 0),
MX6_PAD_GPIO_5__CSU_CSU_ALARM_AUT_2 = IOMUX_PAD(0x060C, 0x023C, 4, 0x0000, 0, 0),
--
1.8.1.2
next prev parent reply other threads:[~2013-08-31 21:38 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-31 21:38 [U-Boot] [PATCH RFC 0/22] i.MX6: Update pad declarations for multiple-arch binaries Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 01/22] i.MX6: MX6Q: update USBOH3 pad declarations to match MX6DL Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 02/22] i.MX6: MX6Q: update SDMA " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 03/22] i.MX6: MX6Q: update PCIE " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 04/22] i.MX6: MX6Q: update MIPI_CORE " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 05/22] i.MX6: MX6Q/MX6DL: update PL301 AXI interconnect pad declarations Eric Nelson
2013-08-31 21:38 ` Eric Nelson [this message]
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 07/22] i.MX6: MX6Q: update MMDC_DEBUG pad declarations to match MX6DL Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 08/22] i.MX6: MX6Q/MX6DL: update TRACE pad declarations Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 09/22] i.MX6: MX6Q: update ANATOP " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 10/22] i.MX6: MX6Q: update DI0 MIPI " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 11/22] Additional SIMBA/CHEETAH removal Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 12/22] i.MX6: MX6Q: update USDHC1 pad declarations Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 13/22] i.MX6: MX6Q: Change CSI0_DATA_EN abbreviation to match MX6DL Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 14/22] i.MX6: MX6Q: update SPDIF_EXTCLK " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 15/22] i.MX6: MX6Q: update 1588 EVENT declarations " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 16/22] i.MX6: MX6Q: update SNVS " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 17/22] i.MX6: MX6Q: update GPU_DEBUG " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 18/22] i.MX6: MX6Q: update ETHERNET/OCOTP " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 19/22] i.MX6: MX6Q: update MIPI_CORE_DPHY " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 20/22] i.MX6: MX6Q: update MIPI_HSI_CTRL " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 21/22] i.MX6: MX6Q: update CAAM_WRAPPER declaration " Eric Nelson
2013-08-31 21:38 ` [U-Boot] [PATCH RFC 22/22] i.MX6: MX6Q: update CCM_PMIC " Eric Nelson
2013-08-31 21:55 ` [U-Boot] [PATCH RFC 0/22] i.MX6: Update pad declarations for multiple-arch binaries Otavio Salvador
2013-09-01 17:08 ` Stefano Babic
2013-09-01 18:21 ` Eric Nelson
2013-09-13 17:01 ` Eric Nelson
2013-09-13 17:07 ` Otavio Salvador
2013-09-13 17:15 ` Stefano Babic
2013-09-01 18:50 ` Otavio Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377985130-17239-7-git-send-email-eric.nelson@boundarydevices.com \
--to=eric.nelson@boundarydevices.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox