diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:12 +0100 |
| commit | 0ae4b1e82778ac6df74a06eacffe2f9373b95ee3 (patch) | |
| tree | 99c668fbb04a4f626f0e686c3aa1df9a64e464b6 /arch/arm/mach-imx/include/mach/devices-imx53.h | |
| parent | c3a84a3f760b3892501591f5a6b037611477dc9f (diff) | |
| parent | 2ff02e7aa1a4f9f59c8786e9fdade070a8e7fd79 (diff) | |
| download | barebox-0ae4b1e82778ac6df74a06eacffe2f9373b95ee3.tar.gz barebox-0ae4b1e82778ac6df74a06eacffe2f9373b95ee3.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/mach-imx/include/mach/devices-imx53.h
Diffstat (limited to 'arch/arm/mach-imx/include/mach/devices-imx53.h')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/devices-imx53.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/devices-imx53.h b/arch/arm/mach-imx/include/mach/devices-imx53.h index a49678ea64..4c330549cd 100644 --- a/arch/arm/mach-imx/include/mach/devices-imx53.h +++ b/arch/arm/mach-imx/include/mach/devices-imx53.h @@ -83,6 +83,11 @@ static inline struct device_d *imx53_add_nand(struct imx_nand_platform_data *pda return dev; } +static inline struct device_d *imx53_add_kpp(struct matrix_keymap_data *pdata) +{ + return imx_add_kpp((void *)MX53_KPP_BASE_ADDR, pdata); +} + static inline struct device_d *imx53_add_sata(void) { return add_generic_device("imx53-sata", 0, NULL, MX53_SATA_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); |