mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
i2c/tps65010: move header to <linux/i2c/...>
Move the tps65010 header file from the OMAP arch directory to the more generic <linux/i2c/...> directory, and remove the spurious dependency of this driver on OMAP. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
parent
caada32afe
commit
6d16bfb5e8
@ -27,6 +27,7 @@
|
||||
#include <linux/mtd/nand.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/gpio.h>
|
||||
@ -36,7 +37,6 @@
|
||||
#include <asm/mach/flash.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include <asm/arch/tps65010.h>
|
||||
#include <asm/arch/mux.h>
|
||||
#include <asm/arch/tc.h>
|
||||
#include <asm/arch/irda.h>
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include <linux/mtd/nand.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#include <asm/setup.h>
|
||||
#include <asm/page.h>
|
||||
@ -37,7 +38,6 @@
|
||||
#include <asm/mach/flash.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include <asm/arch/tps65010.h>
|
||||
#include <asm/arch/gpioexpander.h>
|
||||
#include <asm/arch/irqs.h>
|
||||
#include <asm/arch/mux.h>
|
||||
|
@ -37,6 +37,8 @@
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/gpio.h>
|
||||
|
||||
@ -46,7 +48,6 @@
|
||||
#include <asm/mach/flash.h>
|
||||
|
||||
#include <asm/arch/usb.h>
|
||||
#include <asm/arch/tps65010.h>
|
||||
#include <asm/arch/mux.h>
|
||||
#include <asm/arch/tc.h>
|
||||
#include <asm/arch/common.h>
|
||||
|
@ -5,13 +5,13 @@
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/leds.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include <asm/arch/gpio.h>
|
||||
#include <asm/arch/tps65010.h>
|
||||
|
||||
#include "leds.h"
|
||||
|
||||
|
@ -88,12 +88,8 @@ config ISP1301_OMAP
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called isp1301_omap.
|
||||
|
||||
# NOTE: This isn't really OMAP-specific, except for the current
|
||||
# interface location in <include/asm-arm/arch-omap/tps65010.h>
|
||||
# and having mostly OMAP-specific board support
|
||||
config TPS65010
|
||||
tristate "TPS6501x Power Management chips"
|
||||
depends on ARCH_OMAP
|
||||
default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
|
||||
help
|
||||
If you say yes here you get support for the TPS6501x series of
|
||||
|
@ -100,7 +100,7 @@ struct isp1301 {
|
||||
|
||||
#if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE)
|
||||
|
||||
#include <asm/arch/tps65010.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#else
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#include <asm/arch/tps65010.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <linux/mmc/card.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/scatterlist.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
@ -35,7 +36,6 @@
|
||||
#include <asm/arch/dma.h>
|
||||
#include <asm/arch/mux.h>
|
||||
#include <asm/arch/fpga.h>
|
||||
#include <asm/arch/tps65010.h>
|
||||
|
||||
#define OMAP_MMC_REG_CMD 0x00
|
||||
#define OMAP_MMC_REG_ARGL 0x04
|
||||
|
@ -47,7 +47,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_TPS65010
|
||||
#include <asm/arch/tps65010.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
#else
|
||||
|
||||
#define LOW 0
|
||||
|
@ -21,9 +21,9 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#include <asm/arch/gpio.h>
|
||||
#include <asm/arch/tps65010.h>
|
||||
#include <asm/arch/omapfb.h>
|
||||
|
||||
#define MODULE_NAME "omapfb-lcd_h3"
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* linux/include/asm-arm/arch-omap/tps65010.h
|
||||
/* linux/i2c/tps65010.h
|
||||
*
|
||||
* Functions to access TPS65010 power management device.
|
||||
*
|
||||
@ -25,8 +25,8 @@
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_TPS65010_H
|
||||
#define __ASM_ARCH_TPS65010_H
|
||||
#ifndef __LINUX_I2C_TPS65010_H
|
||||
#define __LINUX_I2C_TPS65010_H
|
||||
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
@ -152,5 +152,5 @@ extern int tps65010_config_vregs1(unsigned value);
|
||||
*/
|
||||
extern int tps65013_set_low_pwr(unsigned mode);
|
||||
|
||||
#endif /* __ASM_ARCH_TPS65010_H */
|
||||
#endif /* __LINUX_I2C_TPS65010_H */
|
||||
|
Loading…
Reference in New Issue
Block a user