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

Commit 9ae21ca3 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

parents 12ba8d1e a3484ffd

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,12 @@ if ARCH_HAS_CPUFREQ 


source "drivers/cpufreq/Kconfig"



config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_MXC && CPU_FREQ

	help

	  This enables the CPUfreq driver for i.MX CPUs.



config CPU_FREQ_SA1100

	bool

arch/arm/configs/mx51_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ CONFIG_FEC=y 
CONFIG_INPUT_FF_MEMLESS=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_INPUT_EVBUG=m

CONFIG_MOUSE_PS2=m

CONFIG_MOUSE_PS2_ELANTECH=y

arch/arm/mach-imx/mach-mx27_3ds.c

+38 −0
Original line number Diff line number Diff line
@@ -23,16 +23,20 @@ 
#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/input/matrix_keypad.h>

#include <linux/irq.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/iomux-mx27.h>

#include <mach/mmc.h>



#include "devices-imx27.h"

#include "devices.h"



#define SD1_EN_GPIO (GPIO_PORTB + 25)



static const int mx27pdk_pins[] __initconst = {

	/* UART1 */

	PE12_PF_UART1_TXD,
@@ -58,6 +62,14 @@ static const int mx27pdk_pins[] __initconst = { 
	PD15_AOUT_FEC_COL,

	PD16_AIN_FEC_TX_ER,

	PF23_AIN_FEC_TX_EN,

	/* SDHC1 */

	PE18_PF_SD1_D0,

	PE19_PF_SD1_D1,

	PE20_PF_SD1_D2,

	PE21_PF_SD1_D3,

	PE22_PF_SD1_CMD,

	PE23_PF_SD1_CLK,

	SD1_EN_GPIO | GPIO_GPIO | GPIO_OUT,

};



static const struct imxuart_platform_data uart_pdata __initconst = {
@@ -85,13 +97,39 @@ static struct matrix_keymap_data mx27_3ds_keymap_data = { 
	.keymap_size	= ARRAY_SIZE(mx27_3ds_keymap),

};



static int mx27_3ds_sdhc1_init(struct device *dev, irq_handler_t detect_irq,

				void *data)

{

	return request_irq(IRQ_GPIOB(26), detect_irq, IRQF_TRIGGER_FALLING |

			IRQF_TRIGGER_RISING, "sdhc1-card-detect", data);

}



static void mx27_3ds_sdhc1_exit(struct device *dev, void *data)

{

	free_irq(IRQ_GPIOB(26), data);

}



static struct imxmmc_platform_data sdhc1_pdata = {

	.init = mx27_3ds_sdhc1_init,

	.exit = mx27_3ds_sdhc1_exit,

};



static void mx27_3ds_sdhc1_enable_level_translator(void)

{

	/* Turn on TXB0108 OE pin */

	gpio_request(SD1_EN_GPIO, "sd1_enable");

	gpio_direction_output(SD1_EN_GPIO, 1);

}



static void __init mx27pdk_init(void)

{

	mxc_gpio_setup_multiple_pins(mx27pdk_pins, ARRAY_SIZE(mx27pdk_pins),

		"mx27pdk");

	mx27_3ds_sdhc1_enable_level_translator();

	imx27_add_imx_uart0(&uart_pdata);

	imx27_add_fec(NULL);

	mxc_register_device(&imx_kpp_device, &mx27_3ds_keymap_data);

	mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata);

}



static void __init mx27pdk_timer_init(void)

arch/arm/mach-mx25/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config MACH_MX25_3DS 
	bool "Support MX25PDK (3DS) Platform"

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_ESDHC



config MACH_EUKREA_CPUIMX25

	bool "Support Eukrea CPUIMX25 Platform"

arch/arm/mach-mx25/mach-mx25_3ds.c

+10 −0
Original line number Diff line number Diff line
@@ -96,6 +96,14 @@ static struct pad_desc mx25pdk_pads[] = { 
	MX25_PAD_KPP_COL1__KPP_COL1,

	MX25_PAD_KPP_COL2__KPP_COL2,

	MX25_PAD_KPP_COL3__KPP_COL3,



	/* SD1 */

	MX25_PAD_SD1_CMD__SD1_CMD,

	MX25_PAD_SD1_CLK__SD1_CLK,

	MX25_PAD_SD1_DATA0__SD1_DATA0,

	MX25_PAD_SD1_DATA1__SD1_DATA1,

	MX25_PAD_SD1_DATA2__SD1_DATA2,

	MX25_PAD_SD1_DATA3__SD1_DATA3,

};



static const struct fec_platform_data mx25_fec_pdata __initconst = {
@@ -193,6 +201,8 @@ static void __init mx25pdk_init(void) 
	mx25pdk_fec_reset();

	imx25_add_fec(&mx25_fec_pdata);

	mxc_register_device(&mx25_kpp_device, &mx25pdk_keymap_data);



	imx25_add_esdhc(0, NULL);

}



static void __init mx25pdk_timer_init(void)