diff options
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa270.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa270.c | 107 |
1 files changed, 20 insertions, 87 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c index 99d511cf0a82..b4f53ccf3e80 100644 --- a/arch/arm/mach-pxa/colibri-pxa270.c +++ b/arch/arm/mach-pxa/colibri-pxa270.c @@ -11,36 +11,26 @@ */ #include <linux/init.h> -#include <linux/kernel.h> -#include <linux/platform_device.h> -#include <linux/sysdev.h> #include <linux/interrupt.h> -#include <linux/bitops.h> -#include <linux/ioport.h> -#include <linux/delay.h> +#include <linux/kernel.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> -#include <linux/gpio.h> +#include <linux/platform_device.h> +#include <linux/sysdev.h> #include <linux/ucb1400.h> -#include <asm/mach-types.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <asm/sizes.h> + #include <asm/mach/arch.h> -#include <asm/mach/map.h> -#include <asm/mach/irq.h> #include <asm/mach/flash.h> +#include <asm/mach-types.h> +#include <asm/sizes.h> #include <mach/audio.h> -#include <mach/pxa27x.h> #include <mach/colibri.h> -#include <mach/mmc.h> -#include <mach/ohci.h> -#include <mach/pxa27x-udc.h> +#include <mach/pxa27x.h> -#include "generic.h" #include "devices.h" +#include "generic.h" /****************************************************************************** * Pin configuration @@ -50,25 +40,6 @@ static mfp_cfg_t colibri_pxa270_pin_config[] __initdata = { GPIO78_nCS_2, /* Ethernet CS */ GPIO114_GPIO, /* Ethernet IRQ */ - /* MMC */ - GPIO32_MMC_CLK, - GPIO92_MMC_DAT_0, - GPIO109_MMC_DAT_1, - GPIO110_MMC_DAT_2, - GPIO111_MMC_DAT_3, - GPIO112_MMC_CMD, - GPIO0_GPIO, /* SD detect */ - - /* FFUART */ - GPIO39_FFUART_TXD, - GPIO34_FFUART_RXD, - - /* UHC */ - GPIO88_USBH1_PWR, - GPIO89_USBH1_PEN, - GPIO119_USBH2_PWR, - GPIO120_USBH2_PEN, - /* AC97 */ GPIO28_AC97_BITCLK, GPIO29_AC97_SDATA_IN_0, @@ -172,51 +143,6 @@ static inline void colibri_pxa270_eth_init(void) {} #endif /****************************************************************************** - * SD/MMC card controller - ******************************************************************************/ -#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) -static struct pxamci_platform_data colibri_pxa270_mci_platform_data = { - .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, - .gpio_power = -1, - .gpio_card_detect = GPIO0_COLIBRI_PXA270_SD_DETECT, - .gpio_card_ro = -1, - .detect_delay_ms = 200, -}; - -static void __init colibri_pxa270_mmc_init(void) -{ - pxa_set_mci_info(&colibri_pxa270_mci_platform_data); -} -#else -static inline void colibri_pxa270_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) -{ - UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE; - return 0; -} - -static struct pxaohci_platform_data colibri_pxa270_ohci_info = { - .port_mode = PMM_PERPORT_MODE, - .flags = ENABLE_PORT1 | ENABLE_PORT2 | - POWER_CONTROL_LOW | POWER_SENSE_LOW, - .init = colibri_pxa270_ohci_init, -}; - -static void __init colibri_pxa270_uhc_init(void) -{ - pxa_set_ohci_info(&colibri_pxa270_ohci_info); -} -#else -static inline void colibri_pxa270_uhc_init(void) {} -#endif - -/****************************************************************************** * Audio and Touchscreen ******************************************************************************/ #if defined(CONFIG_TOUCHSCREEN_UCB1400) || \ @@ -246,18 +172,25 @@ static void __init colibri_pxa270_tsc_init(void) static inline void colibri_pxa270_tsc_init(void) {} #endif +static int colibri_pxa270_baseboard; +core_param(colibri_pxa270_baseboard, colibri_pxa270_baseboard, int, 0444); + static void __init colibri_pxa270_init(void) { pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa270_pin_config)); - pxa_set_ffuart_info(NULL); - pxa_set_btuart_info(NULL); - pxa_set_stuart_info(NULL); colibri_pxa270_nor_init(); colibri_pxa270_eth_init(); - colibri_pxa270_mmc_init(); - colibri_pxa270_uhc_init(); colibri_pxa270_tsc_init(); + + switch (colibri_pxa270_baseboard) { + case COLIBRI_PXA270_EVALBOARD: + colibri_pxa270_evalboard_init(); + break; + default: + printk(KERN_ERR "Illegal colibri_pxa270_baseboard type %d\n", + colibri_pxa270_baseboard); + } } MACHINE_START(COLIBRI, "Toradex Colibri PXA270") |