Skip to content

Commit

Permalink
[ARM] msm: clean up iomap and devices
Browse files Browse the repository at this point in the history
- Add some more peripherals (sdcc, etc) to the iomap.
- Remove virtual base addresses for devices that we should be passing
  physical addresses to drivers via resources and ioremap()ing.
- don't try to use uarts for ll debug once the mmu is enabled due to
  problems with the peripheral window
- make base addresses void __iomem * and fixup irq.c and timer.c
- Remove common.c and bring in devices.c/devices.h similar to
  the PXA architecture.

Signed-off-by: Brian Swetland <swetland@google.com>
  • Loading branch information
Brian Swetland committed Oct 22, 2008
1 parent b8a16e1 commit bcc0f6a
Show file tree
Hide file tree
Showing 10 changed files with 368 additions and 193 deletions.
4 changes: 1 addition & 3 deletions arch/arm/mach-msm/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
obj-y += io.o idle.o irq.o timer.o dma.o
obj-y += devices.o
obj-y += proc_comm.o

# Common code for board init
obj-y += common.o

obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o

37 changes: 7 additions & 30 deletions arch/arm/mach-msm/board-halibut.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>

#include "devices.h"

static struct resource smc91x_resources[] = {
[0] = {
.start = 0x9C004300,
Expand All @@ -53,31 +55,12 @@ static struct platform_device smc91x_device = {
.resource = smc91x_resources,
};

static void mddi0_panel_power(int on)
{
}

static struct msm_mddi_platform_data msm_mddi0_pdata = {
.panel_power = mddi0_panel_power,
.has_vsync_irq = 0,
};

static struct platform_device msm_mddi0_device = {
.name = "msm_mddi",
.id = 0,
.dev = {
.platform_data = &msm_mddi0_pdata
},
};

static struct platform_device msm_serial0_device = {
.name = "msm_serial",
.id = 0,
};

static struct platform_device *devices[] __initdata = {
&msm_serial0_device,
&msm_mddi0_device,
&msm_device_uart3,
&msm_device_smd,
&msm_device_nand,
&msm_device_hsusb,
&msm_device_i2c,
&smc91x_device,
};

Expand All @@ -91,7 +74,6 @@ static void __init halibut_init_irq(void)
static void __init halibut_init(void)
{
platform_add_devices(devices, ARRAY_SIZE(devices));
msm_add_devices();
}

static void __init halibut_map_io(void)
Expand All @@ -100,11 +82,6 @@ static void __init halibut_map_io(void)
}

MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")

/* UART for LL DEBUG */
.phys_io = MSM_UART1_PHYS,
.io_pg_offst = ((MSM_UART1_BASE) >> 18) & 0xfffc,

.boot_params = 0x10000100,
.map_io = halibut_map_io,
.init_irq = halibut_init_irq,
Expand Down
116 changes: 0 additions & 116 deletions arch/arm/mach-msm/common.c

This file was deleted.

Loading

0 comments on commit bcc0f6a

Please sign in to comment.