diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-06-06 13:00:19 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-06-22 14:36:40 +0200 |
commit | d06ef9ba19335001a31d35570b85fd74591c7bd5 (patch) | |
tree | b684d0409230c35773ffba685284518e1fb5f96a /board/toradex/apalis_imx6 | |
parent | 44aa0139363837ecd9ce066eddf8a0ca373ed349 (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/apalis_imx6')
-rw-r--r-- | board/toradex/apalis_imx6/apalis_imx6.c | 6 | ||||
-rw-r--r-- | board/toradex/apalis_imx6/do_fuse.c | 2 | ||||
-rw-r--r-- | board/toradex/apalis_imx6/pf0100.c | 50 |
3 files changed, 29 insertions, 29 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 8519e4e6f9..0d979cd6fc 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -276,7 +276,7 @@ static void setup_iomux_gpio(void) iomux_v3_cfg_t const usb_pads[] = { /* TODO This pin has a dedicated USB power functionality, can we use it? */ /* USBH_EN */ - MX6_PAD_GPIO_0__GPIO1_IO00 | MUX_PAD_CTRL(NO_PAD_CTRL), + MX6_PAD_GPIO_0__GPIO1_IO00 | MUX_PAD_CTRL(NO_PAD_CTRL), # define GPIO_USBH_EN IMX_GPIO_NR(1, 0) /* USB_VBUS_DET */ MX6_PAD_EIM_D28__GPIO3_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL), @@ -451,7 +451,7 @@ int board_eth_init(bd_t *bis) return 0; } printf("using PHY at %d\n", phydev->addr); - ret = fec_probe(bis, -1, base, bus, phydev); + ret = fec_probe(bis, -1, base, bus, phydev); if (ret) { printf("FEC MXC: %s:failed\n", __func__); free(phydev); @@ -731,7 +731,7 @@ static void setup_display(void) imx_setup_hdmi(); /* Turn on LDB0,IPU,IPU DI0 clocks */ reg = __raw_readl(&mxc_ccm->CCGR3); - reg |= MXC_CCM_CCGR3_LDB_DI0_MASK; + reg |= MXC_CCM_CCGR3_LDB_DI0_MASK; writel(reg, &mxc_ccm->CCGR3); /* set LDB0, LDB1 clk select to 011/011 */ diff --git a/board/toradex/apalis_imx6/do_fuse.c b/board/toradex/apalis_imx6/do_fuse.c index 6447e3133f..c3e39839f3 100644 --- a/board/toradex/apalis_imx6/do_fuse.c +++ b/board/toradex/apalis_imx6/do_fuse.c @@ -72,7 +72,7 @@ int do_updt_fuse(cmd_tbl_t *cmdtp, int flag, int argc, " Updating to fast boot mode prevents easy\n" " downgrading to previous BSP versions.\n" "\nReally perform this fuse programming? <y/N>\n"); - if (!confirm_yesno()) + if (!confirm_yesno()) return CMD_RET_FAILURE; } puts("Fusing fast boot mode...\n"); diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c index e289e10a61..e066b986fd 100644 --- a/board/toradex/apalis_imx6/pf0100.c +++ b/board/toradex/apalis_imx6/pf0100.c @@ -38,17 +38,17 @@ unsigned pmic_init(void) uchar devid, revid, val; puts("PMIC: "); - if(!(0 == i2c_set_bus_num(bus) && (0 == i2c_probe(PFUZE100_I2C_ADDR)))) + if (!(0 == i2c_set_bus_num(bus) && (0 == i2c_probe(PFUZE100_I2C_ADDR)))) { puts("i2c bus failed\n"); return 0; } /* get device ident */ - if( i2c_read(PFUZE100_I2C_ADDR, PFUZE100_DEVICEID, 1, &devid, 1) < 0) { + if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_DEVICEID, 1, &devid, 1) < 0) { puts("i2c pmic devid read failed\n"); return 0; } - if( i2c_read(PFUZE100_I2C_ADDR, PFUZE100_REVID, 1, &revid, 1) < 0) { + if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_REVID, 1, &revid, 1) < 0) { puts("i2c pmic revid read failed\n"); return 0; } @@ -58,11 +58,11 @@ unsigned pmic_init(void) { unsigned i,j; - for(i=0; i<16; i++) + for (i=0; i<16; i++) printf("\t%x",i); - for(j=0; j<0x80; ) { + for (j=0; j<0x80;) { printf("\n%2x",j); - for(i=0; i<16; i++) { + for (i=0; i<16; i++) { i2c_read(PFUZE100_I2C_ADDR, j+i, 1, &val, 1); printf("\t%2x", val); } @@ -71,15 +71,15 @@ unsigned pmic_init(void) printf("\nEXT Page 1"); val = PFUZE100_PAGE_REGISTER_PAGE1; - if( i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, + if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, &val, 1)) { puts("i2c write failed\n"); return 0; } - for(j=0x80; j<0x100; ) { + for (j=0x80; j<0x100;) { printf("\n%2x",j); - for(i=0; i<16; i++) { + for (i=0; i<16; i++) { i2c_read(PFUZE100_I2C_ADDR, j+i, 1, &val, 1); printf("\t%2x", val); } @@ -88,15 +88,15 @@ unsigned pmic_init(void) printf("\nEXT Page 2"); val = PFUZE100_PAGE_REGISTER_PAGE2; - if( i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, + if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, &val, 1)) { puts("i2c write failed\n"); return 0; } - for(j=0x80; j<0x100; ) { + for (j=0x80; j<0x100;) { printf("\n%2x",j); - for(i=0; i<16; i++) { + for (i=0; i<16; i++) { i2c_read(PFUZE100_I2C_ADDR, j+i, 1, &val, 1); printf("\t%2x", val); } @@ -107,30 +107,30 @@ unsigned pmic_init(void) #endif /* get device programmed state */ val = PFUZE100_PAGE_REGISTER_PAGE1; - if( i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, &val, 1)) + if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_PAGE_REGISTER, 1, &val, 1)) { puts("i2c write failed\n"); return 0; } - if( i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR1, 1, &val, 1) < 0) { + if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR1, 1, &val, 1) < 0) { puts("i2c fuse_por read failed\n"); return 0; } - if(val & PFUZE100_FUSE_POR_M) + if (val & PFUZE100_FUSE_POR_M) programmed++; - if( i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR2, 1, &val, 1) < 0) { + if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR2, 1, &val, 1) < 0) { puts("i2c fuse_por read failed\n"); return programmed; } - if(val & PFUZE100_FUSE_POR_M) + if (val & PFUZE100_FUSE_POR_M) programmed++; - if( i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR3, 1, &val, 1) < 0) { + if (i2c_read(PFUZE100_I2C_ADDR, PFUZE100_FUSE_POR3, 1, &val, 1) < 0) { puts("i2c fuse_por read failed\n"); return programmed; } - if(val & PFUZE100_FUSE_POR_M) + if (val & PFUZE100_FUSE_POR_M) programmed++; switch (programmed) { @@ -149,7 +149,7 @@ unsigned pmic_init(void) if (programmed != 3) { /* set VGEN1 to 1.2V */ val = PFUZE100_VGEN1_VAL; - if( i2c_write(PFUZE100_I2C_ADDR, PFUZE100_VGEN1CTL, 1, + if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_VGEN1CTL, 1, &val, 1)) { puts("i2c write failed\n"); return programmed; @@ -157,7 +157,7 @@ unsigned pmic_init(void) /* set SWBST to 5.0V */ val = PFUZE100_SWBST_VAL; - if( i2c_write(PFUZE100_I2C_ADDR, PFUZE100_SWBSTCTL, 1, + if (i2c_write(PFUZE100_I2C_ADDR, PFUZE100_SWBSTCTL, 1, &val, 1)) { puts("i2c write failed\n"); } @@ -171,7 +171,7 @@ int pf0100_prog(void) unsigned char val; unsigned char bus = 1; - if(pmic_init() == 3) { + if (pmic_init() == 3) { puts("PMIC already programmed, exiting\n"); return CMD_RET_FAILURE; } @@ -180,17 +180,17 @@ int pf0100_prog(void) ARRAY_SIZE(pmic_prog_pads)); gpio_direction_output(PMIC_PROG_VOLTAGE, 0); - if(!(0 == i2c_set_bus_num(bus) && (0 == i2c_probe(PFUZE100_I2C_ADDR)))) + if (!(0 == i2c_set_bus_num(bus) && (0 == i2c_probe(PFUZE100_I2C_ADDR)))) { puts("i2c bus failed\n"); return CMD_RET_FAILURE; } for (i=0; i<ARRAY_SIZE(pmic_otp_prog); i++) { - switch(pmic_otp_prog[i].cmd) { + switch (pmic_otp_prog[i].cmd) { case pmic_i2c: val = (unsigned char) (pmic_otp_prog[i].value & 0xff); - if( i2c_write(PFUZE100_I2C_ADDR, pmic_otp_prog[i].reg, + if (i2c_write(PFUZE100_I2C_ADDR, pmic_otp_prog[i].reg, 1, &val, 1)) { printf("i2c write failed, reg 0x%2x, value" "0x%2x\n", pmic_otp_prog[i].reg, val); |