Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc0f6af authored by Brian Swetland's avatar Brian Swetland
Browse files

[ARM] msm: clean up iomap and devices 



- 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: default avatarBrian Swetland <swetland@google.com>
parent b8a16e1f

arch/arm/mach-msm/Makefile

+1 −3
Original line number Diff line number Diff line 
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

arch/arm/mach-msm/board-halibut.c

+7 −30
Original line number Diff line number Diff line
@@ -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,
@@ -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,

};
@@ -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)
@@ -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,

arch/arm/mach-msm/common.c

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-msm/common.c

 *

 * Common setup code for MSM7K Boards

 *

 * 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/io.h>



#include <asm/mach/flash.h>



#include <asm/setup.h>



#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>



#include <mach/msm_iomap.h>



#include <mach/board.h>



struct flash_platform_data msm_nand_data = {

	.parts		= 0,

	.nr_parts	= 0,

};



static struct resource msm_nand_resources[] = {

	[0] = {

		.start	= 7,

		.end	= 7,

		.flags	= IORESOURCE_DMA,

	},

};



static struct platform_device msm_nand_device = {

	.name		= "msm_nand",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(msm_nand_resources),

	.resource	= msm_nand_resources,

	.dev		= {

		.platform_data	= &msm_nand_data,

	},

};



static struct platform_device msm_smd_device = {

	.name	= "msm_smd",

	.id	= -1,

};



static struct resource msm_i2c_resources[] = {

	{

		.start	= MSM_I2C_BASE,

		.end	= MSM_I2C_BASE + MSM_I2C_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_PWB_I2C,

		.end	= INT_PWB_I2C,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device msm_i2c_device = {

	.name		= "msm_i2c",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(msm_i2c_resources),

	.resource	= msm_i2c_resources,

};



static struct resource usb_resources[] = {

	{

		.start	= MSM_HSUSB_PHYS,

		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_USB_HS,

		.end	= INT_USB_HS,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device msm_hsusb_device = {

	.name		= "msm_hsusb",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(usb_resources),

	.resource	= usb_resources,

	.dev		= {

		.coherent_dma_mask	= 0xffffffff,

	},

};



static struct platform_device *devices[] __initdata = {

	&msm_nand_device,

	&msm_smd_device,

	&msm_i2c_device,

	&msm_hsusb_device,

};



void __init msm_add_devices(void)

{

	platform_add_devices(devices, ARRAY_SIZE(devices));

}

arch/arm/mach-msm/devices.c

0 → 100644
+267 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-msm/devices.c

 *

 * Copyright (C) 2008 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/kernel.h>

#include <linux/platform_device.h>



#include <mach/msm_iomap.h>

#include "devices.h"



#include <asm/mach/flash.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>



static struct resource resources_uart1[] = {

	{

		.start	= INT_UART1,

		.end	= INT_UART1,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= MSM_UART1_PHYS,

