mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 03:51:48 +00:00
204241c27c
Fixes the following warnings,
arch/arm/mach-msm/board-trout.c: In function 'trout_init':
arch/arm/mach-msm/board-trout.c:71: error: 'system_rev' undeclared (first use in this function)
arch/arm/mach-msm/board-trout.c:71: error: (Each undeclared identifier is reported only once
arch/arm/mach-msm/board-trout.c:71: error: for each function it appears in.)
and
arch/arm/mach-msm/board-trout-panel.c: In function 'trout_init_panel':
arch/arm/mach-msm/board-trout-panel.c:267: error: 'system_rev' undeclared (first use in this function)
arch/arm/mach-msm/board-trout-panel.c:267: error: (Each undeclared identifier is reported only once
arch/arm/mach-msm/board-trout-panel.c:267: error: for each function it appears in.)
This came in with the following commit 9f97da78bf
which removes asm/system.h
Signed-off-by: Daniel Walker <dwalker@fifo99.com>
cc: David Howells <dhowells@redhat.com>
cc: Bryan Huntsman <bryanh@codeaurora.org>
cc: linux-arm-msm@vger.kernel.org
cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: David Brown <davidb@codeaurora.org>
110 lines
2.5 KiB
C
110 lines
2.5 KiB
C
/* linux/arch/arm/mach-msm/board-trout.c
|
|
*
|
|
* Copyright (C) 2009 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/clkdev.h>
|
|
|
|
#include <asm/system_info.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/setup.h>
|
|
|
|
#include <mach/board.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/msm_iomap.h>
|
|
|
|
#include "devices.h"
|
|
#include "board-trout.h"
|
|
|
|
extern int trout_init_mmc(unsigned int);
|
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
&msm_device_uart3,
|
|
&msm_device_smd,
|
|
&msm_device_nand,
|
|
&msm_device_hsusb,
|
|
&msm_device_i2c,
|
|
};
|
|
|
|
extern struct sys_timer msm_timer;
|
|
|
|
static void __init trout_init_early(void)
|
|
{
|
|
arch_ioremap_caller = __msm_ioremap_caller;
|
|
}
|
|
|
|
static void __init trout_init_irq(void)
|
|
{
|
|
msm_init_irq();
|
|
}
|
|
|
|
static void __init trout_fixup(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 trout_init(void)
|
|
{
|
|
int rc;
|
|
|
|
platform_add_devices(devices, ARRAY_SIZE(devices));
|
|
|
|
#ifdef CONFIG_MMC
|
|
rc = trout_init_mmc(system_rev);
|
|
if (rc)
|
|
printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc);
|
|
#endif
|
|
|
|
}
|
|
|
|
static struct map_desc trout_io_desc[] __initdata = {
|
|
{
|
|
.virtual = TROUT_CPLD_BASE,
|
|
.pfn = __phys_to_pfn(TROUT_CPLD_START),
|
|
.length = TROUT_CPLD_SIZE,
|
|
.type = MT_DEVICE_NONSHARED
|
|
}
|
|
};
|
|
|
|
static void __init trout_map_io(void)
|
|
{
|
|
msm_map_common_io();
|
|
iotable_init(trout_io_desc, ARRAY_SIZE(trout_io_desc));
|
|
|
|
#ifdef CONFIG_MSM_DEBUG_UART3
|
|
/* route UART3 to the "H2W" extended usb connector */
|
|
writeb(0x80, TROUT_CPLD_BASE + 0x00);
|
|
#endif
|
|
|
|
msm_clock_init(msm_clocks_7x01a, msm_num_clocks_7x01a);
|
|
}
|
|
|
|
MACHINE_START(TROUT, "HTC Dream")
|
|
.atag_offset = 0x100,
|
|
.fixup = trout_fixup,
|
|
.map_io = trout_map_io,
|
|
.init_early = trout_init_early,
|
|
.init_irq = trout_init_irq,
|
|
.init_machine = trout_init,
|
|
.timer = &msm_timer,
|
|
MACHINE_END
|