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

Commit 574ec547 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Sascha Hauer
Browse files

ARM: add support for the EET board, based on the i.MX31 pcm037 module 



The "EET" variant of the pcm037 board has an OLED display, using a S6E63D6
display controller on the first SPI interface, using GPIO57 as a chip-select
for it. S6E63D6 is initialised in the boot-loader, so we only have to take care
of the LCD. EET also adds several buttons and LEDs on GPIOs. This patch adds a
"pcm037_variant=" kernel command line parameter to specify at boot-time which
board the kernel is running on, default is "pcm970", specify "eet" for the EET
board.

Signed-off-by: default avatarGuennadi Liakhovetski <lg@denx.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 32c1ad9a

arch/arm/mach-mx3/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ config MACH_PCM037 
	  Include support for Phytec pcm037 platform. This includes

	  specific configurations for the board and its peripherals.



config MACH_PCM037_EET

	bool "Support pcm037 EET board extensions"

	depends on MACH_PCM037

	help

	  Add support for PCM037 EET baseboard extensions. If you are using the

	  OLED display with EET, use "video=mx3fb:CMEL-OLED" kernel

	  command-line parameter.



config MACH_MX31LITE

	bool "Support MX31 LITEKIT (LogicPD)"

	select ARCH_MX31

arch/arm/mach-mx3/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_MACH_MX31ADS) += mx31ads.o 
obj-$(CONFIG_MACH_MX31LILLY)	+= mx31lilly.o mx31lilly-db.o

obj-$(CONFIG_MACH_MX31LITE)	+= mx31lite.o

obj-$(CONFIG_MACH_PCM037)	+= pcm037.o

obj-$(CONFIG_MACH_PCM037_EET)	+= pcm037_eet.o

obj-$(CONFIG_MACH_MX31_3DS)	+= mx31pdk.o

obj-$(CONFIG_MACH_MX31MOBOARD)	+= mx31moboard.o mx31moboard-devboard.o \

				   mx31moboard-marxbot.o

arch/arm/mach-mx3/pcm037.c

+59 −6
Original line number Diff line number Diff line
@@ -52,6 +52,41 @@ 
#include <mach/mxc_nand.h>



#include "devices.h"

#include "pcm037.h"



static enum pcm037_board_variant pcm037_instance = PCM037_PCM970;



static int __init pcm037_variant_setup(char *str)

{

	if (!strcmp("eet", str))

		pcm037_instance = PCM037_EET;

	else if (strcmp("pcm970", str))

		pr_warning("Unknown pcm037 baseboard variant %s\n", str);



	return 1;

}



/* Supported values: "pcm970" (default) and "eet" */

__setup("pcm037_variant=", pcm037_variant_setup);



enum pcm037_board_variant pcm037_variant(void)

{

	return pcm037_instance;

}



/* UART1 with RTS/CTS handshake signals */

static unsigned int pcm037_uart1_handshake_pins[] = {

	MX31_PIN_CTS1__CTS1,

	MX31_PIN_RTS1__RTS1,

	MX31_PIN_TXD1__TXD1,

	MX31_PIN_RXD1__RXD1,

};



/* UART1 without RTS/CTS handshake signals */

static unsigned int pcm037_uart1_pins[] = {

	MX31_PIN_TXD1__TXD1,

	MX31_PIN_RXD1__RXD1,

};



