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

Commit 5c0dbb8f authored by Daniel Mack's avatar Daniel Mack Committed by Eric Miao
Browse files

[ARM] pxa: rename colibri.c to colibri-pxa270.c 



Namespace cleanup: rename colibri.c to colibri-pxa270.c and change
some names in colibri.h.

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent fa12868e

arch/arm/mach-pxa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ config MACH_EXEDA 
	select PXA27x



config MACH_COLIBRI

	bool "Toradex Colibri PX27x"

	bool "Toradex Colibri PXA270"

	select PXA27x



config MACH_ZYLONITE

arch/arm/mach-pxa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o 
obj-$(CONFIG_MACH_MP900C)	+= mp900.o

obj-$(CONFIG_ARCH_PXA_IDP)	+= idp.o

obj-$(CONFIG_MACH_TRIZEPS4)	+= trizeps4.o

obj-$(CONFIG_MACH_COLIBRI)	+= colibri.o

obj-$(CONFIG_MACH_COLIBRI)	+= colibri-pxa270.o

obj-$(CONFIG_MACH_H5000)	+= h5000.o

obj-$(CONFIG_PXA_SHARP_C7xx)	+= corgi.o sharpsl_pm.o corgi_pm.o

obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o sharpsl_pm.o spitz_pm.o

arch/arm/mach-pxa/colibri.c→arch/arm/mach-pxa/colibri-pxa270.c

+29 −21
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/mach-pxa/colibri.c

 *  linux/arch/arm/mach-pxa/colibri-pxa270.c

 *

 *  Support for Toradex PXA27x based Colibri module

 *  Support for Toradex PXA270 based Colibri module

 *  Daniel Mack <daniel@caiaq.de>

 *

 *  This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/gpio.h>

#include <asm/mach-types.h>

#include <mach/hardware.h>

#include <asm/irq.h>
@@ -35,13 +36,16 @@ 
#include "generic.h"

#include "devices.h"



static unsigned long colibri_pin_config[] __initdata = {

/*

 * GPIO configuration

 */

static mfp_cfg_t colibri_pxa270_pin_config[] __initdata = {

	GPIO78_nCS_2,	/* Ethernet CS */

	GPIO114_GPIO,	/* Ethernet IRQ */

};



/*

 * Flash

 * NOR flash

 */

static struct mtd_partition colibri_partitions[] = {

	{
@@ -70,39 +74,40 @@ static struct physmap_flash_data colibri_flash_data[] = { 
	}

};



static struct resource flash_resource = {

static struct resource colibri_pxa270_flash_resource = {

	.start	= PXA_CS0_PHYS,

	.end	= PXA_CS0_PHYS + SZ_32M - 1,

	.flags	= IORESOURCE_MEM,

};



static struct platform_device flash_device = {

static struct platform_device colibri_pxa270_flash_device = {

	.name	= "physmap-flash",

	.id	= 0,

	.dev 	= {

		.platform_data = colibri_flash_data,

	},

	.resource = &flash_resource,

	.resource = &colibri_pxa270_flash_resource,

	.num_resources = 1,

};



/*

 * DM9000 Ethernet

 */

#if defined(CONFIG_DM9000)

static struct resource dm9000_resources[] = {

	[0] = {

		.start	= COLIBRI_ETH_PHYS,

		.end	= COLIBRI_ETH_PHYS + 3,

		.start	= COLIBRI_PXA270_ETH_PHYS,

		.end	= COLIBRI_PXA270_ETH_PHYS + 3,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= COLIBRI_ETH_PHYS + 4,

		.end	= COLIBRI_ETH_PHYS + 4 + 500,

		.start	= COLIBRI_PXA270_ETH_PHYS + 4,

		.end	= COLIBRI_PXA270_ETH_PHYS + 4 + 500,

		.flags	= IORESOURCE_MEM,

	},

	[2] = {

		.start	= COLIBRI_ETH_IRQ,

		.end	= COLIBRI_ETH_IRQ,

		.start	= COLIBRI_PXA270_ETH_IRQ,

		.end	= COLIBRI_PXA270_ETH_IRQ,

		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_RISING,

	},

};
@@ -113,25 +118,28 @@ static struct platform_device dm9000_device = { 
	.num_resources	= ARRAY_SIZE(dm9000_resources),

	.resource	= dm9000_resources,

};

#endif /* CONFIG_DM9000 */



static struct platform_device *colibri_devices[] __initdata = {

	&flash_device,

static struct platform_device *colibri_pxa270_devices[] __initdata = {

	&colibri_pxa270_flash_device,

#if defined(CONFIG_DM9000)

	&dm9000_device,

#endif

};



static void __init colibri_init(void)

static void __init colibri_pxa270_init(void)

{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pin_config));



	platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices));

	pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa270_pin_config));

	platform_add_devices(ARRAY_AND_SIZE(colibri_pxa270_devices));

}



MACHINE_START(COLIBRI, "Toradex Colibri PXA27x")

MACHINE_START(COLIBRI, "Toradex Colibri PXA270")

	.phys_io	= 0x40000000,

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= COLIBRI_SDRAM_BASE + 0x100,

	.init_machine	= colibri_init,

	.init_machine	= colibri_pxa270_init,

	.map_io		= pxa_map_io,

	.init_irq	= pxa27x_init_irq,

	.timer		= &pxa_timer,

MACHINE_END

arch/arm/mach-pxa/include/mach/colibri.h

+6 −11
Original line number Diff line number Diff line
@@ -2,18 +2,13 @@ 
#define _COLIBRI_H_



/* physical memory regions */

#define COLIBRI_FLASH_PHYS	(PXA_CS0_PHYS)  /* Flash region */

#define COLIBRI_ETH_PHYS	(PXA_CS2_PHYS)  /* Ethernet DM9000 region */

#define COLIBRI_SDRAM_BASE	0xa0000000      /* SDRAM region */



/* virtual memory regions */

#define COLIBRI_DISK_VIRT	0xF0000000	/* Disk On Chip region */



/* size of flash */

#define COLIBRI_FLASH_SIZE	0x02000000	/* Flash size 32 MB */



/* Ethernet Controller Davicom DM9000 */

#define GPIO_DM9000		114

#define COLIBRI_ETH_IRQ	IRQ_GPIO(GPIO_DM9000)

#define COLIBRI_PXA270_FLASH_PHYS	(PXA_CS0_PHYS)  /* Flash region */

#define COLIBRI_PXA270_ETH_PHYS		(PXA_CS2_PHYS)  /* Ethernet */

#define COLIBRI_PXA270_ETH_IRQ_GPIO	114

#define COLIBRI_PXA270_ETH_IRQ		\

	gpio_to_irq(mfp_to_gpio(COLIBRI_PXA270_ETH_IRQ_GPIO))



#endif /* _COLIBRI_H_ */