79d98313e0
In commit be37030274
"ARM: Remove DISCONTIGMEM support", it removed this "node" member
which cased the following compile failure in mach-msm,
linux/arch/arm/mach-msm/board-halibut.c: In function 'halibut_fixup':
linux/arch/arm/mach-msm/board-halibut.c:86: error: 'struct membank' has no member named 'node'
linux/arch/arm/mach-msm/board-halibut.c:86: error: implicit declaration of function 'PHYS_TO_NID'
I've removed the access to the node member which corrects the
compile failure.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
104 lines
2.4 KiB
C
104 lines
2.4 KiB
C
/* linux/arch/arm/mach-msm/board-halibut.c
|
|
*
|
|
* Copyright (C) 2007 Google, Inc.
|
|
* Author: Brian Swetland <swetland@google.com>
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/input.h>
|
|
#include <linux/io.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/flash.h>
|
|
#include <asm/setup.h>
|
|
|
|
#include <mach/irqs.h>
|
|
#include <mach/board.h>
|
|
#include <mach/msm_iomap.h>
|
|
|
|
#include <linux/mtd/nand.h>
|
|
#include <linux/mtd/partitions.h>
|
|
|
|
#include "devices.h"
|
|
|
|
static struct resource smc91x_resources[] = {
|
|
[0] = {
|
|
.start = 0x9C004300,
|
|
.end = 0x9C004400,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = MSM_GPIO_TO_INT(49),
|
|
.end = MSM_GPIO_TO_INT(49),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device smc91x_device = {
|
|
.name = "smc91x",
|
|
.id = 0,
|
|
.num_resources = ARRAY_SIZE(smc91x_resources),
|
|
.resource = smc91x_resources,
|
|
};
|
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
&msm_device_uart3,
|
|
&msm_device_smd,
|
|
&msm_device_nand,
|
|
&msm_device_hsusb,
|
|
&msm_device_i2c,
|
|
&smc91x_device,
|
|
};
|
|
|
|
extern struct sys_timer msm_timer;
|
|
|
|
static void __init halibut_init_irq(void)
|
|
{
|
|
msm_init_irq();
|
|
}
|
|
|
|
static void __init halibut_init(void)
|
|
{
|
|
platform_add_devices(devices, ARRAY_SIZE(devices));
|
|
}
|
|
|
|
static void __init halibut_fixup(struct machine_desc *desc, struct tag *tags,
|
|
char **cmdline, struct meminfo *mi)
|
|
{
|
|
mi->nr_banks=1;
|
|
mi->bank[0].start = PHYS_OFFSET;
|
|
mi->bank[0].size = (101*1024*1024);
|
|
}
|
|
|
|
static void __init halibut_map_io(void)
|
|
{
|
|
msm_map_common_io();
|
|
msm_clock_init(msm_clocks_7x01a, msm_num_clocks_7x01a);
|
|
}
|
|
|
|
MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
|
|
#ifdef CONFIG_MSM_DEBUG_UART
|
|
#endif
|
|
.boot_params = 0x10000100,
|
|
.fixup = halibut_fixup,
|
|
.map_io = halibut_map_io,
|
|
.init_irq = halibut_init_irq,
|
|
.init_machine = halibut_init,
|
|
.timer = &msm_timer,
|
|
MACHINE_END
|