aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-14 16:10:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-14 16:10:04 -0700
commitfbd9163f1c89f9591c03981bdb2d1de7f6e27c11 (patch)
tree1e2ffd70358632403abfe5721390cef4b7a580f3
parent3670901f73e889538a1b8283e8d6eb9962aab410 (diff)
parentb93028c9af807b9474789e6aba34a6135b6cb708 (diff)
downloadlinux-yocto-fbd9163f1c89f9591c03981bdb2d1de7f6e27c11.tar.gz
linux-yocto-fbd9163f1c89f9591c03981bdb2d1de7f6e27c11.tar.bz2
linux-yocto-fbd9163f1c89f9591c03981bdb2d1de7f6e27c11.zip
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
-rw-r--r--drivers/clk/pxa/clk-pxa3xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/pxa/clk-pxa3xx.c b/drivers/clk/pxa/clk-pxa3xx.c
index 4b93a1efb36d..ac03ba49e9d1 100644
--- a/drivers/clk/pxa/clk-pxa3xx.c
+++ b/drivers/clk/pxa/clk-pxa3xx.c
@@ -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, \