Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6d16bfb5e81d3925a7efb38b5cc3e0021b57d03a
Commit:     6d16bfb5e81d3925a7efb38b5cc3e0021b57d03a
Parent:     caada32afe0d181b1dc36ab3fc29628582776e09
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 27 18:14:49 2008 +0100
Committer:  Jean Delvare <[EMAIL PROTECTED]>
CommitDate: Sun Jan 27 18:14:49 2008 +0100

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
---
 arch/arm/mach-omap1/board-h2.c       |    2 +-
 arch/arm/mach-omap1/board-h3.c       |    2 +-
 arch/arm/mach-omap1/board-osk.c      |    3 +-
 arch/arm/mach-omap1/leds-osk.c       |    2 +-
 drivers/i2c/chips/Kconfig            |    4 -
 drivers/i2c/chips/isp1301_omap.c     |    2 +-
 drivers/i2c/chips/tps65010.c         |    2 +-
 drivers/mmc/host/omap.c              |    2 +-
 drivers/usb/host/ohci-omap.c         |    2 +-
 drivers/video/omap/lcd_h3.c          |    2 +-
 include/asm-arm/arch-omap/tps65010.h |  156 ----------------------------------
 include/linux/i2c/tps65010.h         |  156 ++++++++++++++++++++++++++++++++++
 12 files changed, 166 insertions(+), 169 deletions(-)

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 1306812..9393824 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 4f84ae2..978cdab 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 5db182d..5b575e6 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -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>
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 86de303..6939d5e 100644
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -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"
 
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index fe3008e..bd7082c 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -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
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index ebfbb29..2a31601 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -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
 
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index e320994..4154a91 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -31,7 +31,7 @@
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
 
-#include <asm/arch/tps65010.h>
+#include <linux/i2c/tps65010.h>
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 971e18b..c9dfeb1 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -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
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 5cfa3d1..74e1f4b 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -47,7 +47,7 @@
 #endif
 
 #ifdef CONFIG_TPS65010
