diff options
| author | Fabio Estevam <festevam@gmail.com> | 2016-05-26 16:28:29 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-05-31 21:26:55 +0200 |
| commit | 88c514a56aa523e0357bb08ea59b8e334f22a622 (patch) | |
| tree | 5a62f3163854adee6135b254bacff5c11e794cc4 /board/freescale | |
| parent | 3a2099656f710d9471f1f107624b52ed113f4437 (diff) | |
configs: mx53loco: Update bootloader and kernel versions
Update U-boot to the 2016.05 version and the kernel to 4.6.
U-boot 2016.05 needs the patch c510f2e436008 ("video: ipu_common: fix build
error") that is already in mainline to fix an IPU build error.
We can remove this patch in the future when we switch to U-boot 2016.07.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/imx53loco/patches/uboot/0001-video-ipu_common-fix-build-error.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/board/freescale/imx53loco/patches/uboot/0001-video-ipu_common-fix-build-error.patch b/board/freescale/imx53loco/patches/uboot/0001-video-ipu_common-fix-build-error.patch new file mode 100644 index 000000000..356d0b03a --- /dev/null +++ b/board/freescale/imx53loco/patches/uboot/0001-video-ipu_common-fix-build-error.patch @@ -0,0 +1,47 @@ +From c510f2e436008e55a50b063f2180cb1e63984224 Mon Sep 17 00:00:00 2001 +From: Peng Fan <van.freenix@gmail.com> +Date: Thu, 28 Apr 2016 10:07:53 +0800 +Subject: [PATCH] video: ipu_common: fix build error + +Some toolchains fail to build +"clk->rate = (u64)(clk->parent->rate * 16) / div;" +And the cast usage is wrong. + +Use the following code to fix the issue, +" + do_div(parent_rate, div); + clk->rate = parent_rate; +" + +Reported-by: Peter Robinson <pbrobinson@gmail.com> +Signed-off-by: Peng Fan <van.freenix@gmail.com> +Cc: Stefano Babic <sbabic@denx.de> +Cc: Fabio Estevam <fabio.estevam@nxp.com> +Cc: Tom Rini <trini@konsulko.com> +Cc: Anatolij Gustschin <agust@denx.de> +Cc: Peter Robinson <pbrobinson@gmail.com> +Reviewed-by: Tom Rini <trini@konsulko.com> +Tested-by: Peter Robinson <pbrobinson@gmail.com> +Signed-off-by: Fabio Estevam <festevam@gmail.com> +--- + drivers/video/ipu_common.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c +index 36d4b23..5676a0f 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; + } +-- +1.9.1 + |