diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-24 09:19:33 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 05:19:00 -0400 |
| commit | db298da2c31e1dcf7c9b7c9cef6217ad3449ebb7 (patch) | |
| tree | 4637bf40930d34bc277769b1452ba1f71f13f015 /include/linux/platform_data | |
| parent | 54ecf4f05637183ffd0ac98f906e45e271030a55 (diff) | |
ARM: nomadik: move platform_data definitions
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the nomadik include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Andreas Westin <andreas.westin@stericsson.com>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/crypto-ux500.h | 22 | ||||
| -rw-r--r-- | include/linux/platform_data/keypad-nomadik-ske.h | 50 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-nomadik-nand.h | 16 | ||||
| -rw-r--r-- | include/linux/platform_data/usb-musb-ux500.h | 25 |
4 files changed, 113 insertions, 0 deletions
diff --git a/include/linux/platform_data/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h new file mode 100644 index 000000000000..5b2d0817e26a --- /dev/null +++ b/include/linux/platform_data/crypto-ux500.h | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) ST-Ericsson SA 2011 | ||
| 3 | * | ||
| 4 | * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson | ||
| 5 | * License terms: GNU General Public License (GPL) version 2 | ||
| 6 | */ | ||
| 7 | #ifndef _CRYPTO_UX500_H | ||
| 8 | #define _CRYPTO_UX500_H | ||
| 9 | #include <linux/dmaengine.h> | ||
| 10 | #include <plat/ste_dma40.h> | ||
| 11 | |||
| 12 | struct hash_platform_data { | ||
| 13 | void *mem_to_engine; | ||
| 14 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); | ||
| 15 | }; | ||
| 16 | |||
| 17 | struct cryp_platform_data { | ||
| 18 | struct stedma40_chan_cfg mem_to_engine; | ||
| 19 | struct stedma40_chan_cfg engine_to_mem; | ||
| 20 | }; | ||
| 21 | |||
| 22 | #endif | ||
diff --git a/include/linux/platform_data/keypad-nomadik-ske.h b/include/linux/platform_data/keypad-nomadik-ske.h new file mode 100644 index 000000000000..31382fbc07dc --- /dev/null +++ b/include/linux/platform_data/keypad-nomadik-ske.h | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) ST-Ericsson SA 2010 | ||
| 3 | * | ||
| 4 | * License Terms: GNU General Public License v2 | ||
| 5 | * Author: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> | ||
| 6 | * | ||
| 7 | * ux500 Scroll key and Keypad Encoder (SKE) header | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef __SKE_H | ||
| 11 | #define __SKE_H | ||
| 12 | |||
| 13 | #include <linux/input/matrix_keypad.h> | ||
| 14 | |||
| 15 | /* register definitions for SKE peripheral */ | ||
| 16 | #define SKE_CR 0x00 | ||
| 17 | #define SKE_VAL0 0x04 | ||
| 18 | #define SKE_VAL1 0x08 | ||
| 19 | #define SKE_DBCR 0x0C | ||
| 20 | #define SKE_IMSC 0x10 | ||
| 21 | #define SKE_RIS 0x14 | ||
| 22 | #define SKE_MIS 0x18 | ||
| 23 | #define SKE_ICR 0x1C | ||
| 24 | |||
| 25 | /* | ||
| 26 | * Keypad module | ||
| 27 | */ | ||
| 28 | |||
| 29 | /** | ||
| 30 | * struct keypad_platform_data - structure for platform specific data | ||
| 31 | * @init: pointer to keypad init function | ||
| 32 | * @exit: pointer to keypad deinitialisation function | ||
| 33 | * @keymap_data: matrix scan code table for keycodes | ||
| 34 | * @krow: maximum number of rows | ||
| 35 | * @kcol: maximum number of columns | ||
| 36 | * @debounce_ms: platform specific debounce time | ||
| 37 | * @no_autorepeat: flag for auto repetition | ||
| 38 | * @wakeup_enable: allow waking up the system | ||
| 39 | */ | ||
| 40 | struct ske_keypad_platform_data { | ||
| 41 | int (*init)(void); | ||
| 42 | int (*exit)(void); | ||
| 43 | const struct matrix_keymap_data *keymap_data; | ||
| 44 | u8 krow; | ||
| 45 | u8 kcol; | ||
| 46 | u8 debounce_ms; | ||
| 47 | bool no_autorepeat; | ||
| 48 | bool wakeup_enable; | ||
| 49 | }; | ||
| 50 | #endif /*__SKE_KPD_H*/ | ||
diff --git a/include/linux/platform_data/mtd-nomadik-nand.h b/include/linux/platform_data/mtd-nomadik-nand.h new file mode 100644 index 000000000000..c3c8254c22a5 --- /dev/null +++ b/include/linux/platform_data/mtd-nomadik-nand.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | #ifndef __ASM_ARCH_NAND_H | ||
| 2 | #define __ASM_ARCH_NAND_H | ||
| 3 | |||
| 4 | struct nomadik_nand_platform_data { | ||
| 5 | struct mtd_partition *parts; | ||
| 6 | int nparts; | ||
| 7 | int options; | ||
| 8 | int (*init) (void); | ||
| 9 | int (*exit) (void); | ||
| 10 | }; | ||
| 11 | |||
| 12 | #define NAND_IO_DATA 0x40000000 | ||
| 13 | #define NAND_IO_CMD 0x40800000 | ||
| 14 | #define NAND_IO_ADDR 0x41000000 | ||
| 15 | |||
| 16 | #endif /* __ASM_ARCH_NAND_H */ | ||
diff --git a/include/linux/platform_data/usb-musb-ux500.h b/include/linux/platform_data/usb-musb-ux500.h new file mode 100644 index 000000000000..4c1cc50a595a --- /dev/null +++ b/include/linux/platform_data/usb-musb-ux500.h | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) ST-Ericsson SA 2011 | ||
| 3 | * | ||
| 4 | * Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | ||
| 5 | * License terms: GNU General Public License (GPL) version 2 | ||
| 6 | */ | ||
| 7 | #ifndef __ASM_ARCH_USB_H | ||
| 8 | #define __ASM_ARCH_USB_H | ||
| 9 | |||
| 10 | #include <linux/dmaengine.h> | ||
| 11 | |||
| 12 | #define UX500_MUSB_DMA_NUM_RX_CHANNELS 8 | ||
| 13 | #define UX500_MUSB_DMA_NUM_TX_CHANNELS 8 | ||
| 14 | |||
| 15 | struct ux500_musb_board_data { | ||
| 16 | void **dma_rx_param_array; | ||
| 17 | void **dma_tx_param_array; | ||
| 18 | u32 num_rx_channels; | ||
| 19 | u32 num_tx_channels; | ||
| 20 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); | ||
| 21 | }; | ||
| 22 | |||
| 23 | void ux500_add_usb(struct device *parent, resource_size_t base, | ||
| 24 | int irq, int *dma_rx_cfg, int *dma_tx_cfg); | ||
| 25 | #endif | ||
