summaryrefslogtreecommitdiff
path: root/board/toradex/colibri_imx7
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2016-06-06 13:00:19 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2016-06-22 14:36:40 +0200
commitd06ef9ba19335001a31d35570b85fd74591c7bd5 (patch)
treeb684d0409230c35773ffba685284518e1fb5f96a /board/toradex/colibri_imx7
parent44aa0139363837ecd9ce066eddf8a0ca373ed349 (diff)
apalis/colibri_imx6/imx7/vf: white space fixes
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'board/toradex/colibri_imx7')
-rw-r--r--board/toradex/colibri_imx7/colibri_imx7.c9
-rw-r--r--board/toradex/colibri_imx7/imximage.cfg2
2 files changed, 5 insertions, 6 deletions
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 22f544b39a..ce9eac4aa7 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -161,7 +161,6 @@ static void setup_gpmi_nand(void)
/*
* NAND_USDHC_BUS_CLK is set in rom
*/
-
set_clk_nand();
/*
@@ -211,7 +210,7 @@ static iomux_v3_cfg_t const backlight_pads[] = {
MX7D_PAD_SD1_WP__GPIO5_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL),
#define RGB_BACKLIGHT_GP IMX_GPIO_NR(5, 1)
/* TODO PWM not GPIO */
- MX7D_PAD_GPIO1_IO08__GPIO1_IO8 | MUX_PAD_CTRL(NO_PULLUP),
+ MX7D_PAD_GPIO1_IO08__GPIO1_IO8 | MUX_PAD_CTRL(NO_PULLUP),
MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21 | MUX_PAD_CTRL(NO_PAD_CTRL),
#define RGB_BACKLIGHTPWM_GP IMX_GPIO_NR(1, 8)
};
@@ -289,7 +288,7 @@ int board_video_skip(void)
}
if (i < ARRAY_SIZE(displays)) {
ret = mxs_lcd_panel_setup(displays[i].mode, displays[i].depth,
- displays[i].lcdif_base_addr);
+ displays[i].lcdif_base_addr);
if (!ret) {
if (displays[i].enable)
displays[i].enable(displays+i);
@@ -565,7 +564,7 @@ static const struct boot_mode board_boot_modes[] = {
/* 4 bit bus width */
{"nand", MAKE_CFGVAL(0x40, 0x34, 0x00, 0x00)},
{"sd1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)},
- {NULL, 0},
+ {NULL, 0},
};
#endif
@@ -589,7 +588,7 @@ int power_init_board(void)
pmic_reg_read(p, RN5T567_LSIVER, &ver);
pmic_reg_read(p, RN5T567_OTPVER, &reg);
- printf("PMIC: RN5T567 LSIVER=0x%x OTPVER=0x%x\n", ver, reg);
+ printf("PMIC: RN5T567 LSIVER=0x%x OTPVER=0x%x\n", ver, reg);
/* set jduge and press timer of N_OE to minimal values */
pmic_reg_read(p, RN5T567_NOETIMSETCNT, &reg);
diff --git a/board/toradex/colibri_imx7/imximage.cfg b/board/toradex/colibri_imx7/imximage.cfg
index 558dbf9b55..5ea961644f 100644
--- a/board/toradex/colibri_imx7/imximage.cfg
+++ b/board/toradex/colibri_imx7/imximage.cfg
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
- * 2015 Toradex AG
+ * 2015-2016 Toradex AG
*
* SPDX-License-Identifier: GPL-2.0+
*