git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
board-dm646x-evm.c
diff --git
a/arch/arm/mach-davinci/board-dm646x-evm.c
b/arch/arm/mach-davinci/board-dm646x-evm.c
index
337c45e
..
635bf77
100644
(file)
--- a/
arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/
arch/arm/mach-davinci/board-dm646x-evm.c
@@
-31,6
+31,7
@@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <linux/clk.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <linux/clk.h>
+#include <linux/export.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@
-563,7
+564,7
@@
static int setup_vpif_input_channel_mode(int mux_mode)
int val;
u32 value;
int val;
u32 value;
- if (!vpif_v
sclkdis
_reg || !cpld_client)
+ if (!vpif_v
idclkctl
_reg || !cpld_client)
return -ENXIO;
val = i2c_smbus_read_byte(cpld_client);
return -ENXIO;
val = i2c_smbus_read_byte(cpld_client);
@@
-571,7
+572,7
@@
static int setup_vpif_input_channel_mode(int mux_mode)
return val;
spin_lock_irqsave(&vpif_reg_lock, flags);
return val;
spin_lock_irqsave(&vpif_reg_lock, flags);
- value = __raw_readl(vpif_v
sclkdis
_reg);
+ value = __raw_readl(vpif_v
idclkctl
_reg);
if (mux_mode) {
val &= VPIF_INPUT_TWO_CHANNEL;
value |= VIDCH1CLK;
if (mux_mode) {
val &= VPIF_INPUT_TWO_CHANNEL;
value |= VIDCH1CLK;
@@
-579,7
+580,7
@@
static int setup_vpif_input_channel_mode(int mux_mode)
val |= VPIF_INPUT_ONE_CHANNEL;
value &= ~VIDCH1CLK;
}
val |= VPIF_INPUT_ONE_CHANNEL;
value &= ~VIDCH1CLK;
}
- __raw_writel(value, vpif_v
sclkdis
_reg);
+ __raw_writel(value, vpif_v
idclkctl
_reg);
spin_unlock_irqrestore(&vpif_reg_lock, flags);
err = i2c_smbus_write_byte(cpld_client, val);
spin_unlock_irqrestore(&vpif_reg_lock, flags);
err = i2c_smbus_write_byte(cpld_client, val);