diff --git a/patch.sh b/patch.sh index 30d246388ba377120b93c2964f5ad99c510be2dc..42ef6695a14feda0680230b7b46b9f9589afe599 100644 --- a/patch.sh +++ b/patch.sh @@ -97,8 +97,7 @@ dts () { omap_sprz319_erratum () { echo "dir: omap_sprz319_erratum" - # Apply the modified sprz319 erratum for the v3.11-rc2 kernel - #${git} "${DIR}/patches/omap_sprz319_erratum_v2.1/0001-hack-omap-clockk-dpll5-apply-sprz319e-2.1-erratum-co.patch" + ${git} "${DIR}/patches/omap_sprz319_erratum_v2.1/0001-hack-omap-clockk-dpll5-apply-sprz319e-2.1-erratum-co.patch" } fixes () { @@ -142,7 +141,7 @@ drivers #omap_next dts -#omap_sprz319_erratum +omap_sprz319_erratum fixes vivante diff --git a/patches/omap_sprz319_erratum_v2.1/0001-hack-omap-clockk-dpll5-apply-sprz319e-2.1-erratum-co.patch b/patches/omap_sprz319_erratum_v2.1/0001-hack-omap-clockk-dpll5-apply-sprz319e-2.1-erratum-co.patch index 66d16229db84dad28f88ed14a0a79a3da3678024..3d8a7edfafc8f14250301a30e26542c172848ecf 100644 --- a/patches/omap_sprz319_erratum_v2.1/0001-hack-omap-clockk-dpll5-apply-sprz319e-2.1-erratum-co.patch +++ b/patches/omap_sprz319_erratum_v2.1/0001-hack-omap-clockk-dpll5-apply-sprz319e-2.1-erratum-co.patch @@ -1,19 +1,21 @@ -From d6cb5b5fe7c6049a0099b1a722211110f9cdf5da Mon Sep 17 00:00:00 2001 +From 4dfbc0bf635fa6f4c522b525f070c8d3c922b660 Mon Sep 17 00:00:00 2001 From: Teknoman117 <linux.robotdude@gmail.com> Date: Wed, 24 Jul 2013 17:25:46 -0700 Subject: [PATCH] hack: omap: clockk: dpll5: apply sprz319e 2.1 erratum - (compatible with v3.11-rc2) + +Rebased on v3.15-rc1 Signed-off-by: Teknoman117 <linux.robotdude@gmail.com> +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- arch/arm/mach-omap2/cclock3xxx_data.c | 19 +++++++++- arch/arm/mach-omap2/clkt_dpll.c | 68 +++++++++++++++++++++++++++++++++++ - arch/arm/mach-omap2/clock.h | 2 ++ + arch/arm/mach-omap2/clock.h | 3 ++ arch/arm/mach-omap2/clock3xxx.c | 9 ++++- - 4 files changed, 96 insertions(+), 2 deletions(-) + 4 files changed, 97 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c -index 334b767..60fa6bd 100644 +index 8f5121b..39fdf3c 100644 --- a/arch/arm/mach-omap2/cclock3xxx_data.c +++ b/arch/arm/mach-omap2/cclock3xxx_data.c @@ -250,7 +250,9 @@ static struct dpll_data dpll1_dd = { @@ -44,7 +46,7 @@ index 334b767..60fa6bd 100644 static struct clk_hw_omap dpll1_ck_hw = { .hw = { .clk = &dpll1_ck, -@@ -3560,6 +3572,11 @@ int __init omap3xxx_clk_init(void) +@@ -3599,6 +3611,11 @@ int __init omap3xxx_clk_init(void) else dpll4_dd = dpll4_dd_34xx; @@ -57,7 +59,7 @@ index 334b767..60fa6bd 100644 /* * 3505 must be tested before 3517, since 3517 returns true diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c -index 924c230..5100d46 100644 +index 2649ce4..98e8c26 100644 --- a/arch/arm/mach-omap2/clkt_dpll.c +++ b/arch/arm/mach-omap2/clkt_dpll.c @@ -63,6 +63,15 @@ @@ -140,18 +142,19 @@ index 924c230..5100d46 100644 + return target_rate; +} diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h -index 7aa32cd..56a50a7 100644 +index bda767a..7fc9ed5 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h -@@ -358,6 +358,8 @@ unsigned long omap_fixed_divisor_recalc(struct clk_hw *hw, +@@ -257,6 +257,9 @@ void omap2_clk_print_new_rates(const char *hfclkin_ck_name, + u32 omap2_clk_readl(struct clk_hw_omap *clk, void __iomem *reg); + void omap2_clk_writel(u32 val, struct clk_hw_omap *clk, void __iomem *reg); - long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate, - unsigned long *parent_rate); +long omap2_dpll5_round_rate(struct clk_hw *hw, unsigned long target_rate, + unsigned long *parent_rate); - unsigned long omap3_dpll_recalc(struct clk_hw *hw, unsigned long parent_rate); - int omap3_noncore_dpll_enable(struct clk_hw *hw); - void omap3_noncore_dpll_disable(struct clk_hw *hw); ++ + extern u16 cpu_mask; + + extern const struct clkops clkops_omap2_dflt_wait; diff --git a/arch/arm/mach-omap2/clock3xxx.c b/arch/arm/mach-omap2/clock3xxx.c index 0b02b41..8ccf7c6 100644 --- a/arch/arm/mach-omap2/clock3xxx.c @@ -173,5 +176,5 @@ index 0b02b41..8ccf7c6 100644 /* Program dpll5_m2_clk divider for no division */ -- -1.8.4.rc3 +1.9.1 diff --git a/version.sh b/version.sh index 0a0862a2533aa4b9772a2c7f2c0253591fb089e1..d5f46652535695799d2c8a7ae4a9e7e560680f3e 100644 --- a/version.sh +++ b/version.sh @@ -29,7 +29,7 @@ toolchain="gcc_linaro_gnueabihf_4_8" #Kernel/Build KERNEL_REL=3.15 KERNEL_TAG=${KERNEL_REL}-rc1 -BUILD=armv7-devel-r24 +BUILD=armv7-devel-r25 #v3.X-rcX + upto SHA KERNEL_SHA="6ca2a88ad820af56535ed1e6936e0490cb6ec6dc"