![Linus Torvalds](/assets/img/avatar_default.png)
Pull ARM updates from Russell King: - Major clean-up of the L2 cache support code. The existing mess was becoming rather unmaintainable through all the additions that others have done over time. This turns it into a much nicer structure, and implements a few performance improvements as well. - Clean up some of the CP15 control register tweaks for alignment support, moving some code and data into alignment.c - DMA properties for ARM, from Santosh and reviewed by DT people. This adds DT properties to specify bus translations we can't discover automatically, and to indicate whether devices are coherent. - Hibernation support for ARM - Make ftrace work with read-only text in modules - add suspend support for PJ4B CPUs - rework interrupt masking for undefined instruction handling, which allows us to enable interrupts earlier in the handling of these exceptions. - support for big endian page tables - fix stacktrace support to exclude stacktrace functions from the trace, and add save_stack_trace_regs() implementation so that kprobes can record stack traces. - Add support for the Cortex-A17 CPU. - Remove last vestiges of ARM710 support. - Removal of ARM "meminfo" structure, finally converting us solely to memblock to handle the early memory initialisation. * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (142 commits) ARM: ensure C page table setup code follows assembly code (part II) ARM: ensure C page table setup code follows assembly code ARM: consolidate last remaining open-coded alignment trap enable ARM: remove global cr_no_alignment ARM: remove CPU_CP15 conditional from alignment.c ARM: remove unused adjust_cr() function ARM: move "noalign" command line option to alignment.c ARM: provide common method to clear bits in CPU control register ARM: 8025/1: Get rid of meminfo ARM: 8060/1: mm: allow sub-architectures to override PCI I/O memory type ARM: 8066/1: correction for ARM patch 8031/2 ARM: 8049/1: ftrace/add save_stack_trace_regs() implementation ARM: 8065/1: remove last use of CONFIG_CPU_ARM710 ARM: 8062/1: Modify ldrt fixup handler to re-execute the userspace instruction ARM: 8047/1: rwsem: use asm-generic rwsem implementation ARM: l2c: trial at enabling some Cortex-A9 optimisations ARM: l2c: add warnings for stuff modifying aux_ctrl register values ARM: l2c: print a warning with L2C-310 caches if the cache size is modified ARM: l2c: remove old .set_debug method ARM: l2c: kill L2X0_AUX_CTRL_MASK before anyone else makes use of this ...
112 lines
2.5 KiB
C
112 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.
|
|
*
|
|
*/
|
|
#define pr_fmt(fmt) "%s: " fmt, __func__
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/memblock.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/hardware.h>
|
|
#include <mach/msm_iomap.h>
|
|
|
|
#include "devices.h"
|
|
#include "board-trout.h"
|
|
#include "common.h"
|
|
|
|
extern int trout_init_mmc(unsigned int);
|
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
&msm_clock_7x01a,
|
|
&msm_device_gpio_7201,
|
|
&msm_device_uart3,
|
|
&msm_device_smd,
|
|
&msm_device_nand,
|
|
&msm_device_hsusb,
|
|
&msm_device_i2c,
|
|
};
|
|
|
|
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)
|
|
{
|
|
memblock_add(PHYS_OFFSET, 101*SZ_1M);
|
|
}
|
|
|
|
static void __init trout_init(void)
|
|
{
|
|
int rc;
|
|
|
|
platform_add_devices(devices, ARRAY_SIZE(devices));
|
|
|
|
if (IS_ENABLED(CONFIG_MMC)) {
|
|
rc = trout_init_mmc(system_rev);
|
|
if (rc)
|
|
pr_crit("MMC init failure (%d)\n", rc);
|
|
}
|
|
}
|
|
|
|
static struct map_desc trout_io_desc[] __initdata = {
|
|
{
|
|
.virtual = (unsigned long)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
|
|
}
|
|
|
|
static void __init trout_init_late(void)
|
|
{
|
|
smd_debugfs_init();
|
|
}
|
|
|
|
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,
|
|
.init_late = trout_init_late,
|
|
.init_time = msm7x01_timer_init,
|
|
MACHINE_END
|