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

Commit a3172e54 authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao
Browse files

ARM: pxa: Rename Colibri evalboard 



Rename colibri-pxa270-evalboard to colibri-evalboard as this board is used with
all Colibri modules.

Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Acked-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 072e1ae7

arch/arm/mach-pxa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ config MACH_COLIBRI320 
	select PXA3xx

	select CPU_PXA320



config MACH_COLIBRI_PXA270_EVALBOARD

config MACH_COLIBRI_EVALBOARD

	bool "Toradex Colibri Evaluation Carrier Board support"

	depends on MACH_COLIBRI || MACH_COLIBRI300 || MACH_COLIBRI320

arch/arm/mach-pxa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o 
obj-$(CONFIG_MACH_PCM027)		+= pcm027.o

obj-$(CONFIG_MACH_PCM990_BASEBOARD)	+= pcm990-baseboard.o

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

obj-$(CONFIG_MACH_COLIBRI_PXA270_EVALBOARD)	+= colibri-pxa270-evalboard.o

obj-$(CONFIG_MACH_COLIBRI_EVALBOARD)	+= colibri-evalboard.o

obj-$(CONFIG_MACH_COLIBRI_PXA270_INCOME)	+= colibri-pxa270-income.o

obj-$(CONFIG_MACH_COLIBRI300)	+= colibri-pxa3xx.o colibri-pxa300.o

obj-$(CONFIG_MACH_COLIBRI320)	+= colibri-pxa3xx.o colibri-pxa320.o

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

+24 −24
Original line number Diff line number Diff line 
/*

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

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

 *

 *  Support for Toradex PXA270 based Colibri Evaluation Carrier Board

 *  Support for Toradex Colibri Evaluation Carrier Board

 *  Daniel Mack <daniel@caiaq.de>

 *  Marek Vasut <marek.vasut@gmail.com>

 *
@@ -36,86 +36,86 @@ 
 * SD/MMC card controller

 ******************************************************************************/

#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)

static struct pxamci_platform_data colibri_pxa270_mci_platform_data = {

static struct pxamci_platform_data colibri_mci_platform_data = {

	.ocr_mask		= MMC_VDD_32_33 | MMC_VDD_33_34,

	.gpio_power		= -1,

	.gpio_card_ro		= -1,

	.detect_delay_ms	= 200,

};



static void __init colibri_pxa270_mmc_init(void)

static void __init colibri_mmc_init(void)

{

	if (machine_is_colibri())	/* PXA270 Colibri */

		colibri_pxa270_mci_platform_data.gpio_card_detect =

		colibri_mci_platform_data.gpio_card_detect =

			GPIO0_COLIBRI_PXA270_SD_DETECT;

	if (machine_is_colibri300())	/* PXA300 Colibri */

		colibri_pxa270_mci_platform_data.gpio_card_detect =

		colibri_mci_platform_data.gpio_card_detect =

			GPIO39_COLIBRI_PXA300_SD_DETECT;

	else				/* PXA320 Colibri */

		colibri_pxa270_mci_platform_data.gpio_card_detect =

		colibri_mci_platform_data.gpio_card_detect =

			GPIO28_COLIBRI_PXA320_SD_DETECT;



	pxa_set_mci_info(&colibri_pxa270_mci_platform_data);

	pxa_set_mci_info(&colibri_mci_platform_data);

}

#else

static inline void colibri_pxa270_mmc_init(void) {}

static inline void colibri_mmc_init(void) {}

#endif



/******************************************************************************

 * USB Host

 ******************************************************************************/

#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

static int colibri_pxa270_ohci_init(struct device *dev)

static int colibri_ohci_init(struct device *dev)

{

	UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;

	return 0;

}



static struct pxaohci_platform_data colibri_pxa270_ohci_info = {

static struct pxaohci_platform_data colibri_ohci_info = {

	.port_mode	= PMM_PERPORT_MODE,