		.end	= MSM_UART1_PHYS + MSM_UART1_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct resource resources_uart2[] = {

	{

		.start	= INT_UART2,

		.end	= INT_UART2,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= MSM_UART2_PHYS,

		.end	= MSM_UART2_PHYS + MSM_UART2_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct resource resources_uart3[] = {

	{

		.start	= INT_UART3,

		.end	= INT_UART3,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= MSM_UART3_PHYS,

		.end	= MSM_UART3_PHYS + MSM_UART3_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device msm_device_uart1 = {

	.name	= "msm_serial",

	.id	= 0,

	.num_resources	= ARRAY_SIZE(resources_uart1),

	.resource	= resources_uart1,

};



struct platform_device msm_device_uart2 = {

	.name	= "msm_serial",

	.id	= 1,

	.num_resources	= ARRAY_SIZE(resources_uart2),

	.resource	= resources_uart2,

};



struct platform_device msm_device_uart3 = {

	.name	= "msm_serial",

	.id	= 2,

	.num_resources	= ARRAY_SIZE(resources_uart3),

	.resource	= resources_uart3,

};



static struct resource resources_i2c[] = {

	{

		.start	= MSM_I2C_PHYS,

		.end	= MSM_I2C_PHYS + MSM_I2C_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_PWB_I2C,

		.end	= INT_PWB_I2C,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device msm_device_i2c = {

	.name		= "msm_i2c",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(resources_i2c),

	.resource	= resources_i2c,

};



static struct resource resources_hsusb[] = {

	{

		.start	= MSM_HSUSB_PHYS,

		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_USB_HS,

		.end	= INT_USB_HS,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device msm_device_hsusb = {

	.name		= "msm_hsusb",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(resources_hsusb),

	.resource	= resources_hsusb,

	.dev		= {

		.coherent_dma_mask	= 0xffffffff,

	},

};



struct flash_platform_data msm_nand_data = {

	.parts		= NULL,

	.nr_parts	= 0,

};



static struct resource resources_nand[] = {

	[0] = {

		.start	= 7,

		.end	= 7,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device msm_device_nand = {

	.name		= "msm_nand",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(resources_nand),

	.resource	= resources_nand,

	.dev		= {

		.platform_data	= &msm_nand_data,

	},

};



struct platform_device msm_device_smd = {

	.name	= "msm_smd",

	.id	= -1,

};



static struct resource resources_sdc1[] = {

	{

		.start	= MSM_SDC1_PHYS,

		.end	= MSM_SDC1_PHYS + MSM_SDC1_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_SDC1_0,

		.end	= INT_SDC1_1,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= 8,

		.end	= 8,

		.flags	= IORESOURCE_DMA,

	},

};



static struct resource resources_sdc2[] = {

	{

		.start	= MSM_SDC2_PHYS,

		.end	= MSM_SDC2_PHYS + MSM_SDC2_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_SDC2_0,

		.end	= INT_SDC2_1,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= 8,

		.end	= 8,

		.flags	= IORESOURCE_DMA,

	},

};



static struct resource resources_sdc3[] = {

	{

		.start	= MSM_SDC3_PHYS,

		.end	= MSM_SDC3_PHYS + MSM_SDC3_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_SDC3_0,

		.end	= INT_SDC3_1,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= 8,

		.end	= 8,

		.flags	= IORESOURCE_DMA,

	},

};



static struct resource resources_sdc4[] = {

	{

		.start	= MSM_SDC4_PHYS,

		.end	= MSM_SDC4_PHYS + MSM_SDC4_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_SDC4_0,

		.end	= INT_SDC4_1,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= 8,

		.end	= 8,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device msm_device_sdc1 = {

	.name		= "msm_sdcc",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(resources_sdc1),

	.resource	= resources_sdc1,

	.dev		= {

		.coherent_dma_mask	= 0xffffffff,

	},

};



struct platform_device msm_device_sdc2 = {

	.name		= "msm_sdcc",

	.id		= 2,

	.num_resources	= ARRAY_SIZE(resources_sdc2),

	.resource	= resources_sdc2,

	.dev		= {

		.coherent_dma_mask	= 0xffffffff,

	},

};



struct platform_device msm_device_sdc3 = {

	.name		= "msm_sdcc",

	.id		= 3,

	.num_resources	= ARRAY_SIZE(resources_sdc3),

	.resource	= resources_sdc3,

	.dev		= {

		.coherent_dma_mask	= 0xffffffff,

	},

};



struct platform_device msm_device_sdc4 = {

	.name		= "msm_sdcc",

	.id		= 4,

	.num_resources	= ARRAY_SIZE(resources_sdc4),

	.resource	= resources_sdc4,

	.dev		= {

		.coherent_dma_mask	= 0xffffffff,

	},

};

arch/arm/mach-msm/devices.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-msm/devices.h

 *

 * Copyright (C) 2008 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.

 *

 */



#ifndef __ARCH_ARM_MACH_MSM_DEVICES_H

#define __ARCH_ARM_MACH_MSM_DEVICES_H



extern struct platform_device msm_device_uart1;

extern struct platform_device msm_device_uart2;

extern struct platform_device msm_device_uart3;



extern struct platform_device msm_device_sdc1;

extern struct platform_device msm_device_sdc2;

extern struct platform_device msm_device_sdc3;

extern struct platform_device msm_device_sdc4;



extern struct platform_device msm_device_hsusb;



extern struct platform_device msm_device_i2c;



extern struct platform_device msm_device_smd;



extern struct platform_device msm_device_nand;



#endif