i.MX6: updates to support boards with multiple CPU options
This set of patches simplifies the code for i.MX6 boards that support multiple processor options as discussed in this RFC:
http://lists.denx.de/pipermail/u-boot/2013-January/#145562
Patch 1 is a simple whitespace change so that patch 2 passes checkpatch (ignoring long lines).
PATCH 1/6 i.MX6: mx6qsabrelite: indent with tabs
This patch has no functional changes and simply replaces leading spaces with tabs.
--- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 106 ++++++++++++------------- 1 file changed, 53 insertions(+), 53 deletions(-)
board/freescale/mx6qsabrelite/mx6qsabrelite.c +53 -53
@@ -46,12 +46,12 @@DECLARE_GLOBAL_DATA_PTR ;#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) + PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ + PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)#define ENET_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
@@ -72,9 +72,9 @@ DECLARE_GLOBAL_DATA_PTR;int dram_init (void ) { - gd->ram_size =get_ram_size ((void *)PHYS_SDRAM ,PHYS_SDRAM_SIZE ); + gd->ram_size =get_ram_size ((void *)PHYS_SDRAM ,PHYS_SDRAM_SIZE ); -return 0 ; +return 0 ; }iomux_v3_cfg_t const uart1_pads[] = {
@@ -83,8 +83,8 @@ iomux_v3_cfg_t const uart1_pads[] = { };iomux_v3_cfg_t const uart2_pads[] = { -MX6Q_PAD_EIM_D26__UART2_TXD |MUX_PAD_CTRL (UART_PAD_CTRL ), -MX6Q_PAD_EIM_D27__UART2_RXD |MUX_PAD_CTRL (UART_PAD_CTRL ), +MX6Q_PAD_EIM_D26__UART2_TXD |MUX_PAD_CTRL (UART_PAD_CTRL ), +MX6Q_PAD_EIM_D27__UART2_RXD |MUX_PAD_CTRL (UART_PAD_CTRL ), };#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
@@ -132,23 +132,23 @@ struct i2c_pads_info i2c_pad_info2 = { };iomux_v3_cfg_t const usdhc3_pads[] = { -MX6Q_PAD_SD3_CLK__USDHC3_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_CMD__USDHC3_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT0__USDHC3_DAT0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT1__USDHC3_DAT1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT2__USDHC3_DAT2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT3__USDHC3_DAT3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT5__GPIO_7_0 |MUX_PAD_CTRL (NO_PAD_CTRL ),/* CD */ +MX6Q_PAD_SD3_CLK__USDHC3_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD3_CMD__USDHC3_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD3_DAT0__USDHC3_DAT0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD3_DAT1__USDHC3_DAT1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD3_DAT2__USDHC3_DAT2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD3_DAT3__USDHC3_DAT3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD3_DAT5__GPIO_7_0 |MUX_PAD_CTRL (NO_PAD_CTRL ),/* CD */ };iomux_v3_cfg_t const usdhc4_pads[] = { -MX6Q_PAD_SD4_CLK__USDHC4_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD4_CMD__USDHC4_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD4_DAT0__USDHC4_DAT0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD4_DAT1__USDHC4_DAT1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD4_DAT2__USDHC4_DAT2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD4_DAT3__USDHC4_DAT3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_NANDF_D6__GPIO_2_6 |MUX_PAD_CTRL (NO_PAD_CTRL ),/* CD */ +MX6Q_PAD_SD4_CLK__USDHC4_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD4_CMD__USDHC4_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD4_DAT0__USDHC4_DAT0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD4_DAT1__USDHC4_DAT1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD4_DAT2__USDHC4_DAT2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_SD4_DAT3__USDHC4_DAT3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6Q_PAD_NANDF_D6__GPIO_2_6 |MUX_PAD_CTRL (NO_PAD_CTRL ),/* CD */ };iomux_v3_cfg_t const enet_pads1[] = {
@@ -227,7 +227,7 @@ iomux_v3_cfg_t const usb_pads[] = {static void setup_iomux_uart (void ) {imx_iomux_v3_setup_multiple_pads (uart1_pads,ARRAY_SIZE (uart1_pads)); -imx_iomux_v3_setup_multiple_pads (uart2_pads,ARRAY_SIZE (uart2_pads)); +imx_iomux_v3_setup_multiple_pads (uart2_pads,ARRAY_SIZE (uart2_pads)); }#ifdef CONFIG_USB_EHCI_MX6
@@ -246,55 +246,55 @@ int board_ehci_hcd_init(int port)#ifdef CONFIG_FSL_ESDHC struct fsl_esdhc_cfg usdhc_cfg[2 ] = { - {USDHC3_BASE_ADDR }, - {USDHC4_BASE_ADDR }, + {USDHC3_BASE_ADDR }, + {USDHC4_BASE_ADDR }, };int board_mmc_getcd (struct mmc *mmc) { -struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; -int ret; +struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; +int ret; -if (cfg->esdhc_base ==USDHC3_BASE_ADDR ) { +if (cfg->esdhc_base ==USDHC3_BASE_ADDR ) {gpio_direction_input (IMX_GPIO_NR (7 ,0 )); ret = !gpio_get_value (IMX_GPIO_NR (7 ,0 )); - }else { + }else {gpio_direction_input (IMX_GPIO_NR (2 ,6 )); ret = !gpio_get_value (IMX_GPIO_NR (2 ,6 )); - } + } -return ret; +return ret; }int board_mmc_init (bd_t *bis) { -s32 status =0 ; -u32 index =0 ; +s32 status =0 ; +u32 index =0 ; usdhc_cfg[0 ].sdhc_clk =mxc_get_clock (MXC_ESDHC3_CLK ); usdhc_cfg[1 ].sdhc_clk =mxc_get_clock (MXC_ESDHC4_CLK ); -for (index =0 ; index <CONFIG_SYS_FSL_USDHC_NUM ; ++index) { -switch (index) { -case 0 : -imx_iomux_v3_setup_multiple_pads ( - usdhc3_pads,ARRAY_SIZE (usdhc3_pads)); -break ; -case 1 : -imx_iomux_v3_setup_multiple_pads ( - usdhc4_pads,ARRAY_SIZE (usdhc4_pads)); +for (index =0 ; index <CONFIG_SYS_FSL_USDHC_NUM ; ++index) { +switch (index) { +case 0 : +imx_iomux_v3_setup_multiple_pads ( + usdhc3_pads,ARRAY_SIZE (usdhc3_pads)); +break ; +case 1 : +imx_iomux_v3_setup_multiple_pads ( + usdhc4_pads,ARRAY_SIZE (usdhc4_pads));break ;default : -printf ("Warning: you configured more USDHC controllers" +printf ("Warning: you configured more USDHC controllers" "(%d) then supported by the board (%d)\n" , index +1 ,CONFIG_SYS_FSL_USDHC_NUM ); -return status; - } +return status; + } - status |=fsl_esdhc_initialize (bis, &usdhc_cfg[index]); - } + status |=fsl_esdhc_initialize (bis, &usdhc_cfg[index]); + } -return status; +return status; }#endif
@@ -732,8 +732,8 @@ int overwrite_console(void)int board_init (void ) { -/* address of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; +/* address of boot parameters */ + gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;#ifdef CONFIG_MXC_SPI setup_spi ();
@@ -746,14 +746,14 @@ int board_init(void)setup_sata ();#endif -return 0 ; +return 0 ; }int checkboard (void ) { -puts ("Board: MX6Q-Sabre Lite\n" ); +puts ("Board: MX6Q-Sabre Lite\n" ); -return 0 ; +return 0 ; }struct button_key {
Signature · 1 line
1.7.9.5
PATCH 1/6 i.MX6: mx6qsabrelite: indent with tabs
Quoted 8 lines
-----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 1/6] i.MX6: mx6qsabrelite: indent with tabs
Quoted 4 lines
This patch has no functional changes and simply replaces leading spaces with tabs.
Signed-off-by Eric Nelson <[email protected]>
Quoted 13 lines
---
board/freescale/mx6qsabrelite/mx6qsabrelite.c| 106 ++++++++++++----------- --1 file changed, 53 insertions(+), 53 deletions(-)board/freescale/mx6qsabrelite/mx6qsabrelite.c +0
-0@@ -46,12 +46,12 @@DECLARE_GLOBAL_DATA_PTR ;
[..]
PATCH 2/6 i.MX6: consolidate pad names for multi-CPU boards
In reply to Eric NelsonRename 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.
--- 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
arch/arm/include/asm/arch-mx6/mx6-pins.h new file +31 -0
@@ -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__ */
arch/arm/include/asm/arch-mx6/mx6dl_pins.h +95 -95
195 lines not on this page · raw message
arch/arm/include/asm/arch-mx6/mx6q_pins.h new file +1671 -0
1,671 lines not on this page · raw message
arch/arm/include/asm/arch-mx6/mx6x_pins.h deleted +0 -1671
1,103 lines not on this page · raw message
board/freescale/mx6qarm2/mx6qarm2.c +39 -39
78 lines not on this page · raw message
board/freescale/mx6qsabreauto/mx6qsabreauto.c +30 -30
60 lines not on this page · raw message
board/freescale/mx6qsabrelite/mx6qsabrelite.c +95 -95
190 lines not on this page · raw message
board/freescale/mx6qsabresd/mx6qsabresd.c +51 -51
102 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH 2/6 i.MX6: consolidate pad names for multi-CPU boards
Quoted 88 lines
-----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 boardsRename 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 <[email protected]>---
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.hcreate mode 100644arch/arm/include/asm/arch-mx6/mx6q_pins.hdelete mode 100644arch/arm/include/asm/arch-mx6/mx6x_pins.harch/arm/include/asm/arch-mx6/mx6-pins.h new file +31
-0@@ -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__ */ arch/arm/include/asm/arch-mx6/mx6dl_pins.h +0
-5@@ -50,100 +50,100 @@#define NO_MUX_I 0#define NO_PAD_I 0enum { -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),
[...]
board/freescale/mx6qarm2/mx6qarm2.c line 26
Quoted 11 lines
board/freescale/mx6qarm2/mx6qarm2.c +1
-1@@ -23,7 +23,7 @@#include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/mx6x_pins.h> +#include <asm/arch/mx6q_pins.h>
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?
Quoted 177 lines
board/freescale/mx6qarm2/mx6qarm2.c +2
-13#include <asm/arch/clock.h> #include <asm/errno.h> #include <asm/gpio.h> @@ -55,53 +55,53 @@ int dram_init(void) }iomux_v3_cfg_t const uart4_pads[] = { -MX6Q_PAD_KEY_COL0__UART4_TXD |MUX_PAD_CTRL (UART_PAD_CTRL ), -MX6Q_PAD_KEY_ROW0__UART4_RXD |MUX_PAD_CTRL (UART_PAD_CTRL ), +MX6_PAD_KEY_COL0__UART4_TXD |MUX_PAD_CTRL (UART_PAD_CTRL ), +MX6_PAD_KEY_ROW0__UART4_RXD |MUX_PAD_CTRL (UART_PAD_CTRL ), };iomux_v3_cfg_t const usdhc3_pads[] = { -MX6Q_PAD_SD3_CLK__USDHC3_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_CMD__USDHC3_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT0__USDHC3_DAT0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT1__USDHC3_DAT1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT2__USDHC3_DAT2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT3__USDHC3_DAT3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT4__USDHC3_DAT4 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT5__USDHC3_DAT5 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT6__USDHC3_DAT6 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6Q_PAD_SD3_DAT7__USDHC3_DAT7 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), - MX6Q_PAD_NANDF_CS0__GPIO_6_11 |
MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_CLK__USDHC3_CLK |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_CMD__USDHC3_CMD |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT0__USDHC3_DAT0 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT1__USDHC3_DAT1 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT2__USDHC3_DAT2 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT3__USDHC3_DAT3 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT4__USDHC3_DAT4 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT5__USDHC3_DAT5 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT6__USDHC3_DAT6 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD3_DAT7__USDHC3_DAT7 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_NANDF_CS0__GPIO_6_11 |
MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */
};
iomux_v3_cfg_tconst usdhc4_pads[] = {board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_CLK__USDHC4_CLK |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_CMD__USDHC4_CMD |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT0__USDHC4_DAT0 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT1__USDHC4_DAT1 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT2__USDHC4_DAT2 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT3__USDHC4_DAT3 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT4__USDHC4_DAT4 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT5__USDHC4_DAT5 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT6__USDHC4_DAT6 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_SD4_DAT7__USDHC4_DAT7 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_CLK__USDHC4_CLK |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_CMD__USDHC4_CMD |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT0__USDHC4_DAT0 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT1__USDHC4_DAT1 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT2__USDHC4_DAT2 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT3__USDHC4_DAT3 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT4__USDHC4_DAT4 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT5__USDHC4_DAT5 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT6__USDHC4_DAT6 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_SD4_DAT7__USDHC4_DAT7 |
MUX_PAD_CTRL(USDHC_PAD_CTRL),
};
iomux_v3_cfg_tconst enet_pads[] = {board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_KEY_COL1__ENET_MDIO |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_KEY_COL2__ENET_MDC |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_TXC__ENET_RGMII_TXC |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_TD0__ENET_RGMII_TD0 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_TD1__ENET_RGMII_TD1 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_TD2__ENET_RGMII_TD2 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_TD3__ENET_RGMII_TD3 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_TX_CTL__RGMII_TX_CTL |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_RXC__ENET_RGMII_RXC |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_RD0__ENET_RGMII_RD0 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_RD1__ENET_RGMII_RD1 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_RD2__ENET_RGMII_RD2 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_RD3__ENET_RGMII_RD3 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +0
-1- MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_KEY_COL1__ENET_MDIO |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_KEY_COL2__ENET_MDC |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_TXC__ENET_RGMII_TXC |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_TD0__ENET_RGMII_TD0 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_TD1__ENET_RGMII_TD1 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_TD2__ENET_RGMII_TD2 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_TD3__ENET_RGMII_TD3 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_ENET_REF_CLK__ENET_TX_CLK |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_RXC__ENET_RGMII_RXC |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_RD0__ENET_RGMII_RD0 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_RD1__ENET_RGMII_RD1 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_RD2__ENET_RGMII_RD2 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_RD3__ENET_RGMII_RD3 |
MUX_PAD_CTRL(ENET_PAD_CTRL),board/freescale/mx6qarm2/mx6qarm2.c +1
-0+ MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL |
MUX_PAD_CTRL(ENET_PAD_CTRL),
};board/freescale/mx6qsabreauto/mx6qsabreauto.c +0
-0
board/freescale/mx6qsabreauto/mx6qsabreauto.c line 25
Quoted 5 lines
board/freescale/mx6qsabreauto/mx6qsabreauto.c +1
-1@@ -22,7 +22,7 @@#include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> -#include <asm/arch/mx6x_pins.h> +#include <asm/arch/mx6q_pins.h>
Ditto, for the left part.
Quoted 6 lines
board/freescale/mx6qsabreauto/mx6qsabreauto.c +0
-0#include <asm/errno.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> @@ -54,26 +54,26 @@ int dram_init(void) }
[...]
PATCH 2/6 i.MX6: consolidate pad names for multi-CPU boards
Thanks again Jason,
Quoted 91 lines · On 02/17/2013 10:31 PM, Liu Hui-R64343 wrote:
Quoted 88 lines
-----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 boardsRename 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 <[email protected]>---
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.hcreate mode 100644arch/arm/include/asm/arch-mx6/mx6q_pins.hdelete mode 100644arch/arm/include/asm/arch-mx6/mx6x_pins.harch/arm/include/asm/arch-mx6/mx6-pins.h new file +31
-0@@ -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__ */ arch/arm/include/asm/arch-mx6/mx6dl_pins.h +0
-5@@ -50,100 +50,100 @@#define NO_MUX_I 0#define NO_PAD_I 0enum { -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),[...]
Quoted 15 lines
board/freescale/mx6qarm2/mx6qarm2.c line 26
Quoted 11 lines
board/freescale/mx6qarm2/mx6qarm2.c +1
-1@@ -23,7 +23,7 @@#include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/mx6x_pins.h> +#include <asm/arch/mx6q_pins.h> Since you have defined
mx6-pins.h, why not just include themx6-pins.h? If not usingmx6-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
PATCH 3/6 i.MX6: crm_regs: define CCM_CCGRx for use in board config files
In reply to Eric Nelson--- arch/arm/include/asm/arch-mx6/crm_regs.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/include/asm/arch-mx6/crm_regs.h +12 -0
@@ -20,6 +20,17 @@ #ifndef __ARCH_ARM_MACH_MX6_CCM_REGS_H__ #define __ARCH_ARM_MACH_MX6_CCM_REGS_H__ +#define CCM_CCGR0 0x020C4068 +#define CCM_CCGR1 0x020C406c +#define CCM_CCGR2 0x020C4070 +#define CCM_CCGR3 0x020C4074 +#define CCM_CCGR4 0x020C4078 +#define CCM_CCGR5 0x020C407c +#define CCM_CCGR6 0x020C4080 + +#define PMU_MISC2 0x020C8170 + +#ifndef __ASSEMBLY__ struct mxc_ccm_reg { u32 ccr; /* 0x0000 */ u32 ccdr;
@@ -105,6 +116,7 @@ struct mxc_ccm_reg {u32 analog_pfd_528_clr; u32 analog_pfd_528_tog; }; +#endif /* Define the bits in register CCR */ #define MXC_CCM_CCR_RBC_EN (1 << 27)
Signature · 1 line
1.7.9.5
PATCH 4/6 i.MX6: crm_regs: define IOMUXC_GPR4/6/7
In reply to Eric Nelson--- arch/arm/include/asm/arch-mx6/iomux.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/include/asm/arch-mx6/iomux.h +5 -0
@@ -16,6 +16,11 @@#ifndef __ASM_ARCH_IOMUX_H__#define __ASM_ARCH_IOMUX_H__ + +#define IOMUXC_GPR4 0x020e0010 +#define IOMUXC_GPR6 0x020e0018 +#define IOMUXC_GPR7 0x020e001c +/* * IOMUXC_GPR13 bit fields */
Signature · 1 line
1.7.9.5
PATCH 4/6 i.MX6: crm_regs: define IOMUXC_GPR4/6/7
Quoted 19 lines
-----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 4/6] i.MX6:crm_regs: define IOMUXC_GPR4/6/7Signed-off-by Eric Nelson <[email protected]>---
arch/arm/include/asm/arch-mx6/iomux.h| 5 +++++1 file changed, 5 insertions(+)arch/arm/include/asm/arch-mx6/iomux.h +0
-0
arch/arm/include/asm/arch-mx6/iomux.h line 22
Quoted 7 lines
arch/arm/include/asm/arch-mx6/iomux.h +4
-0@@ -16,6 +16,11 @@#ifndef __ASM_ARCH_IOMUX_H__#define __ASM_ARCH_IOMUX_H__ + +#define IOMUXC_GPR4 0x020e0010 +#define IOMUXC_GPR6 0x020e0018 +#define IOMUXC_GPR7 0x020e001c
Since this definition located into directory 'arch-mx6', I prefer to add MX6_ prefix,
Jason
Quoted 7 lines
arch/arm/include/asm/arch-mx6/iomux.h +1
-1+/* * IOMUXC_GPR13 bit fields */ --1.7.9.5
PATCH 5/6 i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIO
In reply to Eric Nelson--- arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/include/asm/arch-mx6/mx6dl_pins.h +3 -0
@@ -105,6 +105,9 @@ enum {MX6_PAD_KEY_COL3__GPIO_4_12 =IOMUX_PAD (0x0638 ,0x0250 ,5 ,0x0000 ,0 ,0 ),MX6_PAD_KEY_ROW3__I2C2_SDA =IOMUX_PAD (0x064C ,0x0264 ,4 |IOMUX_CONFIG_SION ,0x0874 ,1 ,0 ),MX6_PAD_KEY_ROW3__GPIO_4_13 =IOMUX_PAD (0x064C ,0x0264 ,5 ,0x0000 ,0 ,0 ), +MX6_PAD_NANDF_CS1__GPIO_6_14 =IOMUX_PAD (0x0660 ,0x0278 ,5 ,0x0000 ,0 ,0 ), +MX6_PAD_NANDF_CS2__GPIO_6_15 =IOMUX_PAD (0x0664 ,0x027C ,5 ,0x0000 ,0 ,0 ), +MX6_PAD_NANDF_CS3__GPIO_6_16 =IOMUX_PAD (0x0668 ,0x0280 ,5 ,0x0000 ,0 ,0 ),MX6_PAD_NANDF_D1__GPIO_2_1 =IOMUX_PAD (0x0670 ,0x0288 ,5 ,0x0000 ,0 ,0 ),MX6_PAD_NANDF_D2__GPIO_2_2 =IOMUX_PAD (0x0674 ,0x028C ,5 ,0x0000 ,0 ,0 ), MX6_PAD_NANDF_D3__GPIO_2_3 = IOMUX_PAD(0x0678, 0x0290, 5, 0x0000, 0, 0),
Signature · 1 line
1.7.9.5
PATCH 5/6 i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIO
Quoted 10 lines
-----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 5/6] i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIOSigned-off-by Eric Nelson <[email protected]>
Quoted 31 lines
---
arch/arm/include/asm/arch-mx6/mx6dl_pins.h| 3 +++1 file changed, 3 insertions(+)arch/arm/include/asm/arch-mx6/mx6dl_pins.h +1
-0@@ -105,6 +105,9 @@ enum {MX6_PAD_KEY_COL3__GPIO_4_12 =IOMUX_PAD (0x0638 ,0x0250 ,5 ,0x0000 ,0 ,0 ),MX6_PAD_KEY_ROW3__I2C2_SDA =IOMUX_PAD (0x064C ,0x0264 ,4 |IOMUX_CONFIG_SION ,0x0874 ,1 ,0 ),MX6_PAD_KEY_ROW3__GPIO_4_13 =IOMUX_PAD (0x064C ,0x0264 ,5 ,0x0000 ,0 ,0 ), + MX6_PAD_NANDF_CS1__GPIO_6_14 =
IOMUX_PAD(0x0660, 0x0278, 5, 0x0000, 0, 0),arch/arm/include/asm/arch-mx6/mx6dl_pins.h +1
-0+ MX6_PAD_NANDF_CS2__GPIO_6_15 =
IOMUX_PAD(0x0664, 0x027C, 5, 0x0000, 0, 0),arch/arm/include/asm/arch-mx6/mx6dl_pins.h +1
-0+ MX6_PAD_NANDF_CS3__GPIO_6_16 =
IOMUX_PAD(0x0668, 0x0280, 5, 0x0000, 0, 0),MX6_PAD_NANDF_D1__GPIO_2_1 = IOMUX_PAD(0x0670, 0x0288, 5, 0x0000, 0, 0), MX6_PAD_NANDF_D2__GPIO_2_2 = IOMUX_PAD(0x0674, 0x028C, 5, 0x0000, 0, 0), MX6_PAD_NANDF_D3__GPIO_2_3 = IOMUX_PAD(0x0678,
0x0290, 5,0x0000, 0, 0),
--
1.7.9.5
PATCH 6/6 i.MX6: Add DDR controller registers
In reply to Eric Nelson--- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 85 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 71 ++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 69 +++++++++++++++++++++++ 3 files changed, 225 insertions(+) create mode 100644 arch/arm/include/asm/arch-mx6/mx6-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q-ddr.h
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +85 -0
@@ -0,0 +1,85 @@ +/* +* 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_DDR_H__ +#define __ASM_ARCH_MX6_DDR_H__ + +#ifdef CONFIG_MX6Q +#include "mx6q-ddr.h" +#else +#if defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S ) +#include "mx6dl-ddr.h" +#else +#error "Please select cpu" +#endif /* CONFIG_MX6DL or CONFIG_MX6S */ +#endif /* CONFIG_MX6Q */ + +#define MMDC_P0_MDCTL 0x021b0000 +#define MMDC_P0_MDPDC 0x021b0004 +#define MMDC_P0_MDOTC 0x021b0008 +#define MMDC_P0_MDCFG0 0x021b000c +#define MMDC_P0_MDCFG1 0x021b0010 +#define MMDC_P0_MDCFG2 0x021b0014 +#define MMDC_P0_MDMISC 0x021b0018 +#define MMDC_P0_MDSCR 0x021b001c +#define MMDC_P0_MDREF 0x021b0020 +#define MMDC_P0_MDRWD 0x021b002c +#define MMDC_P0_MDOR 0x021b0030 +#define MMDC_P0_MDASP 0x021b0040 +#define MMDC_P0_MAPSR 0x021b0404 +#define MMDC_P0_MPZQHWCTRL 0x021b0800 +#define MMDC_P0_MPWLDECTRL0 0x021b080c +#define MMDC_P0_MPWLDECTRL1 0x021b0810 +#define MMDC_P0_MPODTCTRL 0x021b0818 +#define MMDC_P0_MPRDDQBY0DL 0x021b081c +#define MMDC_P0_MPRDDQBY1DL 0x021b0820 +#define MMDC_P0_MPRDDQBY2DL 0x021b0824 +#define MMDC_P0_MPRDDQBY3DL 0x021b0828 +#define MMDC_P0_MPDGCTRL0 0x021b083c +#define MMDC_P0_MPDGCTRL1 0x021b0840 +#define MMDC_P0_MPRDDLCTL 0x021b0848 +#define MMDC_P0_MPWRDLCTL 0x021b0850 +#define MMDC_P0_MPMUR0 0x021b08b8 + +#define MMDC_P1_MDCTL 0x021b4000 +#define MMDC_P1_MDPDC 0x021b4004 +#define MMDC_P1_MDOTC 0x021b4008 +#define MMDC_P1_MDCFG0 0x021b400c +#define MMDC_P1_MDCFG1 0x021b4010 +#define MMDC_P1_MDCFG2 0x021b4014 +#define MMDC_P1_MDMISC 0x021b4018 +#define MMDC_P1_MDSCR 0x021b401c +#define MMDC_P1_MDREF 0x021b4020 +#define MMDC_P1_MDRWD 0x021b402c +#define MMDC_P1_MDOR 0x021b4030 +#define MMDC_P1_MDASP 0x021b4040 +#define MMDC_P1_MAPSR 0x021b4404 +#define MMDC_P1_MPZQHWCTRL 0x021b4800 +#define MMDC_P1_MPWLDECTRL0 0x021b480c +#define MMDC_P1_MPWLDECTRL1 0x021b4810 +#define MMDC_P1_MPODTCTRL 0x021b4818 +#define MMDC_P1_MPRDDQBY0DL 0x021b481c +#define MMDC_P1_MPRDDQBY1DL 0x021b4820 +#define MMDC_P1_MPRDDQBY2DL 0x021b4824 +#define MMDC_P1_MPRDDQBY3DL 0x021b4828 +#define MMDC_P1_MPDGCTRL0 0x021b483c +#define MMDC_P1_MPDGCTRL1 0x021b4840 +#define MMDC_P1_MPRDDLCTL 0x021b4848 +#define MMDC_P1_MPWRDLCTL 0x021b4850 +#define MMDC_P1_MPMUR0 0x021b48b8 + +#endif /*__ASM_ARCH_MX6_DDR_H__ */
arch/arm/include/asm/arch-mx6/mx6dl-ddr.h new file +71 -0
71 lines not on this page · raw message
arch/arm/include/asm/arch-mx6/mx6q-ddr.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 6/6 i.MX6: Add DDR controller registers
Quoted 16 lines
-----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 6/6] i.MX6: Add DDR controller registersSigned-off-by Eric Nelson <[email protected]>---
arch/arm/include/asm/arch-mx6/mx6-ddr.h| 85
+++++++++++++++++++++++++++++arch/arm/include/asm/arch-mx6/mx6dl-ddr.h| 71
++++++++++++++++++++++++arch/arm/include/asm/arch-mx6/mx6q-ddr.h| 69
+++++++++++++++++++++++
Quoted 4 lines
3 files changed, 225 insertions(+)create mode 100644
arch/arm/include/asm/arch-mx6/mx6-ddr.hcreate mode 100644arch/arm/include/asm/arch-mx6/mx6dl-ddr.hcreate mode 100644arch/arm/include/asm/arch-mx6/mx6q-ddr.h
I did not see any user of these files, what the purpose of this?
arch/arm/include/asm/arch-mx6/mx6-ddr.h line 2
Quoted 10 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +2
-0@@ -0,0 +1,85 @@ +/* +* Copyright (C) 2012 Boundary Devices Inc.
Either 2013 or 2012 - 2013?
Quoted 21 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +21
-0+* +* 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_DDR_H__ +#define __ASM_ARCH_MX6_DDR_H__ + +#ifdef CONFIG_MX6Q
arch/arm/include/asm/arch-mx6/mx6-ddr.h line 31
Quoted 10 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +10
-0+#include "mx6q-ddr.h" +#else +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #include +"mx6dl-ddr.h" +#else +#error "Please select cpu" +#endif /* CONFIG_MX6DL or CONFIG_MX6S */ +#endif /* CONFIG_MX6Q */ + +#define MMDC_P0_MDCTL 0x021b0000
I also prefer to add MX6_ prefix,
Quoted 42 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +42
-0+#define MMDC_P0_MDPDC 0x021b0004 +#define MMDC_P0_MDOTC 0x021b0008 +#define MMDC_P0_MDCFG0 0x021b000c +#define MMDC_P0_MDCFG1 0x021b0010 +#define MMDC_P0_MDCFG2 0x021b0014 +#define MMDC_P0_MDMISC 0x021b0018 +#define MMDC_P0_MDSCR 0x021b001c +#define MMDC_P0_MDREF 0x021b0020 +#define MMDC_P0_MDRWD 0x021b002c +#define MMDC_P0_MDOR 0x021b0030 +#define MMDC_P0_MDASP 0x021b0040 +#define MMDC_P0_MAPSR 0x021b0404 +#define MMDC_P0_MPZQHWCTRL 0x021b0800 +#define MMDC_P0_MPWLDECTRL0 0x021b080c +#define MMDC_P0_MPWLDECTRL1 0x021b0810 +#define MMDC_P0_MPODTCTRL 0x021b0818 +#define MMDC_P0_MPRDDQBY0DL 0x021b081c +#define MMDC_P0_MPRDDQBY1DL 0x021b0820 +#define MMDC_P0_MPRDDQBY2DL 0x021b0824 +#define MMDC_P0_MPRDDQBY3DL 0x021b0828 +#define MMDC_P0_MPDGCTRL0 0x021b083c +#define MMDC_P0_MPDGCTRL1 0x021b0840 +#define MMDC_P0_MPRDDLCTL 0x021b0848 +#define MMDC_P0_MPWRDLCTL 0x021b0850 +#define MMDC_P0_MPMUR0 0x021b08b8 + +#define MMDC_P1_MDCTL 0x021b4000 +#define MMDC_P1_MDPDC 0x021b4004 +#define MMDC_P1_MDOTC 0x021b4008 +#define MMDC_P1_MDCFG0 0x021b400c +#define MMDC_P1_MDCFG1 0x021b4010 +#define MMDC_P1_MDCFG2 0x021b4014 +#define MMDC_P1_MDMISC 0x021b4018 +#define MMDC_P1_MDSCR 0x021b401c +#define MMDC_P1_MDREF 0x021b4020 +#define MMDC_P1_MDRWD 0x021b402c +#define MMDC_P1_MDOR 0x021b4030 +#define MMDC_P1_MDASP 0x021b4040 +#define MMDC_P1_MAPSR 0x021b4404 +#define MMDC_P1_MPZQHWCTRL 0x021b4800 +#define MMDC_P1_MPWLDECTRL0 0x021b480c +#define MMDC_P1_MPWLDECTRL1 0x021b4810
arch/arm/include/asm/arch-mx6/mx6-ddr.h line 83
Quoted 10 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +10
-0+#define MMDC_P1_MPODTCTRL 0x021b4818 +#define MMDC_P1_MPRDDQBY0DL 0x021b481c +#define MMDC_P1_MPRDDQBY1DL 0x021b4820 +#define MMDC_P1_MPRDDQBY2DL 0x021b4824 +#define MMDC_P1_MPRDDQBY3DL 0x021b4828 +#define MMDC_P1_MPDGCTRL0 0x021b483c +#define MMDC_P1_MPDGCTRL1 0x021b4840 +#define MMDC_P1_MPRDDLCTL 0x021b4848 +#define MMDC_P1_MPWRDLCTL 0x021b4850 +#define MMDC_P1_MPMUR0 0x021b48b8
Ditto,
arch/arm/include/asm/arch-mx6/mx6dl-ddr.h line 2
Quoted 11 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +2
-0+ +#endif /*__ASM_ARCH_MX6_DDR_H__ */ arch/arm/include/asm/arch-mx6/mx6dl-ddr.h new file +2
-0@@ -0,0 +1,71 @@ +/* +* Copyright (C) 2012 Boundary Devices Inc.
Either 2013 or 2012 - 2013?
Quoted 59 lines
arch/arm/include/asm/arch-mx6/mx6dl-ddr.h new file +59
-0+* +* 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_MX6DLS_DDR_H__ +#define __ASM_ARCH_MX6DLS_DDR_H__ + +#ifndef CONFIG_MX6DL +#ifndef CONFIG_MX6S +#error "wrong CPU" +#endif +#endif + +#define IOM_DRAM_DQM0 0x020e0470 +#define IOM_DRAM_DQM1 0x020e0474 +#define IOM_DRAM_DQM2 0x020e0478 +#define IOM_DRAM_DQM3 0x020e047c +#define IOM_DRAM_DQM4 0x020e0480 +#define IOM_DRAM_DQM5 0x020e0484 +#define IOM_DRAM_DQM6 0x020e0488 +#define IOM_DRAM_DQM7 0x020e048c + +#define IOM_DRAM_CAS 0x020e0464 +#define IOM_DRAM_RAS 0x020e0490 +#define IOM_DRAM_RESET 0x020e0494 +#define IOM_DRAM_SDCLK_0 0x020e04ac +#define IOM_DRAM_SDCLK_1 0x020e04b0 +#define IOM_DRAM_SDBA2 0x020e04a0 +#define IOM_DRAM_SDCKE0 0x020e04a4 +#define IOM_DRAM_SDCKE1 0x020e04a8 +#define IOM_DRAM_SDODT0 0x020e04b4 +#define IOM_DRAM_SDODT1 0x020e04b8 + +#define IOM_DRAM_SDQS0 0x020e04bc +#define IOM_DRAM_SDQS1 0x020e04c0 +#define IOM_DRAM_SDQS2 0x020e04c4 +#define IOM_DRAM_SDQS3 0x020e04c8 +#define IOM_DRAM_SDQS4 0x020e04cc +#define IOM_DRAM_SDQS5 0x020e04d0 +#define IOM_DRAM_SDQS6 0x020e04d4 +#define IOM_DRAM_SDQS7 0x020e04d8 + +#define IOM_GRP_B0DS 0x020e0764 +#define IOM_GRP_B1DS 0x020e0770 +#define IOM_GRP_B2DS 0x020e0778 +#define IOM_GRP_B3DS 0x020e077c
arch/arm/include/asm/arch-mx6/mx6dl-ddr.h line 69
Quoted 10 lines
arch/arm/include/asm/arch-mx6/mx6dl-ddr.h new file +10
-0+#define IOM_GRP_B4DS 0x020e0780 +#define IOM_GRP_B5DS 0x020e0784 +#define IOM_GRP_B6DS 0x020e078c +#define IOM_GRP_B7DS 0x020e0748 +#define IOM_GRP_ADDDS 0x020e074c +#define IOM_DDRMODE_CTL 0x020e0750 +#define IOM_GRP_DDRPKE 0x020e0754 +#define IOM_GRP_DDRMODE 0x020e0760 +#define IOM_GRP_CTLDS 0x020e076c +#define IOM_GRP_DDR_TYPE 0x020e0774
Ditto,
arch/arm/include/asm/arch-mx6/mx6q-ddr.h line 2
Quoted 11 lines
arch/arm/include/asm/arch-mx6/mx6dl-ddr.h new file +2
-0+ +#endif /*__ASM_ARCH_MX6S_DDR_H__ */ arch/arm/include/asm/arch-mx6/mx6q-ddr.h new file +2
-0@@ -0,0 +1,69 @@ +/* +* Copyright (C) 2012 Boundary Devices Inc.
Either 2013 or 2012 - 2013?
Quoted 57 lines
arch/arm/include/asm/arch-mx6/mx6q-ddr.h new file +57
-0+* +* 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_MX6Q_DDR_H__ +#define __ASM_ARCH_MX6Q_DDR_H__ + +#ifndef CONFIG_MX6Q +#error "wrong CPU" +#endif + +#define IOM_DRAM_DQM0 0x020e05ac +#define IOM_DRAM_DQM1 0x020e05b4 +#define IOM_DRAM_DQM2 0x020e0528 +#define IOM_DRAM_DQM3 0x020e0520 +#define IOM_DRAM_DQM4 0x020e0514 +#define IOM_DRAM_DQM5 0x020e0510 +#define IOM_DRAM_DQM6 0x020e05bc +#define IOM_DRAM_DQM7 0x020e05c4 + +#define IOM_DRAM_CAS 0x020e056c +#define IOM_DRAM_RAS 0x020e0578 +#define IOM_DRAM_RESET 0x020e057c +#define IOM_DRAM_SDCLK_0 0x020e0588 +#define IOM_DRAM_SDCLK_1 0x020e0594 +#define IOM_DRAM_SDBA2 0x020e058c +#define IOM_DRAM_SDCKE0 0x020e0590 +#define IOM_DRAM_SDCKE1 0x020e0598 +#define IOM_DRAM_SDODT0 0x020e059c +#define IOM_DRAM_SDODT1 0x020e05a0 + +#define IOM_DRAM_SDQS0 0x020e05a8 +#define IOM_DRAM_SDQS1 0x020e05b0 +#define IOM_DRAM_SDQS2 0x020e0524 +#define IOM_DRAM_SDQS3 0x020e051c +#define IOM_DRAM_SDQS4 0x020e0518 +#define IOM_DRAM_SDQS5 0x020e050c +#define IOM_DRAM_SDQS6 0x020e05b8 +#define IOM_DRAM_SDQS7 0x020e05c0 + +#define IOM_GRP_B0DS 0x020e0784 +#define IOM_GRP_B1DS 0x020e0788 +#define IOM_GRP_B2DS 0x020e0794 +#define IOM_GRP_B3DS 0x020e079c
arch/arm/include/asm/arch-mx6/mx6q-ddr.h line 67
Quoted 10 lines
arch/arm/include/asm/arch-mx6/mx6q-ddr.h new file +10
-0+#define IOM_GRP_B4DS 0x020e07a0 +#define IOM_GRP_B5DS 0x020e07a4 +#define IOM_GRP_B6DS 0x020e07a8 +#define IOM_GRP_B7DS 0x020e0748 +#define IOM_GRP_ADDDS 0x020e074c +#define IOM_DDRMODE_CTL 0x020e0750 +#define IOM_GRP_DDRPKE 0x020e0758 +#define IOM_GRP_DDRMODE 0x020e0774 +#define IOM_GRP_CTLDS 0x020e078c +#define IOM_GRP_DDR_TYPE 0x020e0798
Ditto,
Quoted 5 lines
arch/arm/include/asm/arch-mx6/mx6q-ddr.h new file +2
-1+ +#endif /*__ASM_ARCH_MX6Q_DDR_H__ */ --1.7.9.5
PATCH 6/6 i.MX6: Add DDR controller registers
Thanks for the review Jason,
Quoted 21 lines · On 02/17/2013 10:16 PM, Liu Hui-R64343 wrote:
Quoted 16 lines
-----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 6/6] i.MX6: Add DDR controller registersSigned-off-by Eric Nelson <[email protected]>---
arch/arm/include/asm/arch-mx6/mx6-ddr.h| 85
+++++++++++++++++++++++++++++arch/arm/include/asm/arch-mx6/mx6dl-ddr.h| 71
++++++++++++++++++++++++arch/arm/include/asm/arch-mx6/mx6q-ddr.h| 69
+++++++++++++++++++++++Quoted 4 lines
3 files changed, 225 insertions(+)create mode 100644
arch/arm/include/asm/arch-mx6/mx6-ddr.hcreate mode 100644arch/arm/include/asm/arch-mx6/mx6dl-ddr.hcreate mode 100644arch/arm/include/asm/arch-mx6/mx6q-ddr.h
Quoted 2 lines
I did not see any user of these files, what the purpose of this?
These will be used in the memory configuration for nitrogen6x, that will build for dual/quad or dual-lite/solo as discussed here:
http://lists.denx.de/pipermail/u-boot/2013-January/145562.html
I'm holding that off waiting for commentary on these to avoid thrashing.
Quoted 13 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h line 2
Quoted 10 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +2
-0@@ -0,0 +1,85 @@ +/* +* Copyright (C) 2012 Boundary Devices Inc. Either 2013 or 2012 - 2013?
Can you tell this patch has been lingering?
Quoted 25 lines
Quoted 25 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +25
-0+* +* 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_DDR_H__ +#define __ASM_ARCH_MX6_DDR_H__ + +#ifdef CONFIG_MX6Q +#include "mx6q-ddr.h" +#else +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #include +"mx6dl-ddr.h"
Quoted 9 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h line 31
Quoted 6 lines
arch/arm/include/asm/arch-mx6/mx6-ddr.h new file +6
-0+#else +#error "Please select cpu" +#endif /* CONFIG_MX6DL or CONFIG_MX6S */ +#endif /* CONFIG_MX6Q */ + +#define MMDC_P0_MDCTL 0x021b0000I also prefer to add
MX6_prefix,
Will fix in V2 along with your "Ditto" comments.
...