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://github.com/rustyrussell/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-h2.c
diff --git
a/arch/arm/mach-omap1/board-h2.c
b/arch/arm/mach-omap1/board-h2.c
index
cb7fb1a
..
b334b14
100644
(file)
--- a/
arch/arm/mach-omap1/board-h2.c
+++ b/
arch/arm/mach-omap1/board-h2.c
@@
-18,7
+18,7
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
@@
-32,7
+32,6
@@
#include <linux/smc91x.h>
#include <mach/hardware.h>
#include <linux/smc91x.h>
#include <mach/hardware.h>
-#include <asm/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@
-373,12
+372,6
@@
static struct i2c_board_info __initdata h2_i2c_board_info[] = {
},
};
},
};
-static void __init h2_init_irq(void)
-{
- omap1_init_common_hw();
- omap1_init_irq();
-}
-
static struct omap_usb_config h2_usb_config __initdata = {
/* usb1 has a Mini-AB port and external isp1301 transceiver */
.otg = 2,
static struct omap_usb_config h2_usb_config __initdata = {
/* usb1 has a Mini-AB port and external isp1301 transceiver */
.otg = 2,
@@
-454,17
+447,13
@@
static void __init h2_init(void)
h2_mmc_init();
}
h2_mmc_init();
}
-static void __init h2_map_io(void)
-{
- omap1_map_common_io();
-}
-
MACHINE_START(OMAP_H2, "TI-H2")
/* Maintainer: Imre Deak <imre.deak@nokia.com> */
MACHINE_START(OMAP_H2, "TI-H2")
/* Maintainer: Imre Deak <imre.deak@nokia.com> */
- .boot_params = 0x10000100,
- .map_io = h2_map_io,
+ .atag_offset = 0x100,
+ .map_io = omap16xx_map_io,
+ .init_early = omap1_init_early,
.reserve = omap_reserve,
.reserve = omap_reserve,
- .init_irq =
h2
_init_irq,
+ .init_irq =
omap1
_init_irq,
.init_machine = h2_init,
.timer = &omap1_timer,
MACHINE_END
.init_machine = h2_init,
.timer = &omap1_timer,
MACHINE_END