From 40ea2d644a17a6d1d9049fa865342f1f1495ea76 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Tue, 19 May 2009 16:24:56 +0100 Subject: [PATCH] Clean up kernel recipes and bump to the current GIT HEAD. --- recipes/linux/omap3-pandora-kernel/defconfig | 26 +++++++- .../mru-add-clk-get-parent.diff | 64 ------------------- .../omap3-pandora-kernel_2.6.27-pandora.bb | 8 ++- 3 files changed, 28 insertions(+), 70 deletions(-) delete mode 100755 recipes/linux/omap3-pandora-kernel/mru-add-clk-get-parent.diff diff --git a/recipes/linux/omap3-pandora-kernel/defconfig b/recipes/linux/omap3-pandora-kernel/defconfig index d8f2cea..3b47920 100755 --- a/recipes/linux/omap3-pandora-kernel/defconfig +++ b/recipes/linux/omap3-pandora-kernel/defconfig @@ -1211,10 +1211,30 @@ CONFIG_FB_CFB_IMAGEBLIT=y # # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set -CONFIG_FB_OMAP=y -# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set -CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4 +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_DSS_VRAM_SIZE=4 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +# CONFIG_OMAP2_DSS_SDI is not set +# CONFIG_OMAP2_DSS_DSI is not set +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 + +# +# OMAP2/3 Display Device Drivers +# +# CONFIG_PANEL_GENERIC is not set +# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set +# CONFIG_PANEL_SHARP_LS037V7DW01 is not set +# CONFIG_PANEL_N800 is not set +# CONFIG_CTRL_BLIZZARD is not set +CONFIG_PANEL_TPO_TD043MTEA1=y +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set +CONFIG_FB_OMAP2_NUM_FBS=3 CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y diff --git a/recipes/linux/omap3-pandora-kernel/mru-add-clk-get-parent.diff b/recipes/linux/omap3-pandora-kernel/mru-add-clk-get-parent.diff deleted file mode 100755 index 64944a5..0000000 --- a/recipes/linux/omap3-pandora-kernel/mru-add-clk-get-parent.diff +++ /dev/null @@ -1,64 +0,0 @@ -From: Mans Rullgard -Date: Fri, 29 Aug 2008 01:51:36 +0000 (+0100) -Subject: OMAP: Add clk_get_parent() for OMAP2/3 -X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=08d1f1947a5a970b2fe6e4dfeeb70286b9379056 - -OMAP: Add clk_get_parent() for OMAP2/3 - -This makes clk_get_parent() work on OMAP2/3. - -Signed-off-by: Mans Rullgard ---- - -diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c -index 5f48e14..aae0d2e 100644 ---- a/arch/arm/mach-omap2/clock.c -+++ b/arch/arm/mach-omap2/clock.c -@@ -831,6 +831,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) - return 0; - } - -+struct clk *omap2_clk_get_parent(struct clk *clk) -+{ -+ return clk->parent; -+} -+ - /* DPLL rate rounding code */ - - /** -diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h -index 3fa2e26..2916879 100644 ---- a/arch/arm/mach-omap2/clock.h -+++ b/arch/arm/mach-omap2/clock.h -@@ -29,6 +29,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate); - int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent); - int omap2_dpll_set_rate_tolerance(struct clk *clk, unsigned int tolerance); - long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate); -+struct clk *omap2_clk_get_parent(struct clk *clk); - - #ifdef CONFIG_OMAP_RESET_CLOCKS - void omap2_clk_disable_unused(struct clk *clk); -diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c -index c26d9d8..f91bd57 100644 ---- a/arch/arm/mach-omap2/clock24xx.c -+++ b/arch/arm/mach-omap2/clock24xx.c -@@ -423,6 +423,7 @@ static struct clk_functions omap2_clk_functions = { - .clk_round_rate = omap2_clk_round_rate, - .clk_set_rate = omap2_clk_set_rate, - .clk_set_parent = omap2_clk_set_parent, -+ .clk_get_parent = omap2_clk_get_parent, - .clk_disable_unused = omap2_clk_disable_unused, - #ifdef CONFIG_CPU_FREQ - .clk_init_cpufreq_table = omap2_clk_init_cpufreq_table, -diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c -index 152d095..2196edd 100644 ---- a/arch/arm/mach-omap2/clock34xx.c -+++ b/arch/arm/mach-omap2/clock34xx.c -@@ -606,6 +606,7 @@ static struct clk_functions omap2_clk_functions = { - .clk_round_rate = omap2_clk_round_rate, - .clk_set_rate = omap2_clk_set_rate, - .clk_set_parent = omap2_clk_set_parent, -+ .clk_get_parent = omap2_clk_get_parent, - .clk_disable_unused = omap2_clk_disable_unused, - }; - diff --git a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb index d308842..4d1ff5d 100755 --- a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb +++ b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb @@ -5,8 +5,11 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap3-pandora" +#GIT HEAD WITH DSS2 +SRCREV = 988a5dbcb012af46fb413d7a4105be81481076f0 + #GIT HEAD 8th March -SRCREV = "6659d29395831bf5d6e589b288bfc3faf2096d2f" +#SRCREV = "6659d29395831bf5d6e589b288bfc3faf2096d2f" #GIT HEAD 7th Feb #SRCREV = "98000fc8f72fd9d35ae2fea0528e756febbe0916" @@ -18,7 +21,7 @@ SRCREV = "6659d29395831bf5d6e589b288bfc3faf2096d2f" #SRCREV = "fdb85aeee5f1993265bf46d4dfeae32a3fb8b886" PV = "2.6.27-pandora+${PR}+git${SRCREV}" -PR = "r1.6" +PR = "r1.8" SRC_URI = " \ git://openpandora.org/pandora-kernel.git;protocol=git;branch=pandora-27-omap1 \ @@ -35,7 +38,6 @@ SRC_URI = " \ file://mru-fix-timings.diff;patch=1 \ file://mru-fix-display-panning.diff;patch=1 \ file://mru-make-dpll4-m4-ck-programmable.diff;patch=1 \ - file://mru-add-clk-get-parent.diff;patch=1 \ file://mru-improve-pixclock-config.diff;patch=1 \ file://mru-make-video-timings-selectable.diff;patch=1 \ file://mru-enable-overlay-optimalization.diff;patch=1 \ -- 2.39.2