static unsigned int pcm037_pins[] = {

	/* I2C */
@@ -76,11 +111,6 @@ static unsigned int pcm037_pins[] = { 
	MX31_PIN_CSPI1_SS0__SS0,

	MX31_PIN_CSPI1_SS1__SS1,

	MX31_PIN_CSPI1_SS2__SS2,

	/* UART1 */

	MX31_PIN_CTS1__CTS1,

	MX31_PIN_RTS1__RTS1,

	MX31_PIN_TXD1__TXD1,

	MX31_PIN_RXD1__RXD1,

	/* UART2 */

	MX31_PIN_TXD2__TXD2,

	MX31_PIN_RXD2__RXD2,
@@ -459,6 +489,22 @@ static const struct fb_videomode fb_modedb[] = { 
		.sync		= FB_SYNC_VERT_HIGH_ACT | FB_SYNC_OE_ACT_HIGH,

		.vmode		= FB_VMODE_NONINTERLACED,

		.flag		= 0,

	}, {

		/* 240x320 @ 60 Hz */

		.name		= "CMEL-OLED",

		.refresh	= 60,

		.xres		= 240,

		.yres		= 320,

		.pixclock	= 185925,

		.left_margin	= 9,

		.right_margin	= 16,

		.upper_margin	= 7,

		.lower_margin	= 9,

		.hsync_len	= 1,

		.vsync_len	= 1,

		.sync		= FB_SYNC_OE_ACT_HIGH | FB_SYNC_CLK_INVERT,

		.vmode		= FB_VMODE_NONINTERLACED,

		.flag		= 0,

	},

};
@@ -479,6 +525,14 @@ static void __init mxc_board_init(void) 
	mxc_iomux_setup_multiple_pins(pcm037_pins, ARRAY_SIZE(pcm037_pins),

			"pcm037");



	if (pcm037_variant() == PCM037_EET)

		mxc_iomux_setup_multiple_pins(pcm037_uart1_pins,

			ARRAY_SIZE(pcm037_uart1_pins), "pcm037_uart1");

	else

		mxc_iomux_setup_multiple_pins(pcm037_uart1_handshake_pins,

			ARRAY_SIZE(pcm037_uart1_handshake_pins),

			"pcm037_uart1");



	platform_add_devices(devices, ARRAY_SIZE(devices));



	mxc_register_device(&mxc_uart_device0, &uart_pdata);
@@ -542,4 +596,3 @@ MACHINE_START(PCM037, "Phytec Phycore pcm037") 
	.init_machine   = mxc_board_init,

	.timer          = &pcm037_timer,

MACHINE_END

arch/arm/mach-mx3/pcm037.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#ifndef __PCM037_H__

#define __PCM037_H__



enum pcm037_board_variant {

	PCM037_PCM970,

	PCM037_EET,

};



extern enum pcm037_board_variant pcm037_variant(void);



#endif

arch/arm/mach-mx3/pcm037_eet.c

0 → 100644
+204 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009

 * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>



#include <mach/common.h>

#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)

#include <mach/spi.h>

#endif

#include <mach/iomux-mx3.h>



#include <asm/mach-types.h>



#include "pcm037.h"

#include "devices.h"



static unsigned int pcm037_eet_pins[] = {

	/* SPI #1 */

	MX31_PIN_CSPI1_MISO__MISO,

	MX31_PIN_CSPI1_MOSI__MOSI,

	MX31_PIN_CSPI1_SCLK__SCLK,

	MX31_PIN_CSPI1_SPI_RDY__SPI_RDY,

	MX31_PIN_CSPI1_SS0__SS0,

	MX31_PIN_CSPI1_SS1__SS1,

	MX31_PIN_CSPI1_SS2__SS2,



	/* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */

	IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO),

	/* GPIO keys */

	IOMUX_MODE(MX31_PIN_GPIO1_0,	IOMUX_CONFIG_GPIO), /* 0 */

	IOMUX_MODE(MX31_PIN_GPIO1_1,	IOMUX_CONFIG_GPIO), /* 1 */

	IOMUX_MODE(MX31_PIN_GPIO1_2,	IOMUX_CONFIG_GPIO), /* 2 */

	IOMUX_MODE(MX31_PIN_GPIO1_3,	IOMUX_CONFIG_GPIO), /* 3 */

	IOMUX_MODE(MX31_PIN_SVEN0,	IOMUX_CONFIG_GPIO), /* 32 */

	IOMUX_MODE(MX31_PIN_STX0,	IOMUX_CONFIG_GPIO), /* 33 */

	IOMUX_MODE(MX31_PIN_SRX0,	IOMUX_CONFIG_GPIO), /* 34 */

	IOMUX_MODE(MX31_PIN_SIMPD0,	IOMUX_CONFIG_GPIO), /* 35 */

	IOMUX_MODE(MX31_PIN_RTS1,	IOMUX_CONFIG_GPIO), /* 38 */

	IOMUX_MODE(MX31_PIN_CTS1,	IOMUX_CONFIG_GPIO), /* 39 */

	IOMUX_MODE(MX31_PIN_KEY_ROW4,	IOMUX_CONFIG_GPIO), /* 50 */

	IOMUX_MODE(MX31_PIN_KEY_ROW5,	IOMUX_CONFIG_GPIO), /* 51 */

	IOMUX_MODE(MX31_PIN_KEY_ROW6,	IOMUX_CONFIG_GPIO), /* 52 */

	IOMUX_MODE(MX31_PIN_KEY_ROW7,	IOMUX_CONFIG_GPIO), /* 53 */



	/* LEDs */

	IOMUX_MODE(MX31_PIN_DTR_DTE1,	IOMUX_CONFIG_GPIO), /* 44 */

	IOMUX_MODE(MX31_PIN_DSR_DTE1,	IOMUX_CONFIG_GPIO), /* 45 */

	IOMUX_MODE(MX31_PIN_KEY_COL5,	IOMUX_CONFIG_GPIO), /* 55 */

	IOMUX_MODE(MX31_PIN_KEY_COL6,	IOMUX_CONFIG_GPIO), /* 56 */

};



