diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-17 12:10:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-17 12:10:35 -0400 |
| commit | 27bec5c12757c80f598b704477c1bc6c250bcb4c (patch) | |
| tree | 24920d248e78373128e603dd9a13584eb73be2d7 /drivers | |
| parent | d6b7757e41d22e08f21f58d3fe9183a150582f61 (diff) | |
| parent | 291000894ed4d6257830baba547764b86e335b5c (diff) | |
| download | talos-obmc-uboot-27bec5c12757c80f598b704477c1bc6c250bcb4c.tar.gz talos-obmc-uboot-27bec5c12757c80f598b704477c1bc6c250bcb4c.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi/spi_spl_load.c | 10 | ||||
| -rw-r--r-- | drivers/video/ipu_common.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c index ca56fe9015..46c98a9cee 100644 --- a/drivers/mtd/spi/spi_spl_load.c +++ b/drivers/mtd/spi/spi_spl_load.c @@ -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); } diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index 36d4b23bfe..5676a0f083 100644 --- a/drivers/video/ipu_common.c +++ b/drivers/video/ipu_common.c @@ -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; } |
