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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa320.c
diff --git
a/arch/arm/mach-pxa/pxa320.c
b/arch/arm/mach-pxa/pxa320.c
index
36f0661
..
8b3d97e
100644
(file)
--- a/
arch/arm/mach-pxa/pxa320.c
+++ b/
arch/arm/mach-pxa/pxa320.c
@@
-17,16
+17,13
@@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
-#include <mach/hardware.h>
-#include <mach/mfp.h>
-#include <mach/pxa3xx-regs.h>
-#include <mach/mfp-pxa320.h>
+#include <mach/pxa320.h>
#include "generic.h"
#include "devices.h"
#include "clock.h"
#include "generic.h"
#include "devices.h"
#include "clock.h"
-static struct
pxa3xx_
mfp_addr_map pxa320_mfp_addr_map[] __initdata = {
+static struct mfp_addr_map pxa320_mfp_addr_map[] __initdata = {
MFP_ADDR_X(GPIO0, GPIO4, 0x0124),
MFP_ADDR_X(GPIO5, GPIO9, 0x028C),
MFP_ADDR_X(GPIO0, GPIO4, 0x0124),
MFP_ADDR_X(GPIO5, GPIO9, 0x028C),
@@
-89,8
+86,8
@@
static struct clk_lookup pxa320_clkregs[] = {
static int __init pxa320_init(void)
{
if (cpu_is_pxa320()) {
static int __init pxa320_init(void)
{
if (cpu_is_pxa320()) {
-
pxa3xx_init_mfp(
);
-
pxa3xx_
mfp_init_addr(pxa320_mfp_addr_map);
+
mfp_init_base(io_p2v(MFPR_BASE)
);
+ mfp_init_addr(pxa320_mfp_addr_map);
clks_register(ARRAY_AND_SIZE(pxa320_clkregs));
}
clks_register(ARRAY_AND_SIZE(pxa320_clkregs));
}