From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Nelson Date: Mon, 18 Feb 2013 07:03:52 -0700 Subject: [U-Boot] [PATCH 2/6] i.MX6: consolidate pad names for multi-CPU boards In-Reply-To: References: <1361129058-27988-1-git-send-email-eric.nelson@boundarydevices.com> <1361129058-27988-3-git-send-email-eric.nelson@boundarydevices.com> Message-ID: <512234C8.6090605@boundarydevices.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Thanks again Jason, On 02/17/2013 10:31 PM, Liu Hui-R64343 wrote: >> -----Original Message----- >> From: Eric Nelson [mailto:eric.nelson at boundarydevices.com] >> Sent: Monday, February 18, 2013 3:24 AM >> To: u-boot at lists.denx.de >> Cc: sbabic at denx.de; Liu Hui-R64343; Estevam Fabio-R49496; >> troy.kisky at boundarydevices.com; Eric Nelson >> Subject: [PATCH 2/6] i.MX6: consolidate pad names for multi-CPU boards >> >> Rename all i.MX6 pad declarations to MX6_PAD_x, so a board >> may support either i.MX6Quad/Dual (MX6Q) or i.MX6Dual-Lite/Solo >> (MX6DL) by including the proper header. >> >> Boards mx6qarm2, mx6qsabreauto, mx6qsabrelite, and mx6qsabresd >> only support MX6Q, so they include mx6q_pins.h. >> >> Signed-off-by: Eric Nelson >> --- >> arch/arm/include/asm/arch-mx6/mx6-pins.h | 31 + >> arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 190 +-- >> arch/arm/include/asm/arch-mx6/mx6q_pins.h | 1671 >> +++++++++++++++++++++++++ >> arch/arm/include/asm/arch-mx6/mx6x_pins.h | 1671 ------------------------- >> board/freescale/mx6qarm2/mx6qarm2.c | 78 +- >> board/freescale/mx6qsabreauto/mx6qsabreauto.c | 60 +- >> board/freescale/mx6qsabrelite/mx6qsabrelite.c | 190 +-- >> board/freescale/mx6qsabresd/mx6qsabresd.c | 102 +- >> 8 files changed, 2012 insertions(+), 1981 deletions(-) >> create mode 100644 arch/arm/include/asm/arch-mx6/mx6-pins.h >> create mode 100644 arch/arm/include/asm/arch-mx6/mx6q_pins.h >> delete mode 100644 arch/arm/include/asm/arch-mx6/mx6x_pins.h >> >> diff --git a/arch/arm/include/asm/arch-mx6/mx6-pins.h >> b/arch/arm/include/asm/arch-mx6/mx6-pins.h >> new file mode 100644 >> index 0000000..4011268 >> --- /dev/null >> +++ b/arch/arm/include/asm/arch-mx6/mx6-pins.h >> @@ -0,0 +1,31 @@ >> +/* >> + * Copyright (C) 2012 Boundary Devices Inc. >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published by >> + * the Free Software Foundation; either version 2 of the License, or >> + * (at your option) any later version. >> + >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + >> + * You should have received a copy of the GNU General Public License along >> + * with this program; if not, write to the Free Software Foundation, Inc., >> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >> + */ >> +#ifndef __ASM_ARCH_MX6_PINS_H__ >> +#define __ASM_ARCH_MX6_PINS_H__ >> + >> +#ifdef CONFIG_MX6Q >> +#include "mx6q_pins.h" >> +#else >> +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) >> +#include "mx6dl_pins.h" >> +#else >> +#error "Please select cpu" >> +#endif /* CONFIG_MX6DL or CONFIG_MX6S */ >> +#endif /* CONFIG_MX6Q */ >> + >> +#endif /*__ASM_ARCH_MX6_PINS_H__ */ >> diff --git a/arch/arm/include/asm/arch-mx6/mx6dl_pins.h >> b/arch/arm/include/asm/arch-mx6/mx6dl_pins.h >> index 79e2c4f..0395357 100644 >> --- a/arch/arm/include/asm/arch-mx6/mx6dl_pins.h >> +++ b/arch/arm/include/asm/arch-mx6/mx6dl_pins.h >> @@ -50,100 +50,100 @@ >> #define NO_MUX_I 0 >> #define NO_PAD_I 0 >> enum { >> - MX6DL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK = >> IOMUX_PAD(0x03B0, 0x009C, 0, 0x0000, 0, PAD_CTL_DSE_120ohm), >> - MX6DL_PAD_DI0_PIN15__IPU1_DI0_PIN15 = IOMUX_PAD(0x03B4, >> 0x00A0, 0, 0x0000, 0, PAD_CTL_DSE_120ohm), >> - MX6DL_PAD_DI0_PIN2__IPU1_DI0_PIN2 = IOMUX_PAD(0x03B8, >> 0x00A4, 0, 0x0000, 0, PAD_CTL_DSE_120ohm), >> - MX6DL_PAD_DI0_PIN3__IPU1_DI0_PIN3 = IOMUX_PAD(0x03BC, >> 0x00A8, 0, 0x0000, 0, PAD_CTL_DSE_120ohm), >> - MX6DL_PAD_DI0_PIN4__GPIO_4_20 = IOMUX_PAD(0x03C0, >> 0x00AC, 5, 0x0000, 0, PAD_CTL_DSE_120ohm), > > [...] > >> diff --git a/board/freescale/mx6qarm2/mx6qarm2.c >> b/board/freescale/mx6qarm2/mx6qarm2.c >> index ee20d4f..ff7f5e8 100644 >> --- a/board/freescale/mx6qarm2/mx6qarm2.c >> +++ b/board/freescale/mx6qarm2/mx6qarm2.c >> @@ -23,7 +23,7 @@ >> #include >> #include >> #include >> -#include >> +#include > > Since you have defined mx6-pins.h, why not just include the mx6-pins.h? > If not using mx6-pins.h, then what's the purpose of it? > I kept mx6q_pins.h for existing boards that included dual-quad support, since the only builds are for that platform. If these boards support Dual-Lite/Solo, they'll need an additional board file with the proper declarations. I have no idea whether that's planned. Regards, Eric