leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Browse Source
This commit is contained in:
Tom Rini
2016-05-17 12:10:35 -04:00
parent d6b7757e41 291000894e
commit 27bec5c127
21 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mtd/spi/spi_spl_load.c
View File

@@ -23,6 +23,8 @@
static int spi_load_image_os(struct spi_flash *flash,
struct image_header *header)
{
int err;
/* Read for a header, parse or error out. */
spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS, 0x40,
(void *)header);
@@ -30,7 +32,9 @@ static int spi_load_image_os(struct spi_flash *flash,
if (image_get_magic(header) != IH_MAGIC)
return -1;
spl_parse_image_header(header);
err = spl_parse_image_header(header);
if (err)
return err;
spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS,
spl_image.size, (void *)spl_image.load_addr);
@@ -81,7 +85,9 @@ int spl_spi_load_image(void)
if (err)
return err;
spl_parse_image_header(header);
err = spl_parse_image_header(header);
if (err)
return err;
err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
spl_image.size, (void *)spl_image.load_addr);
}

4
drivers/video/ipu_common.c
View File

@@ -352,7 +352,9 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate)
*/
__raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id));
clk->rate = (u64)(clk->parent->rate * 16) / div;
do_div(parent_rate, div);
clk->rate = parent_rate;
return 0;
}