|
@@ -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 {
|