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

Commit 47c53822 authored by Dinh Nguyen's avatar Dinh Nguyen Committed by Sascha Hauer
Browse files

ARM: imx: Add gpio-keys to plat-mxc 



Add imx_add_gpio_keys function to add gpio-keys in plat-mxc

Signed-off-by: default avatarDinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 4a74bddc

arch/arm/plat-mxc/devices/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ config IMX_HAVE_PLATFORM_FLEXCAN 
	select HAVE_CAN_FLEXCAN if CAN

	bool



config IMX_HAVE_PLATFORM_GPIO_KEYS

	bool

	default y if ARCH_MX51

	

config IMX_HAVE_PLATFORM_IMX_I2C

	bool

arch/arm/plat-mxc/devices/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_IMX_HAVE_PLATFORM_ESDHC) += platform-esdhc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_FEC) += platform-fec.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS) += platform-gpio_keys.o

obj-y += platform-imx-dma.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o

arch/arm/plat-mxc/devices/platform-gpio_keys.c

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

 * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.

 *

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

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor,

 * Boston, MA  02110-1301, USA.

 */

#include <asm/sizes.h>

#include <mach/hardware.h>

#include <mach/devices-common.h>



struct platform_device *__init imx_add_gpio_keys(

		const struct gpio_keys_platform_data *pdata)

{

	return imx_add_platform_device("gpio-keys", -1, NULL,

		 0, pdata, sizeof(*pdata));

}

arch/arm/plat-mxc/include/mach/devices-common.h

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ struct platform_device *__init imx_add_flexcan(int id, 
		resource_size_t irq,

		const struct flexcan_platform_data *pdata);



#include <linux/gpio_keys.h>

struct platform_device *__init imx_add_gpio_keys(

		const struct gpio_keys_platform_data *pdata);



#include <mach/i2c.h>

struct imx_imx_i2c_data {

	int id;

arch/arm/plat-mxc/include/mach/iomux-mx51.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ typedef enum iomux_config { 
				PAD_CTL_PKE | PAD_CTL_HYS)

#define MX51_GPIO_PAD_CTRL		(PAD_CTL_DSE_HIGH | PAD_CTL_PKE | \

				PAD_CTL_SRE_FAST)

#define MX51_GPIO_PAD_CTRL_2	(PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \

					PAD_CTL_PUS_100K_UP)

#define MX51_ECSPI_PAD_CTRL	(PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_DSE_HIGH | \

				PAD_CTL_SRE_FAST)

#define MX51_SDHCI_PAD_CTRL	(PAD_CTL_DSE_HIGH | PAD_CTL_PUS_47K_UP | \