diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-08-03 11:21:36 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-08-03 11:21:36 +0000 |
| commit | 5e4da782189840fb87bf4ff2ff689a7278cd75c1 (patch) | |
| tree | f707818d7bb3e96031876c651411feb12fa632f9 /meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff | |
| parent | 6dda6e3c3e1413e08364fdca7496435a894abe5f (diff) | |
| download | openembedded-core-5e4da782189840fb87bf4ff2ff689a7278cd75c1.tar.gz openembedded-core-5e4da782189840fb87bf4ff2ff689a7278cd75c1.tar.bz2 openembedded-core-5e4da782189840fb87bf4ff2ff689a7278cd75c1.zip | |
linux-omap2-git: Sync with OE.dev, add fixes to compile correctly with gcc 4.3.1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5009 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff')
| -rw-r--r-- | meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff b/meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff new file mode 100644 index 0000000000..79871a7208 --- /dev/null +++ b/meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff @@ -0,0 +1,31 @@ +From: Mans Rullgard <mans@mansr.com> +Date: Mon, 7 Jul 2008 23:59:08 +0000 (+0100) +Subject: omapfb: ensure fck/lcd < 173MHz +X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=0523ece1bad659c48c66aea364d83f7490e7e5ae + +omapfb: ensure fck/lcd < 173MHz +--- + +diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c +index c17371c..85d6cad 100644 +--- a/drivers/video/omap/dispc.c ++++ b/drivers/video/omap/dispc.c +@@ -738,14 +738,16 @@ static void setup_color_conv_coef(void) + MOD_REG_FLD(at2_reg, (1 << 11), ct->full_range); + } + ++#define MAX_FCK_LCD 173000000 ++ + static void calc_ck_div(int is_tft, int pck, int *lck_div, int *pck_div) + { + unsigned long fck, lck; + +- *lck_div = 1; + pck = max(1, pck); + fck = clk_get_rate(dispc.dss1_fck); +- lck = fck; ++ *lck_div = (fck + MAX_FCK_LCD - 1) / MAX_FCK_LCD; ++ lck = fck / *lck_div; + *pck_div = (lck + pck - 1) / pck; + if (is_tft) + *pck_div = max(2, *pck_div); |