/* SPI */

static struct spi_board_info pcm037_spi_dev[] = {

	{

		.modalias	= "dac124s085",

		.max_speed_hz	= 400000,

		.bus_num	= 0,

		.chip_select	= 0,		/* Index in pcm037_spi1_cs[] */

		.mode		= SPI_CPHA,

	},

};



/* Platform Data for MXC CSPI */

#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)

static int pcm037_spi1_cs[] = {MXC_SPI_CS(1), IOMUX_TO_GPIO(MX31_PIN_KEY_COL7)};



struct spi_imx_master pcm037_spi1_master = {

	.chipselect = pcm037_spi1_cs,

	.num_chipselect = ARRAY_SIZE(pcm037_spi1_cs),

};

#endif



/* GPIO-keys input device */

static struct gpio_keys_button pcm037_gpio_keys[] = {

	{

		.type	= EV_KEY,

		.code	= KEY_L,

		.gpio	= 0,

		.desc	= "Wheel Manual",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_A,

		.gpio	= 1,

		.desc	= "Wheel AF",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_V,

		.gpio	= 2,

		.desc	= "Wheel View",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_M,

		.gpio	= 3,

		.desc	= "Wheel Menu",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_UP,

		.gpio	= 32,

		.desc	= "Nav Pad Up",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_RIGHT,

		.gpio	= 33,

		.desc	= "Nav Pad Right",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_DOWN,

		.gpio	= 34,

		.desc	= "Nav Pad Down",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_LEFT,

		.gpio	= 35,

		.desc	= "Nav Pad Left",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_ENTER,

		.gpio	= 38,

		.desc	= "Nav Pad Ok",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= KEY_O,

		.gpio	= 39,

		.desc	= "Wheel Off",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= BTN_FORWARD,

		.gpio	= 50,

		.desc	= "Focus Forward",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= BTN_BACK,

		.gpio	= 51,

		.desc	= "Focus Backward",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= BTN_MIDDLE,

		.gpio	= 52,

		.desc	= "Release Half",

		.wakeup	= 0,

	}, {

		.type	= EV_KEY,

		.code	= BTN_EXTRA,

		.gpio	= 53,

		.desc	= "Release Full",

		.wakeup	= 0,

	},

};



static struct gpio_keys_platform_data pcm037_gpio_keys_platform_data = {

	.buttons	= pcm037_gpio_keys,

	.nbuttons	= ARRAY_SIZE(pcm037_gpio_keys),

	.rep		= 0, /* No auto-repeat */

};



static struct platform_device pcm037_gpio_keys_device = {

	.name	= "gpio-keys",

	.id	= -1,

	.dev	= {

		.platform_data	= &pcm037_gpio_keys_platform_data,

	},

};



static int eet_init_devices(void)

{

	if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET)

		return 0;



	mxc_iomux_setup_multiple_pins(pcm037_eet_pins,

				ARRAY_SIZE(pcm037_eet_pins), "pcm037_eet");



	/* SPI */

	spi_register_board_info(pcm037_spi_dev, ARRAY_SIZE(pcm037_spi_dev));

#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)

	mxc_register_device(&mxc_spi_device0, &pcm037_spi1_master);

#endif



	platform_device_register(&pcm037_gpio_keys_device);



	return 0;

}



late_initcall(eet_init_devices);