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

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

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clock fix from Stephen Boyd:
 "A one-liner for a regression found in the PXA clock driver"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: pxa: pxa3xx: fix CKEN register access
parents 3670901f b93028c9

drivers/clk/pxa/clk-pxa3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ PARENTS(pxa3xx_ac97_bus) = { "ring_osc_60mhz", "ac97" }; 
PARENTS(pxa3xx_sbus) = { "ring_osc_60mhz", "system_bus" };

PARENTS(pxa3xx_smemcbus) = { "ring_osc_60mhz", "smemc" };



#define CKEN_AB(bit) ((CKEN_ ## bit > 31) ? &CKENA : &CKENB)

#define CKEN_AB(bit) ((CKEN_ ## bit > 31) ? &CKENB : &CKENA)

#define PXA3XX_CKEN(dev_id, con_id, parents, mult_lp, div_lp, mult_hp,	\

		    div_hp, bit, is_lp, flags)				\

	PXA_CKEN(dev_id, con_id, bit, parents, mult_lp, div_lp,		\