-#include <asm/arch/tps65010.h>
+#include <linux/i2c/tps65010.h>
 #else
 
 #define LOW    0
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index c604d93..31e9783 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -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"
diff --git a/include/asm-arm/arch-omap/tps65010.h 
b/include/asm-arm/arch-omap/tps65010.h
deleted file mode 100644
index b9aa2b3..0000000
--- a/include/asm-arm/arch-omap/tps65010.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* linux/include/asm-arm/arch-omap/tps65010.h
- *
- * Functions to access TPS65010 power management device.
- *
- * Copyright (C) 2004 Dirk Behme <[EMAIL PROTECTED]>
- *
- * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __ASM_ARCH_TPS65010_H
-#define __ASM_ARCH_TPS65010_H
-
-/*
- * ----------------------------------------------------------------------------
- * Registers, all 8 bits
- * ----------------------------------------------------------------------------
- */
-
-#define        TPS_CHGSTATUS           0x01
-#      define  TPS_CHG_USB             (1 << 7)
-#      define  TPS_CHG_AC              (1 << 6)
-#      define  TPS_CHG_THERM           (1 << 5)
-#      define  TPS_CHG_TERM            (1 << 4)
-#      define  TPS_CHG_TAPER_TMO       (1 << 3)
-#      define  TPS_CHG_CHG_TMO         (1 << 2)
-#      define  TPS_CHG_PRECHG_TMO      (1 << 1)
-#      define  TPS_CHG_TEMP_ERR        (1 << 0)
-#define        TPS_REGSTATUS           0x02
-#      define  TPS_REG_ONOFF           (1 << 7)
-#      define  TPS_REG_COVER           (1 << 6)
-#      define  TPS_REG_UVLO            (1 << 5)
-#      define  TPS_REG_NO_CHG          (1 << 4)        /* tps65013 */
-#      define  TPS_REG_PG_LD02         (1 << 3)
-#      define  TPS_REG_PG_LD01         (1 << 2)
-#      define  TPS_REG_PG_MAIN         (1 << 1)
-#      define  TPS_REG_PG_CORE         (1 << 0)
-#define        TPS_MASK1               0x03
-#define        TPS_MASK2               0x04
-#define        TPS_ACKINT1             0x05
-#define        TPS_ACKINT2             0x06
-#define        TPS_CHGCONFIG           0x07
-#      define  TPS_CHARGE_POR          (1 << 7)        /* 65010/65012 */
-#      define  TPS65013_AUA            (1 << 7)        /* 65011/65013 */
-#      define  TPS_CHARGE_RESET        (1 << 6)
-#      define  TPS_CHARGE_FAST         (1 << 5)
-#      define  TPS_CHARGE_CURRENT      (3 << 3)
-#      define  TPS_VBUS_500MA          (1 << 2)
-#      define  TPS_VBUS_CHARGING       (1 << 1)
-#      define  TPS_CHARGE_ENABLE       (1 << 0)
-#define        TPS_LED1_ON             0x08
-#define        TPS_LED1_PER            0x09
-#define        TPS_LED2_ON             0x0a
-#define        TPS_LED2_PER            0x0b
-#define        TPS_VDCDC1              0x0c
-#      define  TPS_ENABLE_LP           (1 << 3)
-#define        TPS_VDCDC2              0x0d
-#define        TPS_VREGS1              0x0e
-#      define  TPS_LDO2_ENABLE (1 << 7)
-#      define  TPS_LDO2_OFF    (1 << 6)
-#      define  TPS_VLDO2_3_0V  (3 << 4)
-#      define  TPS_VLDO2_2_75V (2 << 4)
-#      define  TPS_VLDO2_2_5V  (1 << 4)
-#      define  TPS_VLDO2_1_8V  (0 << 4)
-#      define  TPS_LDO1_ENABLE (1 << 3)
-#      define  TPS_LDO1_OFF    (1 << 2)
-#      define  TPS_VLDO1_3_0V  (3 << 0)
-#      define  TPS_VLDO1_2_75V (2 << 0)
-#      define  TPS_VLDO1_2_5V  (1 << 0)
-#      define  TPS_VLDO1_ADJ   (0 << 0)
-#define        TPS_MASK3               0x0f
-#define        TPS_DEFGPIO             0x10
-
-/*
- * ----------------------------------------------------------------------------
- * Macros used by exported functions
- * ----------------------------------------------------------------------------
- */
-
-#define LED1  1
-#define LED2  2
-#define OFF   0
-#define ON    1
-#define BLINK 2
-#define GPIO1 1
-#define GPIO2 2
-#define GPIO3 3
-#define GPIO4 4
-#define LOW   0
-#define HIGH  1
-
-/*
- * ----------------------------------------------------------------------------
- * Exported functions
- * ----------------------------------------------------------------------------
- */
-
-/* Draw from VBUS:
- *   0 mA -- DON'T DRAW (might supply power instead)
- * 100 mA -- usb unit load (slowest charge rate)
- * 500 mA -- usb high power (fast battery charge)
- */
-extern int tps65010_set_vbus_draw(unsigned mA);
-
-/* tps65010_set_gpio_out_value parameter:
- * gpio:  GPIO1, GPIO2, GPIO3 or GPIO4
- * value: LOW or HIGH
- */
-extern int tps65010_set_gpio_out_value(unsigned gpio, unsigned value);
-
-/* tps65010_set_led parameter:
- * led:  LED1 or LED2
- * mode: ON, OFF or BLINK
- */
-extern int tps65010_set_led(unsigned led, unsigned mode);
-
-/* tps65010_set_vib parameter:
- * value: ON or OFF
- */
-extern int tps65010_set_vib(unsigned value);
-
-/* tps65010_set_low_pwr parameter:
- * mode: ON or OFF
- */
-extern int tps65010_set_low_pwr(unsigned mode);
-
-/* tps65010_config_vregs1 parameter:
- * value to be written to VREGS1 register
- * Note: The complete register is written, set all bits you need
- */
-extern int tps65010_config_vregs1(unsigned value);
-
-/* tps65013_set_low_pwr parameter:
- * mode: ON or OFF
- */
-extern int tps65013_set_low_pwr(unsigned mode);
-
-#endif /*  __ASM_ARCH_TPS65010_H */
-
diff --git a/include/linux/i2c/tps65010.h b/include/linux/i2c/tps65010.h
new file mode 100644
index 0000000..7021635
--- /dev/null
+++ b/include/linux/i2c/tps65010.h
@@ -0,0 +1,156 @@
+/* linux/i2c/tps65010.h
+ *
+ * Functions to access TPS65010 power management device.
+ *
+ * Copyright (C) 2004 Dirk Behme <[EMAIL PROTECTED]>
+ *
+ * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * 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.,
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __LINUX_I2C_TPS65010_H
+#define __LINUX_I2C_TPS65010_H
+
+/*
+ * ----------------------------------------------------------------------------
+ * Registers, all 8 bits
+ * ----------------------------------------------------------------------------
+ */
+
+#define        TPS_CHGSTATUS           0x01
+#      define  TPS_CHG_USB             (1 << 7)
+#      define  TPS_CHG_AC              (1 << 6)
+#      define  TPS_CHG_THERM           (1 << 5)
+#      define  TPS_CHG_TERM            (1 << 4)
+#      define  TPS_CHG_TAPER_TMO       (1 << 3)
+#      define  TPS_CHG_CHG_TMO         (1 << 2)
+#      define  TPS_CHG_PRECHG_TMO      (1 << 1)
+#      define  TPS_CHG_TEMP_ERR        (1 << 0)
+#define        TPS_REGSTATUS           0x02
+#      define  TPS_REG_ONOFF           (1 << 7)
+#      define  TPS_REG_COVER           (1 << 6)
+#      define  TPS_REG_UVLO            (1 << 5)
+#      define  TPS_REG_NO_CHG          (1 << 4)        /* tps65013 */
+#      define  TPS_REG_PG_LD02         (1 << 3)
+#      define  TPS_REG_PG_LD01         (1 << 2)
+#      define  TPS_REG_PG_MAIN         (1 << 1)
+#      define  TPS_REG_PG_CORE         (1 << 0)
+#define        TPS_MASK1               0x03
+#define        TPS_MASK2               0x04
+#define        TPS_ACKINT1             0x05
+#define        TPS_ACKINT2             0x06
+#define        TPS_CHGCONFIG           0x07
+#      define  TPS_CHARGE_POR          (1 << 7)        /* 65010/65012 */
+#      define  TPS65013_AUA            (1 << 7)        /* 65011/65013 */
+#      define  TPS_CHARGE_RESET        (1 << 6)
+#      define  TPS_CHARGE_FAST         (1 << 5)
+#      define  TPS_CHARGE_CURRENT      (3 << 3)
+#      define  TPS_VBUS_500MA          (1 << 2)
+#      define  TPS_VBUS_CHARGING       (1 << 1)
+#      define  TPS_CHARGE_ENABLE       (1 << 0)
+#define        TPS_LED1_ON             0x08
+#define        TPS_LED1_PER            0x09
+#define        TPS_LED2_ON             0x0a
+#define        TPS_LED2_PER            0x0b
+#define        TPS_VDCDC1              0x0c
+#      define  TPS_ENABLE_LP           (1 << 3)
+#define        TPS_VDCDC2              0x0d
+#define        TPS_VREGS1              0x0e
+#      define  TPS_LDO2_ENABLE (1 << 7)
+#      define  TPS_LDO2_OFF    (1 << 6)
+#      define  TPS_VLDO2_3_0V  (3 << 4)
+#      define  TPS_VLDO2_2_75V (2 << 4)
+#      define  TPS_VLDO2_2_5V  (1 << 4)
+#      define  TPS_VLDO2_1_8V  (0 << 4)
+#      define  TPS_LDO1_ENABLE (1 << 3)
+#      define  TPS_LDO1_OFF    (1 << 2)
+#      define  TPS_VLDO1_3_0V  (3 << 0)
+#      define  TPS_VLDO1_2_75V (2 << 0)
+#      define  TPS_VLDO1_2_5V  (1 << 0)
+#      define  TPS_VLDO1_ADJ   (0 << 0)
+#define        TPS_MASK3               0x0f
+#define        TPS_DEFGPIO             0x10
+
+/*
+ * ----------------------------------------------------------------------------
+ * Macros used by exported functions
+ * ----------------------------------------------------------------------------
+ */
+
+#define LED1  1
+#define LED2  2
+#define OFF   0
+#define ON    1
+#define BLINK 2
+#define GPIO1 1
+#define GPIO2 2
+#define GPIO3 3
+#define GPIO4 4
+#define LOW   0
+#define HIGH  1
+
+/*
+ * ----------------------------------------------------------------------------
+ * Exported functions
+ * ----------------------------------------------------------------------------
+ */
+
+/* Draw from VBUS:
+ *   0 mA -- DON'T DRAW (might supply power instead)
+ * 100 mA -- usb unit load (slowest charge rate)
+ * 500 mA -- usb high power (fast battery charge)
+ */
+extern int tps65010_set_vbus_draw(unsigned mA);
+
+/* tps65010_set_gpio_out_value parameter:
+ * gpio:  GPIO1, GPIO2, GPIO3 or GPIO4
+ * value: LOW or HIGH
+ */
+extern int tps65010_set_gpio_out_value(unsigned gpio, unsigned value);
+
+/* tps65010_set_led parameter:
+ * led:  LED1 or LED2
+ * mode: ON, OFF or BLINK
+ */
+extern int tps65010_set_led(unsigned led, unsigned mode);
+
+/* tps65010_set_vib parameter:
+ * value: ON or OFF
+ */
+extern int tps65010_set_vib(unsigned value);
+
+/* tps65010_set_low_pwr parameter:
+ * mode: ON or OFF
+ */
+extern int tps65010_set_low_pwr(unsigned mode);
+
+/* tps65010_config_vregs1 parameter:
+ * value to be written to VREGS1 register
+ * Note: The complete register is written, set all bits you need
+ */
+extern int tps65010_config_vregs1(unsigned value);
+
+/* tps65013_set_low_pwr parameter:
+ * mode: ON or OFF
+ */
+extern int tps65013_set_low_pwr(unsigned mode);
+
+#endif /*  __LINUX_I2C_TPS65010_H */
+
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to