	.flags		= ENABLE_PORT1 |

			  POWER_CONTROL_LOW | POWER_SENSE_LOW,

	.init		= colibri_pxa270_ohci_init,

	.init		= colibri_ohci_init,

};



static void __init colibri_pxa270_uhc_init(void)

static void __init colibri_uhc_init(void)

{

	/* Colibri PXA270 has two usb ports, TBA for 320 */

	if (machine_is_colibri())

		colibri_pxa270_ohci_info.flags	|= ENABLE_PORT2;

		colibri_ohci_info.flags	|= ENABLE_PORT2;



	pxa_set_ohci_info(&colibri_pxa270_ohci_info);

	pxa_set_ohci_info(&colibri_ohci_info);

}

#else

static inline void colibri_pxa270_uhc_init(void) {}

static inline void colibri_uhc_init(void) {}

#endif



/******************************************************************************

 * I2C RTC

 ******************************************************************************/

#if defined(CONFIG_RTC_DRV_DS1307) || defined(CONFIG_RTC_DRV_DS1307_MODULE)

static struct i2c_board_info __initdata colibri_pxa270_i2c_devs[] = {

static struct i2c_board_info __initdata colibri_i2c_devs[] = {

	{

		I2C_BOARD_INFO("m41t00", 0x68),

	},

};



static void __init colibri_pxa270_rtc_init(void)

static void __init colibri_rtc_init(void)

{

	pxa_set_i2c_info(NULL);

	i2c_register_board_info(0, ARRAY_AND_SIZE(colibri_pxa270_i2c_devs));

	i2c_register_board_info(0, ARRAY_AND_SIZE(colibri_i2c_devs));

}

#else

static inline void colibri_pxa270_rtc_init(void) {}

static inline void colibri_rtc_init(void) {}

#endif



void __init colibri_pxa270_evalboard_init(void)

void __init colibri_evalboard_init(void)

{

	pxa_set_ffuart_info(NULL);

	pxa_set_btuart_info(NULL);

	pxa_set_stuart_info(NULL);



	colibri_pxa270_mmc_init();

	colibri_pxa270_uhc_init();

	colibri_pxa270_rtc_init();

	colibri_mmc_init();

	colibri_uhc_init();

	colibri_rtc_init();

}

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

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
/******************************************************************************

 * Evaluation board MFP

 ******************************************************************************/

#ifdef	 CONFIG_MACH_COLIBRI_PXA270_EVALBOARD

#ifdef	 CONFIG_MACH_COLIBRI_EVALBOARD

static mfp_cfg_t colibri_pxa270_evalboard_pin_config[] __initdata = {

	/* MMC */

	GPIO32_MMC_CLK,
@@ -281,10 +281,10 @@ static void __init colibri_pxa270_init(void) 
	colibri_pxa270_tsc_init();



	switch (colibri_pxa270_baseboard) {

	case COLIBRI_PXA270_EVALBOARD:

	case COLIBRI_EVALBOARD:

		pxa2xx_mfp_config(ARRAY_AND_SIZE(

			colibri_pxa270_evalboard_pin_config));

		colibri_pxa270_evalboard_init();

		colibri_evalboard_init();

		break;

	case COLIBRI_PXA270_INCOME:

		pxa2xx_mfp_config(ARRAY_AND_SIZE(income_pin_config));

arch/arm/mach-pxa/colibri-pxa300.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "devices.h"





#ifdef CONFIG_MACH_COLIBRI_PXA270_EVALBOARD

#ifdef CONFIG_MACH_COLIBRI_EVALBOARD

static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {

	/* MMC */

	GPIO7_MMC1_CLK,
@@ -173,7 +173,7 @@ void __init colibri_pxa300_init(void) 


	/* Evalboard init */

	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_evalboard_pin_config));

	colibri_pxa270_evalboard_init();

	colibri_evalboard_init();

}



MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")