summaryrefslogtreecommitdiff
path: root/arch/arm/plat-orion
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2011-05-15 15:32:54 +0400
committerNicolas Pitre <nico@fluxnic.net>2011-05-16 23:49:31 +0400
commit3cff484d4b264ff467a3b45c544cbbbab69f0bf8 (patch)
tree8e647ab4b9549859e74269163da09de8b66168a1 /arch/arm/plat-orion
parent554cdaefd1cf7bb54b209c4e68c7cec87ce442a9 (diff)
downloadlinux-3cff484d4b264ff467a3b45c544cbbbab69f0bf8.tar.xz
ARM: dove: Consolidate mpp code with platform mpp.
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/plat-orion')
-rw-r--r--arch/arm/plat-orion/mpp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c
index 248c02205b66..91553432711d 100644
--- a/arch/arm/plat-orion/mpp.c
+++ b/arch/arm/plat-orion/mpp.c
@@ -31,9 +31,6 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
u32 mpp_ctrl[mpp_nr_regs];
int i;
- if (!variant_mask)
- return;
-
printk(KERN_DEBUG "initial MPP regs:");
for (i = 0; i < mpp_nr_regs; i++) {
mpp_ctrl[i] = readl(mpp_ctrl_addr(i, dev_bus));
@@ -51,7 +48,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
"number (%u)\n", num);
continue;
}
- if (!(*mpp_list & variant_mask)) {
+ if (variant_mask & !(*mpp_list & variant_mask)) {
printk(KERN_WARNING
"orion_mpp_conf: requested MPP%u config "
"unavailable on this hardware\n", num);