Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df8d06ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP3: set the core dpll clk rate in its set_rate function
  omap: iommu: Return IRQ_HANDLED in fault handler when no fault occured
parents 7c21738e 5fd2a84a

arch/arm/mach-omap2/clkt34xx_dpll3m2.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) 
				  sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla,

				  sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla,

				  sdrc_cs0->actim_ctrlb, sdrc_cs0->mr,

				  sdrc_cs0->actim_ctrlb, sdrc_cs0->mr,

				  0, 0, 0, 0);

				  0, 0, 0, 0);

	clk->rate = rate;





	return 0;

	return 0;

}

}

arch/arm/plat-omap/iommu.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -793,6 +793,8 @@ static irqreturn_t iommu_fault_handler(int irq, void *data) 
	clk_enable(obj->clk);

	clk_enable(obj->clk);

	errs = iommu_report_fault(obj, &da);

	errs = iommu_report_fault(obj, &da);

	clk_disable(obj->clk);

	clk_disable(obj->clk);

	if (errs == 0)

		return IRQ_HANDLED;





	/* Fault callback or TLB/PTE Dynamic loading */

	/* Fault callback or TLB/PTE Dynamic loading */

	if (obj->isr && !obj->isr(obj, da, errs, obj->isr_priv))

	if (obj->isr && !obj->isr(obj, da, errs, obj->isr_priv))