diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-24 09:21:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 11:39:52 -0400 |
| commit | 2203747c97712975accc5e69bdaf1ad38a691635 (patch) | |
| tree | 3aac29db151701df240bc8e9a8edd42c4d3ed932 /include/linux | |
| parent | b25c46074a16e261e1fb2baf59578a2ad0cd8ef6 (diff) | |
ARM: omap: 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 omap 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: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: "BenoƮt Cousson" <b-cousson@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: Jean Pihet <j-pihet@ti.com>
Cc: J Keerthy <j-keerthy@ti.com>
Cc: linux-omap@vger.kernel.org
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/asoc-ti-mcbsp.h | 62 | ||||
| -rw-r--r-- | include/linux/platform_data/dsp-omap.h | 34 | ||||
| -rw-r--r-- | include/linux/platform_data/keypad-omap.h | 52 | ||||
| -rw-r--r-- | include/linux/platform_data/lcd-mipid.h | 29 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-nand-omap2.h | 43 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-onenand-omap2.h | 53 | ||||
| -rw-r--r-- | include/linux/platform_data/remoteproc-omap.h | 57 | ||||
| -rw-r--r-- | include/linux/platform_data/spi-omap2-mcspi.h | 23 | ||||
| -rw-r--r-- | include/linux/platform_data/voltage-omap.h | 39 | ||||
| -rw-r--r-- | include/linux/power/smartreflex.h | 2 |
10 files changed, 393 insertions, 1 deletions
diff --git a/include/linux/platform_data/asoc-ti-mcbsp.h b/include/linux/platform_data/asoc-ti-mcbsp.h new file mode 100644 index 000000000000..18814127809a --- /dev/null +++ b/include/linux/platform_data/asoc-ti-mcbsp.h | |||
| @@ -0,0 +1,62 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/plat-omap/include/mach/mcbsp.h | ||
| 3 | * | ||
| 4 | * Defines for Multi-Channel Buffered Serial Port | ||
| 5 | * | ||
| 6 | * Copyright (C) 2002 RidgeRun, Inc. | ||
| 7 | * Author: Steve Johnson | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | ||
| 14 | * This program is distributed in the hope that it will be useful, | ||
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | * GNU General Public License for more details. | ||
| 18 | * | ||
| 19 | * You should have received a copy of the GNU General Public License | ||
| 20 | * along with this program; if not, write to the Free Software | ||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 22 | * | ||
| 23 | */ | ||
| 24 | #ifndef __ASM_ARCH_OMAP_MCBSP_H | ||
| 25 | #define __ASM_ARCH_OMAP_MCBSP_H | ||
| 26 | |||
| 27 | #include <linux/spinlock.h> | ||
| 28 | #include <linux/clk.h> | ||
| 29 | |||
| 30 | #define MCBSP_CONFIG_TYPE2 0x2 | ||
| 31 | #define MCBSP_CONFIG_TYPE3 0x3 | ||
| 32 | #define MCBSP_CONFIG_TYPE4 0x4 | ||
| 33 | |||
| 34 | /* Platform specific configuration */ | ||
| 35 | struct omap_mcbsp_ops { | ||
| 36 | void (*request)(unsigned int); | ||
| 37 | void (*free)(unsigned int); | ||
| 38 | }; | ||
| 39 | |||
| 40 | struct omap_mcbsp_platform_data { | ||
| 41 | struct omap_mcbsp_ops *ops; | ||
| 42 | u16 buffer_size; | ||
| 43 | u8 reg_size; | ||
| 44 | u8 reg_step; | ||
| 45 | |||
| 46 | /* McBSP platform and instance specific features */ | ||
| 47 | bool has_wakeup; /* Wakeup capability */ | ||
| 48 | bool has_ccr; /* Transceiver has configuration control registers */ | ||
| 49 | int (*enable_st_clock)(unsigned int, bool); | ||
| 50 | int (*set_clk_src)(struct device *dev, struct clk *clk, const char *src); | ||
| 51 | int (*mux_signal)(struct device *dev, const char *signal, const char *src); | ||
| 52 | }; | ||
| 53 | |||
| 54 | /** | ||
| 55 | * omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod | ||
| 56 | * @sidetone: name of the sidetone device | ||
| 57 | */ | ||
| 58 | struct omap_mcbsp_dev_attr { | ||
| 59 | const char *sidetone; | ||
| 60 | }; | ||
| 61 | |||
| 62 | #endif | ||
diff --git a/include/linux/platform_data/dsp-omap.h b/include/linux/platform_data/dsp-omap.h new file mode 100644 index 000000000000..5927709b1908 --- /dev/null +++ b/include/linux/platform_data/dsp-omap.h | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | #ifndef __OMAP_DSP_H__ | ||
| 2 | #define __OMAP_DSP_H__ | ||
| 3 | |||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 6 | struct omap_dsp_platform_data { | ||
| 7 | void (*dsp_set_min_opp) (u8 opp_id); | ||
| 8 | u8 (*dsp_get_opp) (void); | ||
| 9 | void (*cpu_set_freq) (unsigned long f); | ||
| 10 | unsigned long (*cpu_get_freq) (void); | ||
| 11 | unsigned long mpu_speed[6]; | ||
| 12 | |||
| 13 | /* functions to write and read PRCM registers */ | ||
| 14 | void (*dsp_prm_write)(u32, s16 , u16); | ||
| 15 | u32 (*dsp_prm_read)(s16 , u16); | ||
| 16 | u32 (*dsp_prm_rmw_bits)(u32, u32, s16, s16); | ||
| 17 | void (*dsp_cm_write)(u32, s16 , u16); | ||
| 18 | u32 (*dsp_cm_read)(s16 , u16); | ||
| 19 | u32 (*dsp_cm_rmw_bits)(u32, u32, s16, s16); | ||
| 20 | |||
| 21 | void (*set_bootaddr)(u32); | ||
| 22 | void (*set_bootmode)(u8); | ||
| 23 | |||
| 24 | phys_addr_t phys_mempool_base; | ||
| 25 | phys_addr_t phys_mempool_size; | ||
| 26 | }; | ||
| 27 | |||
| 28 | #if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE) | ||
| 29 | extern void omap_dsp_reserve_sdram_memblock(void); | ||
| 30 | #else | ||
| 31 | static inline void omap_dsp_reserve_sdram_memblock(void) { } | ||
| 32 | #endif | ||
| 33 | |||
| 34 | #endif | ||
diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h new file mode 100644 index 000000000000..a6b21eddb212 --- /dev/null +++ b/include/linux/platform_data/keypad-omap.h | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/plat-omap/include/mach/keypad.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 Komal Shah <komal_shah802003@yahoo.com> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | #ifndef ASMARM_ARCH_KEYPAD_H | ||
| 11 | #define ASMARM_ARCH_KEYPAD_H | ||
| 12 | |||
| 13 | #ifndef CONFIG_ARCH_OMAP1 | ||
| 14 | #warning Please update the board to use matrix-keypad driver | ||
| 15 | #define omap_readw(reg) 0 | ||
| 16 | #define omap_writew(val, reg) do {} while (0) | ||
| 17 | #endif | ||
| 18 | #include <linux/input/matrix_keypad.h> | ||
| 19 | |||
| 20 | struct omap_kp_platform_data { | ||
| 21 | int rows; | ||
| 22 | int cols; | ||
| 23 | const struct matrix_keymap_data *keymap_data; | ||
| 24 | bool rep; | ||
| 25 | unsigned long delay; | ||
| 26 | bool dbounce; | ||
| 27 | /* specific to OMAP242x*/ | ||
| 28 | unsigned int *row_gpios; | ||
| 29 | unsigned int *col_gpios; | ||
| 30 | }; | ||
| 31 | |||
| 32 | /* Group (0..3) -- when multiple keys are pressed, only the | ||
| 33 | * keys pressed in the same group are considered as pressed. This is | ||
| 34 | * in order to workaround certain crappy HW designs that produce ghost | ||
| 35 | * keypresses. Two free bits, not used by neither row/col nor keynum, | ||
| 36 | * must be available for use as group bits. The below GROUP_SHIFT | ||
| 37 | * macro definition is based on some prior knowledge of the | ||
| 38 | * matrix_keypad defined KEY() macro internals. | ||
| 39 | */ | ||
| 40 | #define GROUP_SHIFT 14 | ||
| 41 | #define GROUP_0 (0 << GROUP_SHIFT) | ||
| 42 | #define GROUP_1 (1 << GROUP_SHIFT) | ||
| 43 | #define GROUP_2 (2 << GROUP_SHIFT) | ||
| 44 | #define GROUP_3 (3 << GROUP_SHIFT) | ||
| 45 | #define GROUP_MASK GROUP_3 | ||
| 46 | #if KEY_MAX & GROUP_MASK | ||
| 47 | #error Group bits in conflict with keynum bits | ||
| 48 | #endif | ||
| 49 | |||
| 50 | |||
| 51 | #endif | ||
| 52 | |||
diff --git a/include/linux/platform_data/lcd-mipid.h b/include/linux/platform_data/lcd-mipid.h new file mode 100644 index 000000000000..8e52c6572281 --- /dev/null +++ b/include/linux/platform_data/lcd-mipid.h | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | #ifndef __LCD_MIPID_H | ||
| 2 | #define __LCD_MIPID_H | ||
| 3 | |||
| 4 | enum mipid_test_num { | ||
| 5 | MIPID_TEST_RGB_LINES, | ||
| 6 | }; | ||
| 7 | |||
| 8 | enum mipid_test_result { | ||
| 9 | MIPID_TEST_SUCCESS, | ||
| 10 | MIPID_TEST_INVALID, | ||
| 11 | MIPID_TEST_FAILED, | ||
| 12 | }; | ||
| 13 | |||
| 14 | #ifdef __KERNEL__ | ||
| 15 | |||
| 16 | struct mipid_platform_data { | ||
| 17 | int nreset_gpio; | ||
| 18 | int data_lines; | ||
| 19 | |||
| 20 | void (*shutdown)(struct mipid_platform_data *pdata); | ||
| 21 | void (*set_bklight_level)(struct mipid_platform_data *pdata, | ||
| 22 | int level); | ||
| 23 | int (*get_bklight_level)(struct mipid_platform_data *pdata); | ||
| 24 | int (*get_bklight_max)(struct mipid_platform_data *pdata); | ||
| 25 | }; | ||
| 26 | |||
| 27 | #endif | ||
| 28 | |||
| 29 | #endif | ||
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h new file mode 100644 index 000000000000..1a68c1e5fe53 --- /dev/null +++ b/include/linux/platform_data/mtd-nand-omap2.h | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/plat-omap/include/mach/nand.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 Micron Technology Inc. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <plat/gpmc.h> | ||
| 12 | #include <linux/mtd/partitions.h> | ||
| 13 | |||
| 14 | enum nand_io { | ||
| 15 | NAND_OMAP_PREFETCH_POLLED = 0, /* prefetch polled mode, default */ | ||
| 16 | NAND_OMAP_POLLED, /* polled mode, without prefetch */ | ||
| 17 | NAND_OMAP_PREFETCH_DMA, /* prefetch enabled sDMA mode */ | ||
| 18 | NAND_OMAP_PREFETCH_IRQ /* prefetch enabled irq mode */ | ||
| 19 | }; | ||
| 20 | |||
| 21 | struct omap_nand_platform_data { | ||
| 22 | int cs; | ||
| 23 | struct mtd_partition *parts; | ||
| 24 | struct gpmc_timings *gpmc_t; | ||
| 25 | int nr_parts; | ||
| 26 | bool dev_ready; | ||
| 27 | enum nand_io xfer_type; | ||
| 28 | int devsize; | ||
| 29 | enum omap_ecc ecc_opt; | ||
| 30 | struct gpmc_nand_regs reg; | ||
| 31 | }; | ||
| 32 | |||
| 33 | /* minimum size for IO mapping */ | ||
| 34 | #define NAND_IO_SIZE 4 | ||
| 35 | |||
| 36 | #if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE) | ||
| 37 | extern int gpmc_nand_init(struct omap_nand_platform_data *d); | ||
| 38 | #else | ||
| 39 | static inline int gpmc_nand_init(struct omap_nand_platform_data *d) | ||
| 40 | { | ||
| 41 | return 0; | ||
| 42 | } | ||
| 43 | #endif | ||
diff --git a/include/linux/platform_data/mtd-onenand-omap2.h b/include/linux/platform_data/mtd-onenand-omap2.h new file mode 100644 index 000000000000..2858667d2e4f --- /dev/null +++ b/include/linux/platform_data/mtd-onenand-omap2.h | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/plat-omap/include/mach/onenand.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 Nokia Corporation | ||
| 5 | * Author: Juha Yrjola | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/mtd/mtd.h> | ||
| 13 | #include <linux/mtd/partitions.h> | ||
| 14 | |||
| 15 | #define ONENAND_SYNC_READ (1 << 0) | ||
| 16 | #define ONENAND_SYNC_READWRITE (1 << 1) | ||
| 17 | |||
| 18 | struct onenand_freq_info { | ||
| 19 | u16 maf_id; | ||
| 20 | u16 dev_id; | ||
| 21 | u16 ver_id; | ||
| 22 | }; | ||
| 23 | |||
| 24 | struct omap_onenand_platform_data { | ||
| 25 | int cs; | ||
| 26 | int gpio_irq; | ||
| 27 | struct mtd_partition *parts; | ||
| 28 | int nr_parts; | ||
| 29 | int (*onenand_setup)(void __iomem *, int *freq_ptr); | ||
| 30 | int (*get_freq)(const struct onenand_freq_info *freq_info, | ||
| 31 | bool *clk_dep); | ||
| 32 | int dma_channel; | ||
| 33 | u8 flags; | ||
| 34 | u8 regulator_can_sleep; | ||
| 35 | u8 skip_initial_unlocking; | ||
| 36 | }; | ||
| 37 | |||
| 38 | #define ONENAND_MAX_PARTITIONS 8 | ||
| 39 | |||
| 40 | #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ | ||
| 41 | defined(CONFIG_MTD_ONENAND_OMAP2_MODULE) | ||
| 42 | |||
| 43 | extern void gpmc_onenand_init(struct omap_onenand_platform_data *d); | ||
| 44 | |||
| 45 | #else | ||
| 46 | |||
| 47 | #define board_onenand_data NULL | ||
| 48 | |||
| 49 | static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d) | ||
| 50 | { | ||
| 51 | } | ||
| 52 | |||
| 53 | #endif | ||
diff --git a/include/linux/platform_data/remoteproc-omap.h b/include/linux/platform_data/remoteproc-omap.h new file mode 100644 index 000000000000..b10eac89e2e9 --- /dev/null +++ b/include/linux/platform_data/remoteproc-omap.h | |||
| @@ -0,0 +1,57 @@ | |||
| 1 | /* | ||
| 2 | * Remote Processor - omap-specific bits | ||
| 3 | * | ||
| 4 | * Copyright (C) 2011 Texas Instruments, Inc. | ||
| 5 | * Copyright (C) 2011 Google, Inc. | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU General Public License | ||
| 9 | * version 2 as published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #ifndef _PLAT_REMOTEPROC_H | ||
| 18 | #define _PLAT_REMOTEPROC_H | ||
| 19 | |||
| 20 | struct rproc_ops; | ||
| 21 | struct platform_device; | ||
| 22 | |||
| 23 | /* | ||
| 24 | * struct omap_rproc_pdata - omap remoteproc's platform data | ||
| 25 | * @name: the remoteproc's name | ||
| 26 | * @oh_name: omap hwmod device | ||
| 27 | * @oh_name_opt: optional, secondary omap hwmod device | ||
| 28 | * @firmware: name of firmware file to load | ||
| 29 | * @mbox_name: name of omap mailbox device to use with this rproc | ||
| 30 | * @ops: start/stop rproc handlers | ||
| 31 | * @device_enable: omap-specific handler for enabling a device | ||
| 32 | * @device_shutdown: omap-specific handler for shutting down a device | ||
| 33 | */ | ||
| 34 | struct omap_rproc_pdata { | ||
| 35 | const char *name; | ||
| 36 | const char *oh_name; | ||
| 37 | const char *oh_name_opt; | ||
| 38 | const char *firmware; | ||
| 39 | const char *mbox_name; | ||
| 40 | const struct rproc_ops *ops; | ||
| 41 | int (*device_enable) (struct platform_device *pdev); | ||
| 42 | int (*device_shutdown) (struct platform_device *pdev); | ||
| 43 | }; | ||
| 44 | |||
| 45 | #if defined(CONFIG_OMAP_REMOTEPROC) || defined(CONFIG_OMAP_REMOTEPROC_MODULE) | ||
| 46 | |||
| 47 | void __init omap_rproc_reserve_cma(void); | ||
| 48 | |||
| 49 | #else | ||
| 50 | |||
| 51 | void __init omap_rproc_reserve_cma(void) | ||
| 52 | { | ||
| 53 | } | ||
| 54 | |||
| 55 | #endif | ||
| 56 | |||
| 57 | #endif /* _PLAT_REMOTEPROC_H */ | ||
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h new file mode 100644 index 000000000000..a357eb26bd25 --- /dev/null +++ b/include/linux/platform_data/spi-omap2-mcspi.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | #ifndef _OMAP2_MCSPI_H | ||
| 2 | #define _OMAP2_MCSPI_H | ||
| 3 | |||
| 4 | #define OMAP2_MCSPI_REV 0 | ||
| 5 | #define OMAP3_MCSPI_REV 1 | ||
| 6 | #define OMAP4_MCSPI_REV 2 | ||
| 7 | |||
| 8 | #define OMAP4_MCSPI_REG_OFFSET 0x100 | ||
| 9 | |||
| 10 | struct omap2_mcspi_platform_config { | ||
| 11 | unsigned short num_cs; | ||
| 12 | unsigned int regs_offset; | ||
| 13 | }; | ||
| 14 | |||
| 15 | struct omap2_mcspi_dev_attr { | ||
| 16 | unsigned short num_chipselect; | ||
| 17 | }; | ||
| 18 | |||
| 19 | struct omap2_mcspi_device_config { | ||
| 20 | unsigned turbo_mode:1; | ||
| 21 | }; | ||
| 22 | |||
| 23 | #endif | ||
diff --git a/include/linux/platform_data/voltage-omap.h b/include/linux/platform_data/voltage-omap.h new file mode 100644 index 000000000000..5be4d5def427 --- /dev/null +++ b/include/linux/platform_data/voltage-omap.h | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | /* | ||
| 2 | * OMAP Voltage Management Routines | ||
| 3 | * | ||
| 4 | * Copyright (C) 2011, Texas Instruments, Inc. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ARCH_ARM_OMAP_VOLTAGE_H | ||
| 12 | #define __ARCH_ARM_OMAP_VOLTAGE_H | ||
| 13 | |||
| 14 | /** | ||
| 15 | * struct omap_volt_data - Omap voltage specific data. | ||
| 16 | * @voltage_nominal: The possible voltage value in uV | ||
| 17 | * @sr_efuse_offs: The offset of the efuse register(from system | ||
| 18 | * control module base address) from where to read | ||
| 19 | * the n-target value for the smartreflex module. | ||
| 20 | * @sr_errminlimit: Error min limit value for smartreflex. This value | ||
| 21 | * differs at differnet opp and thus is linked | ||
| 22 | * with voltage. | ||
| 23 | * @vp_errorgain: Error gain value for the voltage processor. This | ||
| 24 | * field also differs according to the voltage/opp. | ||
| 25 | */ | ||
| 26 | struct omap_volt_data { | ||
| 27 | u32 volt_nominal; | ||
| 28 | u32 sr_efuse_offs; | ||
| 29 | u8 sr_errminlimit; | ||
| 30 | u8 vp_errgain; | ||
| 31 | }; | ||
| 32 | struct voltagedomain; | ||
| 33 | |||
| 34 | struct voltagedomain *voltdm_lookup(const char *name); | ||
| 35 | int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt); | ||
| 36 | unsigned long voltdm_get_voltage(struct voltagedomain *voltdm); | ||
| 37 | struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm, | ||
| 38 | unsigned long volt); | ||
| 39 | #endif | ||
diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h index 3101e62a1213..4a496ebc7d73 100644 --- a/include/linux/power/smartreflex.h +++ b/include/linux/power/smartreflex.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <plat/voltage.h> | 26 | #include <linux/platform_data/voltage-omap.h> |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * Different Smartreflex IPs version. The v1 is the 65nm version used in | 29 | * Different Smartreflex IPs version. The v1 is the 65nm version used in |
