Commit bada1c5b authored by Olof Johansson's avatar Olof Johansson

Merge branches 'msm/fixes-non-critical' and 'msm/cleanup' into next/dt

Merging in fixes and cleanup as prereqs to simplify merge conflicts.

* msm/fixes-non-critical:
  ARM: msm: Fix early debug uart mapping on some memory configs
  ARM: msm: io: Change the default static iomappings to be shared
  ARM: msm: io: Remove 7x30 iomap region from 7x00
  ARM: msm: Remove call to missing FPGA init on 8660

* msm/cleanup:
  ARM: msm: Remove uncompiled board-msm7x27
  ARM: msm: Remove unused acpuclock-arm11
  ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
  ARM: msm: Fix sparse warnings due to incorrect type
  ARM: msm: Remove unused idle.c
  ARM: msm: clock-pcom: Mark functions static
  ARM: msm: Remove msm_hw_reset_hook
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
obj-y += io.o idle.o timer.o obj-y += io.o timer.o
obj-y += clock.o obj-y += clock.o
obj-$(CONFIG_DEBUG_FS) += clock-debug.o obj-$(CONFIG_DEBUG_FS) += clock-debug.o
obj-$(CONFIG_MSM_VIC) += irq-vic.o obj-$(CONFIG_MSM_VIC) += irq-vic.o
obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o
obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o
obj-$(CONFIG_ARCH_MSM7X30) += dma.o obj-$(CONFIG_ARCH_MSM7X30) += dma.o
obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o
......
This diff is collapsed.
/* arch/arm/mach-msm/acpuclock.h
*
* MSM architecture clock driver header
*
* Copyright (C) 2007 Google, Inc.
* Copyright (c) 2007 QUALCOMM Incorporated
* Author: San Mehat <san@android.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.
*
*/
#ifndef __ARCH_ARM_MACH_MSM_ACPUCLOCK_H
#define __ARCH_ARM_MACH_MSM_ACPUCLOCK_H
int acpuclk_set_rate(unsigned long rate, int for_power_collapse);
unsigned long acpuclk_get_rate(void);
uint32_t acpuclk_get_switch_time(void);
unsigned long acpuclk_wait_for_irq(void);
unsigned long acpuclk_power_collapse(void);
unsigned long acpuclk_get_wfi_rate(void);
#endif
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <mach/board.h> #include <mach/board.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/system.h>
#include "board-mahimahi.h" #include "board-mahimahi.h"
#include "devices.h" #include "devices.h"
......
/*
* Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
* 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/gpio.h>
#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 <linux/power_supply.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>
#ifdef CONFIG_CACHE_L2X0
#include <asm/hardware/cache-l2x0.h>
#endif
#include <mach/vreg.h>
#include <mach/mpp.h>
#include <mach/board.h>
#include <mach/msm_iomap.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include "devices.h"
#include "socinfo.h"
#include "clock.h"
static struct resource smc91x_resources[] = {
[0] = {
.start = 0x9C004300,
.end = 0x9C0043ff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = MSM_GPIO_TO_INT(132),
.end = MSM_GPIO_TO_INT(132),
.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_dmov,
&msm_device_nand,
&smc91x_device,
};
extern struct sys_timer msm_timer;
static void __init msm7x2x_init_irq(void)
{
msm_init_irq();
}
static void __init msm7x2x_init(void)
{
if (socinfo_init() < 0)
BUG();
if (machine_is_msm7x25_ffa() || machine_is_msm7x27_ffa()) {
smc91x_resources[0].start = 0x98000300;
smc91x_resources[0].end = 0x980003ff;
smc91x_resources[1].start = MSM_GPIO_TO_INT(85);
smc91x_resources[1].end = MSM_GPIO_TO_INT(85);
if (gpio_tlmm_config(GPIO_CFG(85, 0,
GPIO_INPUT,
GPIO_PULL_DOWN,
GPIO_2MA),
GPIO_ENABLE)) {
printk(KERN_ERR
"%s: Err: Config GPIO-85 INT\n",
__func__);
}
}
platform_add_devices(devices, ARRAY_SIZE(devices));
}
static void __init msm7x2x_map_io(void)
{
msm_map_common_io();
/* Technically dependent on the SoC but using machine_is
* macros since socinfo is not available this early and there
* are plans to restructure the code which will eliminate the
* need for socinfo.
*/
if (machine_is_msm7x27_surf() || machine_is_msm7x27_ffa())
msm_clock_init(msm_clocks_7x27, msm_num_clocks_7x27);
if (machine_is_msm7x25_surf() || machine_is_msm7x25_ffa())
msm_clock_init(msm_clocks_7x25, msm_num_clocks_7x25);
#ifdef CONFIG_CACHE_L2X0
if (machine_is_msm7x27_surf() || machine_is_msm7x27_ffa()) {
/* 7x27 has 256KB L2 cache:
64Kb/Way and 4-Way Associativity;
R/W latency: 3 cycles;
evmon/parity/share disabled. */
l2x0_init(MSM_L2CC_BASE, 0x00068012, 0xfe000000);
}
#endif
}
static void __init msm7x2x_init_late(void)
{
smd_debugfs_init();
}
MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")
.atag_offset = 0x100,
.map_io = msm7x2x_map_io,
.init_irq = msm7x2x_init_irq,
.init_machine = msm7x2x_init,
.init_late = msm7x2x_init_late,
.timer = &msm_timer,
MACHINE_END
MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")
.atag_offset = 0x100,
.map_io = msm7x2x_map_io,
.init_irq = msm7x2x_init_irq,
.init_machine = msm7x2x_init,
.init_late = msm7x2x_init_late,
.timer = &msm_timer,
MACHINE_END
MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF")
.atag_offset = 0x100,
.map_io = msm7x2x_map_io,
.init_irq = msm7x2x_init_irq,
.init_machine = msm7x2x_init,
.init_late = msm7x2x_init_late,
.timer = &msm_timer,
MACHINE_END
MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA")
.atag_offset = 0x100,
.map_io = msm7x2x_map_io,
.init_irq = msm7x2x_init_irq,
.init_machine = msm7x2x_init,
.init_late = msm7x2x_init_late,
.timer = &msm_timer,
MACHINE_END
...@@ -93,11 +93,6 @@ static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = { ...@@ -93,11 +93,6 @@ static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = {
static void __init msm8x60_dt_init(void) static void __init msm8x60_dt_init(void)
{ {
if (of_machine_is_compatible("qcom,msm8660-surf")) {
printk(KERN_INFO "Init surf UART registers\n");
msm8x60_init_uart12dm();
}
of_platform_populate(NULL, of_default_bus_match_table, of_platform_populate(NULL, of_default_bus_match_table,
msm_auxdata_lookup, NULL); msm_auxdata_lookup, NULL);
} }
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/system.h>
#include <mach/vreg.h> #include <mach/vreg.h>
#include <mach/board.h> #include <mach/board.h>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
/* /*
* glue for the proc_comm interface * glue for the proc_comm interface
*/ */
int pc_clk_enable(unsigned id) static int pc_clk_enable(unsigned id)
{ {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_ENABLE, &id, NULL); int rc = msm_proc_comm(PCOM_CLKCTL_RPC_ENABLE, &id, NULL);
if (rc < 0) if (rc < 0)
...@@ -34,7 +34,7 @@ int pc_clk_enable(unsigned id) ...@@ -34,7 +34,7 @@ int pc_clk_enable(unsigned id)
return (int)id < 0 ? -EINVAL : 0; return (int)id < 0 ? -EINVAL : 0;
} }
void pc_clk_disable(unsigned id) static void pc_clk_disable(unsigned id)
{ {
msm_proc_comm(PCOM_CLKCTL_RPC_DISABLE, &id, NULL); msm_proc_comm(PCOM_CLKCTL_RPC_DISABLE, &id, NULL);
} }
...@@ -54,7 +54,7 @@ int pc_clk_reset(unsigned id, enum clk_reset_action action) ...@@ -54,7 +54,7 @@ int pc_clk_reset(unsigned id, enum clk_reset_action action)
return (int)id < 0 ? -EINVAL : 0; return (int)id < 0 ? -EINVAL : 0;
} }
int pc_clk_set_rate(unsigned id, unsigned rate) static int pc_clk_set_rate(unsigned id, unsigned rate)
{ {
/* The rate _might_ be rounded off to the nearest KHz value by the /* The rate _might_ be rounded off to the nearest KHz value by the
* remote function. So a return value of 0 doesn't necessarily mean * remote function. So a return value of 0 doesn't necessarily mean
...@@ -67,7 +67,7 @@ int pc_clk_set_rate(unsigned id, unsigned rate) ...@@ -67,7 +67,7 @@ int pc_clk_set_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0; return (int)id < 0 ? -EINVAL : 0;
} }
int pc_clk_set_min_rate(unsigned id, unsigned rate) static int pc_clk_set_min_rate(unsigned id, unsigned rate)
{ {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_MIN_RATE, &id, &rate); int rc = msm_proc_comm(PCOM_CLKCTL_RPC_MIN_RATE, &id, &rate);
if (rc < 0) if (rc < 0)
...@@ -76,7 +76,7 @@ int pc_clk_set_min_rate(unsigned id, unsigned rate) ...@@ -76,7 +76,7 @@ int pc_clk_set_min_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0; return (int)id < 0 ? -EINVAL : 0;
} }
int pc_clk_set_max_rate(unsigned id, unsigned rate) static int pc_clk_set_max_rate(unsigned id, unsigned rate)
{ {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_MAX_RATE, &id, &rate); int rc = msm_proc_comm(PCOM_CLKCTL_RPC_MAX_RATE, &id, &rate);
if (rc < 0) if (rc < 0)
...@@ -85,7 +85,7 @@ int pc_clk_set_max_rate(unsigned id, unsigned rate) ...@@ -85,7 +85,7 @@ int pc_clk_set_max_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0; return (int)id < 0 ? -EINVAL : 0;
} }
int pc_clk_set_flags(unsigned id, unsigned flags) static int pc_clk_set_flags(unsigned id, unsigned flags)
{ {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_SET_FLAGS, &id, &flags); int rc = msm_proc_comm(PCOM_CLKCTL_RPC_SET_FLAGS, &id, &flags);
if (rc < 0) if (rc < 0)
...@@ -94,7 +94,7 @@ int pc_clk_set_flags(unsigned id, unsigned flags) ...@@ -94,7 +94,7 @@ int pc_clk_set_flags(unsigned id, unsigned flags)
return (int)id < 0 ? -EINVAL : 0; return (int)id < 0 ? -EINVAL : 0;
} }
unsigned pc_clk_get_rate(unsigned id) static unsigned pc_clk_get_rate(unsigned id)
{ {
if (msm_proc_comm(PCOM_CLKCTL_RPC_RATE, &id, NULL)) if (msm_proc_comm(PCOM_CLKCTL_RPC_RATE, &id, NULL))
return 0; return 0;
...@@ -102,7 +102,7 @@ unsigned pc_clk_get_rate(unsigned id) ...@@ -102,7 +102,7 @@ unsigned pc_clk_get_rate(unsigned id)
return id; return id;
} }
unsigned pc_clk_is_enabled(unsigned id) static unsigned pc_clk_is_enabled(unsigned id)
{ {
if (msm_proc_comm(PCOM_CLKCTL_RPC_ENABLED, &id, NULL)) if (msm_proc_comm(PCOM_CLKCTL_RPC_ENABLED, &id, NULL))
return 0; return 0;
...@@ -110,7 +110,7 @@ unsigned pc_clk_is_enabled(unsigned id) ...@@ -110,7 +110,7 @@ unsigned pc_clk_is_enabled(unsigned id)
return id; return id;
} }
long pc_clk_round_rate(unsigned id, unsigned rate) static long pc_clk_round_rate(unsigned id, unsigned rate)
{ {
/* Not really supported; pc_clk_set_rate() does rounding on it's own. */ /* Not really supported; pc_clk_set_rate() does rounding on it's own. */
......
...@@ -223,8 +223,7 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id) ...@@ -223,8 +223,7 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
PRINT_FLOW("msm_datamover_irq_handler id %d, status %x\n", id, ch_status); PRINT_FLOW("msm_datamover_irq_handler id %d, status %x\n", id, ch_status);
if ((ch_status & DMOV_STATUS_CMD_PTR_RDY) && !list_empty(&ready_commands[id])) { if ((ch_status & DMOV_STATUS_CMD_PTR_RDY) && !list_empty(&ready_commands[id])) {
cmd = list_entry(ready_commands[id].next, typeof(*cmd), list); cmd = list_entry(ready_commands[id].next, typeof(*cmd), list);
list_del(&cmd->list); list_move_tail(&cmd->list, &active_commands[id]);
list_add_tail(&cmd->list, &active_commands[id]);
if (cmd->execute_func) if (cmd->execute_func)
cmd->execute_func(cmd); cmd->execute_func(cmd);
PRINT_FLOW("msm_datamover_irq_handler id %d, start command\n", id); PRINT_FLOW("msm_datamover_irq_handler id %d, start command\n", id);
......
/* arch/arm/mach-msm/idle.c
*
* Idle processing for MSM7K - work around bugs with SWFI.
*
* Copyright (c) 2007 QUALCOMM Incorporated.
* Copyright (C) 2007 Google, Inc.
*
* 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/init.h>
#include <asm/system.h>
static void msm_idle(void)
{
#ifdef CONFIG_MSM7X00A_IDLE
asm volatile (
"mrc p15, 0, r1, c1, c0, 0 /* read current CR */ \n\t"
"bic r0, r1, #(1 << 2) /* clear dcache bit */ \n\t"
"bic r0, r0, #(1 << 12) /* clear icache bit */ \n\t"
"mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */ \n\t"
"mov r0, #0 /* prepare wfi value */ \n\t"
"mcr p15, 0, r0, c7, c10, 0 /* flush the cache */ \n\t"
"mcr p15, 0, r0, c7, c10, 4 /* memory barrier */ \n\t"
"mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */ \n\t"
"mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */ \n\t"
: : : "r0","r1" );
#endif
}
static int __init msm_idle_init(void)
{
arm_pm_idle = msm_idle;
return 0;
}
arch_initcall(msm_idle_init);
...@@ -22,15 +22,6 @@ ...@@ -22,15 +22,6 @@
/* platform device data structures */ /* platform device data structures */
struct msm_acpu_clock_platform_data
{
uint32_t acpu_switch_time_us;
uint32_t max_speed_delta_khz;
uint32_t vdd_switch_time_us;
unsigned long power_collapse_khz;
unsigned long wait_for_irq_khz;
};
struct clk_lookup; struct clk_lookup;
extern struct sys_timer msm_timer; extern struct sys_timer msm_timer;
...@@ -42,7 +33,6 @@ void __init msm_map_common_io(void); ...@@ -42,7 +33,6 @@ void __init msm_map_common_io(void);
void __init msm_init_irq(void); void __init msm_init_irq(void);
void __init msm_init_gpio(void); void __init msm_init_gpio(void);
void __init msm_clock_init(struct clk_lookup *clock_tbl, unsigned num_clocks); void __init msm_clock_init(struct clk_lookup *clock_tbl, unsigned num_clocks);
void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *);
int __init msm_add_sdcc(unsigned int controller, int __init msm_add_sdcc(unsigned int controller,
struct msm_mmc_platform_data *plat, struct msm_mmc_platform_data *plat,
unsigned int stat_irq, unsigned long stat_irq_flags); unsigned int stat_irq, unsigned long stat_irq_flags);
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#define MSM8960_TMR0_SIZE SZ_4K #define MSM8960_TMR0_SIZE SZ_4K
#ifdef CONFIG_DEBUG_MSM8960_UART #ifdef CONFIG_DEBUG_MSM8960_UART
#define MSM_DEBUG_UART_BASE 0xE1040000 #define MSM_DEBUG_UART_BASE 0xF0040000
#define MSM_DEBUG_UART_PHYS 0x16440000 #define MSM_DEBUG_UART_PHYS 0x16440000
#endif #endif
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
#define MSM8X60_TMR0_SIZE SZ_4K #define MSM8X60_TMR0_SIZE SZ_4K
#ifdef CONFIG_DEBUG_MSM8660_UART #ifdef CONFIG_DEBUG_MSM8660_UART
#define MSM_DEBUG_UART_BASE 0xE1040000 #define MSM_DEBUG_UART_BASE 0xF0040000
#define MSM_DEBUG_UART_PHYS 0x19C40000 #define MSM_DEBUG_UART_PHYS 0x19C40000
#endif #endif
......
/* arch/arm/mach-msm/include/mach/system.h
*
* Copyright (C) 2007 Google, Inc.
*
* 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.
*
*/
/* low level hardware reset hook -- for example, hitting the
* PSHOLD line on the PMIC to hard reset the system
*/
extern void (*msm_hw_reset_hook)(void);
...@@ -29,30 +29,30 @@ ...@@ -29,30 +29,30 @@
#include <mach/board.h> #include <mach/board.h>
#define MSM_CHIP_DEVICE(name, chip) { \ #define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) { \
.virtual = (unsigned long) MSM_##name##_BASE, \ .virtual = (unsigned long) MSM_##name##_BASE, \
.pfn = __phys_to_pfn(chip##_##name##_PHYS), \ .pfn = __phys_to_pfn(chip##_##name##_PHYS), \
.length = chip##_##name##_SIZE, \ .length = chip##_##name##_SIZE, \
.type = MT_DEVICE_NONSHARED, \ .type = mem_type, \
} }
#define MSM_DEVICE_TYPE(name, mem_type) \
MSM_CHIP_DEVICE_TYPE(name, MSM, mem_type)
#define MSM_CHIP_DEVICE(name, chip) \
MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE)
#define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM) #define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)
#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \ #if defined(CONFIG_ARCH_MSM7X00A)
|| defined(CONFIG_ARCH_MSM7X25)
static struct map_desc msm_io_desc[] __initdata = { static struct map_desc msm_io_desc[] __initdata = {
MSM_DEVICE(VIC), MSM_DEVICE_TYPE(VIC, MT_DEVICE_NONSHARED),
MSM_CHIP_DEVICE(CSR, MSM7X00), MSM_CHIP_DEVICE_TYPE(CSR, MSM7X00, MT_DEVICE_NONSHARED),
MSM_DEVICE(DMOV), MSM_DEVICE_TYPE(DMOV, MT_DEVICE_NONSHARED),
MSM_CHIP_DEVICE(GPIO1, MSM7X00), MSM_CHIP_DEVICE_TYPE(GPIO1, MSM7X00, MT_DEVICE_NONSHARED),
MSM_CHIP_DEVICE(GPIO2, MSM7X00), MSM_CHIP_DEVICE_TYPE(GPIO2, MSM7X00, MT_DEVICE_NONSHARED),
MSM_DEVICE(CLK_CTL), MSM_DEVICE_TYPE(CLK_CTL, MT_DEVICE_NONSHARED),
#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ #if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
defined(CONFIG_DEBUG_MSM_UART3) defined(CONFIG_DEBUG_MSM_UART3)
MSM_DEVICE(DEBUG_UART), MSM_DEVICE_TYPE(DEBUG_UART, MT_DEVICE_NONSHARED),
#endif
#ifdef CONFIG_ARCH_MSM7X30
MSM_DEVICE(GCC),
#endif #endif
{ {
.virtual = (unsigned long) MSM_SHARED_RAM_BASE, .virtual = (unsigned long) MSM_SHARED_RAM_BASE,
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <mach/system.h>
#include "proc_comm.h" #include "proc_comm.h"
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <mach/msm_smd.h> #include <mach/msm_smd.h>
#include <mach/system.h>
#include "smd_private.h" #include "smd_private.h"
#include "proc_comm.h" #include "proc_comm.h"
...@@ -39,8 +38,6 @@ ...@@ -39,8 +38,6 @@
#define CONFIG_QDSP6 1 #define CONFIG_QDSP6 1
#endif #endif
void (*msm_hw_reset_hook)(void);
#define MODULE_NAME "msm_smd" #define MODULE_NAME "msm_smd"
enum { enum {
...@@ -101,10 +98,6 @@ static void handle_modem_crash(void) ...@@ -101,10 +98,6 @@ static void handle_modem_crash(void)
pr_err("ARM9 has CRASHED\n"); pr_err("ARM9 has CRASHED\n");
smd_diag(); smd_diag();
/* hard reboot if possible */
if (msm_hw_reset_hook)
msm_hw_reset_hook();
/* in this case the modem or watchdog should reboot us */ /* in this case the modem or watchdog should reboot us */
for (;;) for (;;)
; ;
......
...@@ -101,7 +101,7 @@ static struct clock_event_device msm_clockevent = { ...@@ -101,7 +101,7 @@ static struct clock_event_device msm_clockevent = {
static union { static union {
struct clock_event_device *evt; struct clock_event_device *evt;
struct clock_event_device __percpu **percpu_evt; struct clock_event_device * __percpu *percpu_evt;
} msm_evt; } msm_evt;
static void __iomem *source_base; static void __iomem *source_base;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment