diff options
Diffstat (limited to 'packages/linux/linux-2.6.28/collie/0011-move-drivers-mfd-.h-to-include-linux-mfd.patch')
| -rw-r--r-- | packages/linux/linux-2.6.28/collie/0011-move-drivers-mfd-.h-to-include-linux-mfd.patch | 803 |
1 files changed, 0 insertions, 803 deletions
diff --git a/packages/linux/linux-2.6.28/collie/0011-move-drivers-mfd-.h-to-include-linux-mfd.patch b/packages/linux/linux-2.6.28/collie/0011-move-drivers-mfd-.h-to-include-linux-mfd.patch deleted file mode 100644 index 0bc3dbb713..0000000000 --- a/packages/linux/linux-2.6.28/collie/0011-move-drivers-mfd-.h-to-include-linux-mfd.patch +++ /dev/null @@ -1,803 +0,0 @@ -From c69779dac8693a3b057b3708d19f7013c6973bf2 Mon Sep 17 00:00:00 2001 -From: Thomas Kunze <thommycheck@gmx.de> -Date: Tue, 10 Feb 2009 14:54:57 +0100 -Subject: [PATCH 11/23] move drivers/mfd/*.h to include/linux/mfd - -So drivers like collie_battery driver can use -those files easier. ---- - arch/arm/mach-sa1100/collie_pm.c | 2 +- - drivers/mfd/mcp-core.c | 2 +- - drivers/mfd/mcp-sa11x0.c | 2 +- - drivers/mfd/mcp.h | 66 ---------- - drivers/mfd/ucb1x00-assabet.c | 2 +- - drivers/mfd/ucb1x00-core.c | 2 +- - drivers/mfd/ucb1x00-ts.c | 2 +- - drivers/mfd/ucb1x00.h | 255 -------------------------------------- - include/linux/mfd/mcp.h | 68 ++++++++++ - include/linux/mfd/ucb1x00.h | 255 ++++++++++++++++++++++++++++++++++++++ - 10 files changed, 329 insertions(+), 327 deletions(-) - delete mode 100644 drivers/mfd/mcp.h - delete mode 100644 drivers/mfd/ucb1x00.h - create mode 100644 include/linux/mfd/mcp.h - create mode 100644 include/linux/mfd/ucb1x00.h - -diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c -index b1161fc..65b8b31 100644 ---- a/arch/arm/mach-sa1100/collie_pm.c -+++ b/arch/arm/mach-sa1100/collie_pm.c -@@ -22,6 +22,7 @@ - #include <linux/interrupt.h> - #include <linux/device.h> - #include <linux/platform_device.h> -+#include <linux/mfd/ucb1x00.h> - - #include <asm/irq.h> - #include <mach/hardware.h> -@@ -31,7 +32,6 @@ - #include <asm/mach/sharpsl_param.h> - #include <asm/hardware/sharpsl_pm.h> - --#include "../drivers/mfd/ucb1x00.h" - - static struct ucb1x00 *ucb; - static int ad_revise; -diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c -index b4ed57e..64c806a 100644 ---- a/drivers/mfd/mcp-core.c -+++ b/drivers/mfd/mcp-core.c -@@ -17,11 +17,11 @@ - #include <linux/device.h> - #include <linux/slab.h> - #include <linux/string.h> -+#include <linux/mfd/mcp.h> - - #include <asm/dma.h> - #include <asm/system.h> - --#include "mcp.h" - - #define to_mcp(d) container_of(d, struct mcp, attached_device) - #define to_mcp_driver(d) container_of(d, struct mcp_driver, drv) -diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c -index 28380b2..88c81cf 100644 ---- a/drivers/mfd/mcp-sa11x0.c -+++ b/drivers/mfd/mcp-sa11x0.c -@@ -19,6 +19,7 @@ - #include <linux/spinlock.h> - #include <linux/slab.h> - #include <linux/platform_device.h> -+#include <linux/mfd/mcp.h> - - #include <asm/dma.h> - #include <mach/hardware.h> -@@ -28,7 +29,6 @@ - - #include <mach/assabet.h> - --#include "mcp.h" - - struct mcp_sa11x0 { - u32 mccr0; -diff --git a/drivers/mfd/mcp.h b/drivers/mfd/mcp.h -deleted file mode 100644 -index c093a93..0000000 ---- a/drivers/mfd/mcp.h -+++ /dev/null -@@ -1,66 +0,0 @@ --/* -- * linux/drivers/mfd/mcp.h -- * -- * Copyright (C) 2001 Russell King, All Rights Reserved. -- * -- * 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. -- */ --#ifndef MCP_H --#define MCP_H -- --struct mcp_ops; -- --struct mcp { -- struct module *owner; -- struct mcp_ops *ops; -- spinlock_t lock; -- int use_count; -- unsigned int sclk_rate; -- unsigned int rw_timeout; -- dma_device_t dma_audio_rd; -- dma_device_t dma_audio_wr; -- dma_device_t dma_telco_rd; -- dma_device_t dma_telco_wr; -- struct device attached_device; --}; -- --struct mcp_ops { -- void (*set_telecom_divisor)(struct mcp *, unsigned int); -- void (*set_audio_divisor)(struct mcp *, unsigned int); -- void (*reg_write)(struct mcp *, unsigned int, unsigned int); -- unsigned int (*reg_read)(struct mcp *, unsigned int); -- void (*enable)(struct mcp *); -- void (*disable)(struct mcp *); --}; -- --void mcp_set_telecom_divisor(struct mcp *, unsigned int); --void mcp_set_audio_divisor(struct mcp *, unsigned int); --void mcp_reg_write(struct mcp *, unsigned int, unsigned int); --unsigned int mcp_reg_read(struct mcp *, unsigned int); --void mcp_enable(struct mcp *); --void mcp_disable(struct mcp *); --#define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) -- --struct mcp *mcp_host_alloc(struct device *, size_t); --int mcp_host_register(struct mcp *); --void mcp_host_unregister(struct mcp *); -- --struct mcp_driver { -- struct device_driver drv; -- int (*probe)(struct mcp *); -- void (*remove)(struct mcp *); -- int (*suspend)(struct mcp *, pm_message_t); -- int (*resume)(struct mcp *); --}; -- --int mcp_driver_register(struct mcp_driver *); --void mcp_driver_unregister(struct mcp_driver *); -- --#define mcp_get_drvdata(mcp) dev_get_drvdata(&(mcp)->attached_device) --#define mcp_set_drvdata(mcp,d) dev_set_drvdata(&(mcp)->attached_device, d) -- --#define mcp_priv(mcp) ((void *)((mcp)+1)) -- --#endif -diff --git a/drivers/mfd/ucb1x00-assabet.c b/drivers/mfd/ucb1x00-assabet.c -index 61aeaf7..0f6f46d 100644 ---- a/drivers/mfd/ucb1x00-assabet.c -+++ b/drivers/mfd/ucb1x00-assabet.c -@@ -14,10 +14,10 @@ - #include <linux/fs.h> - #include <linux/proc_fs.h> - #include <linux/device.h> -+#include <linux/mfd/ucb1x00.h> - - #include <asm/dma.h> - --#include "ucb1x00.h" - - #define UCB1X00_ATTR(name,input)\ - static ssize_t name##_show(struct device *dev, struct device_attribute *attr, \ -diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c -index a316f1b..bc2c1ba 100644 ---- a/drivers/mfd/ucb1x00-core.c -+++ b/drivers/mfd/ucb1x00-core.c -@@ -24,11 +24,11 @@ - #include <linux/interrupt.h> - #include <linux/device.h> - #include <linux/mutex.h> -+#include <linux/mfd/ucb1x00.h> - - #include <asm/dma.h> - #include <mach/hardware.h> - --#include "ucb1x00.h" - - static DEFINE_MUTEX(ucb1x00_mutex); - static LIST_HEAD(ucb1x00_drivers); -diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c -index 44762ca..b5feae9 100644 ---- a/drivers/mfd/ucb1x00-ts.c -+++ b/drivers/mfd/ucb1x00-ts.c -@@ -30,12 +30,12 @@ - #include <linux/freezer.h> - #include <linux/slab.h> - #include <linux/kthread.h> -+#include <linux/mfd/ucb1x00.h> - - #include <asm/dma.h> - #include <mach/collie.h> - #include <asm/mach-types.h> - --#include "ucb1x00.h" - - - struct ucb1x00_ts { -diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h -deleted file mode 100644 -index a8ad8a0..0000000 ---- a/drivers/mfd/ucb1x00.h -+++ /dev/null -@@ -1,255 +0,0 @@ --/* -- * linux/drivers/mfd/ucb1x00.h -- * -- * Copyright (C) 2001 Russell King, All Rights Reserved. -- * -- * 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. -- */ --#ifndef UCB1200_H --#define UCB1200_H -- --#define UCB_IO_DATA 0x00 --#define UCB_IO_DIR 0x01 -- --#define UCB_IO_0 (1 << 0) --#define UCB_IO_1 (1 << 1) --#define UCB_IO_2 (1 << 2) --#define UCB_IO_3 (1 << 3) --#define UCB_IO_4 (1 << 4) --#define UCB_IO_5 (1 << 5) --#define UCB_IO_6 (1 << 6) --#define UCB_IO_7 (1 << 7) --#define UCB_IO_8 (1 << 8) --#define UCB_IO_9 (1 << 9) -- --#define UCB_IE_RIS 0x02 --#define UCB_IE_FAL 0x03 --#define UCB_IE_STATUS 0x04 --#define UCB_IE_CLEAR 0x04 --#define UCB_IE_ADC (1 << 11) --#define UCB_IE_TSPX (1 << 12) --#define UCB_IE_TSMX (1 << 13) --#define UCB_IE_TCLIP (1 << 14) --#define UCB_IE_ACLIP (1 << 15) -- --#define UCB_IRQ_TSPX 12 -- --#define UCB_TC_A 0x05 --#define UCB_TC_A_LOOP (1 << 7) /* UCB1200 */ --#define UCB_TC_A_AMPL (1 << 7) /* UCB1300 */ -- --#define UCB_TC_B 0x06 --#define UCB_TC_B_VOICE_ENA (1 << 3) --#define UCB_TC_B_CLIP (1 << 4) --#define UCB_TC_B_ATT (1 << 6) --#define UCB_TC_B_SIDE_ENA (1 << 11) --#define UCB_TC_B_MUTE (1 << 13) --#define UCB_TC_B_IN_ENA (1 << 14) --#define UCB_TC_B_OUT_ENA (1 << 15) -- --#define UCB_AC_A 0x07 --#define UCB_AC_B 0x08 --#define UCB_AC_B_LOOP (1 << 8) --#define UCB_AC_B_MUTE (1 << 13) --#define UCB_AC_B_IN_ENA (1 << 14) --#define UCB_AC_B_OUT_ENA (1 << 15) -- --#define UCB_TS_CR 0x09 --#define UCB_TS_CR_TSMX_POW (1 << 0) --#define UCB_TS_CR_TSPX_POW (1 << 1) --#define UCB_TS_CR_TSMY_POW (1 << 2) --#define UCB_TS_CR_TSPY_POW (1 << 3) --#define UCB_TS_CR_TSMX_GND (1 << 4) --#define UCB_TS_CR_TSPX_GND (1 << 5) --#define UCB_TS_CR_TSMY_GND (1 << 6) --#define UCB_TS_CR_TSPY_GND (1 << 7) --#define UCB_TS_CR_MODE_INT (0 << 8) --#define UCB_TS_CR_MODE_PRES (1 << 8) --#define UCB_TS_CR_MODE_POS (2 << 8) --#define UCB_TS_CR_BIAS_ENA (1 << 11) --#define UCB_TS_CR_TSPX_LOW (1 << 12) --#define UCB_TS_CR_TSMX_LOW (1 << 13) -- --#define UCB_ADC_CR 0x0a --#define UCB_ADC_SYNC_ENA (1 << 0) --#define UCB_ADC_VREFBYP_CON (1 << 1) --#define UCB_ADC_INP_TSPX (0 << 2) --#define UCB_ADC_INP_TSMX (1 << 2) --#define UCB_ADC_INP_TSPY (2 << 2) --#define UCB_ADC_INP_TSMY (3 << 2) --#define UCB_ADC_INP_AD0 (4 << 2) --#define UCB_ADC_INP_AD1 (5 << 2) --#define UCB_ADC_INP_AD2 (6 << 2) --#define UCB_ADC_INP_AD3 (7 << 2) --#define UCB_ADC_EXT_REF (1 << 5) --#define UCB_ADC_START (1 << 7) --#define UCB_ADC_ENA (1 << 15) -- --#define UCB_ADC_DATA 0x0b --#define UCB_ADC_DAT_VAL (1 << 15) --#define UCB_ADC_DAT(x) (((x) & 0x7fe0) >> 5) -- --#define UCB_ID 0x0c --#define UCB_ID_1200 0x1004 --#define UCB_ID_1300 0x1005 --#define UCB_ID_TC35143 0x9712 -- --#define UCB_MODE 0x0d --#define UCB_MODE_DYN_VFLAG_ENA (1 << 12) --#define UCB_MODE_AUD_OFF_CAN (1 << 13) -- --#include "mcp.h" -- --struct ucb1x00_irq { -- void *devid; -- void (*fn)(int, void *); --}; -- --struct ucb1x00 { -- spinlock_t lock; -- struct mcp *mcp; -- unsigned int irq; -- struct semaphore adc_sem; -- spinlock_t io_lock; -- u16 id; -- u16 io_dir; -- u16 io_out; -- u16 adc_cr; -- u16 irq_fal_enbl; -- u16 irq_ris_enbl; -- struct ucb1x00_irq irq_handler[16]; -- struct device dev; -- struct list_head node; -- struct list_head devs; --}; -- --struct ucb1x00_driver; -- --struct ucb1x00_dev { -- struct list_head dev_node; -- struct list_head drv_node; -- struct ucb1x00 *ucb; -- struct ucb1x00_driver *drv; -- void *priv; --}; -- --struct ucb1x00_driver { -- struct list_head node; -- struct list_head devs; -- int (*add)(struct ucb1x00_dev *dev); -- void (*remove)(struct ucb1x00_dev *dev); -- int (*suspend)(struct ucb1x00_dev *dev, pm_message_t state); -- int (*resume)(struct ucb1x00_dev *dev); --}; -- --#define classdev_to_ucb1x00(cd) container_of(cd, struct ucb1x00, dev) -- --int ucb1x00_register_driver(struct ucb1x00_driver *); --void ucb1x00_unregister_driver(struct ucb1x00_driver *); -- --/** -- * ucb1x00_clkrate - return the UCB1x00 SIB clock rate -- * @ucb: UCB1x00 structure describing chip -- * -- * Return the SIB clock rate in Hz. -- */ --static inline unsigned int ucb1x00_clkrate(struct ucb1x00 *ucb) --{ -- return mcp_get_sclk_rate(ucb->mcp); --} -- --/** -- * ucb1x00_enable - enable the UCB1x00 SIB clock -- * @ucb: UCB1x00 structure describing chip -- * -- * Enable the SIB clock. This can be called multiple times. -- */ --static inline void ucb1x00_enable(struct ucb1x00 *ucb) --{ -- mcp_enable(ucb->mcp); --} -- --/** -- * ucb1x00_disable - disable the UCB1x00 SIB clock -- * @ucb: UCB1x00 structure describing chip -- * -- * Disable the SIB clock. The SIB clock will only be disabled -- * when the number of ucb1x00_enable calls match the number of -- * ucb1x00_disable calls. -- */ --static inline void ucb1x00_disable(struct ucb1x00 *ucb) --{ -- mcp_disable(ucb->mcp); --} -- --/** -- * ucb1x00_reg_write - write a UCB1x00 register -- * @ucb: UCB1x00 structure describing chip -- * @reg: UCB1x00 4-bit register index to write -- * @val: UCB1x00 16-bit value to write -- * -- * Write the UCB1x00 register @reg with value @val. The SIB -- * clock must be running for this function to return. -- */ --static inline void ucb1x00_reg_write(struct ucb1x00 *ucb, unsigned int reg, unsigned int val) --{ -- mcp_reg_write(ucb->mcp, reg, val); --} -- --/** -- * ucb1x00_reg_read - read a UCB1x00 register -- * @ucb: UCB1x00 structure describing chip -- * @reg: UCB1x00 4-bit register index to write -- * -- * Read the UCB1x00 register @reg and return its value. The SIB -- * clock must be running for this function to return. -- */ --static inline unsigned int ucb1x00_reg_read(struct ucb1x00 *ucb, unsigned int reg) --{ -- return mcp_reg_read(ucb->mcp, reg); --} --/** -- * ucb1x00_set_audio_divisor - -- * @ucb: UCB1x00 structure describing chip -- * @div: SIB clock divisor -- */ --static inline void ucb1x00_set_audio_divisor(struct ucb1x00 *ucb, unsigned int div) --{ -- mcp_set_audio_divisor(ucb->mcp, div); --} -- --/** -- * ucb1x00_set_telecom_divisor - -- * @ucb: UCB1x00 structure describing chip -- * @div: SIB clock divisor -- */ --static inline void ucb1x00_set_telecom_divisor(struct ucb1x00 *ucb, unsigned int div) --{ -- mcp_set_telecom_divisor(ucb->mcp, div); --} -- --void ucb1x00_io_set_dir(struct ucb1x00 *ucb, unsigned int, unsigned int); --void ucb1x00_io_write(struct ucb1x00 *ucb, unsigned int, unsigned int); --unsigned int ucb1x00_io_read(struct ucb1x00 *ucb); -- --#define UCB_NOSYNC (0) --#define UCB_SYNC (1) -- --unsigned int ucb1x00_adc_read(struct ucb1x00 *ucb, int adc_channel, int sync); --void ucb1x00_adc_enable(struct ucb1x00 *ucb); --void ucb1x00_adc_disable(struct ucb1x00 *ucb); -- --/* -- * Which edges of the IRQ do you want to control today? -- */ --#define UCB_RISING (1 << 0) --#define UCB_FALLING (1 << 1) -- --int ucb1x00_hook_irq(struct ucb1x00 *ucb, unsigned int idx, void (*fn)(int, void *), void *devid); --void ucb1x00_enable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges); --void ucb1x00_disable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges); --int ucb1x00_free_irq(struct ucb1x00 *ucb, unsigned int idx, void *devid); -- --#endif -diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h -new file mode 100644 -index 0000000..be95e09 ---- /dev/null -+++ b/include/linux/mfd/mcp.h -@@ -0,0 +1,68 @@ -+/* -+ * linux/drivers/mfd/mcp.h -+ * -+ * Copyright (C) 2001 Russell King, All Rights Reserved. -+ * -+ * 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. -+ */ -+#ifndef MCP_H -+#define MCP_H -+ -+#include <mach/dma.h> -+ -+struct mcp_ops; -+ -+struct mcp { -+ struct module *owner; -+ struct mcp_ops *ops; -+ spinlock_t lock; -+ int use_count; -+ unsigned int sclk_rate; -+ unsigned int rw_timeout; -+ dma_device_t dma_audio_rd; -+ dma_device_t dma_audio_wr; -+ dma_device_t dma_telco_rd; -+ dma_device_t dma_telco_wr; -+ struct device attached_device; -+}; -+ -+struct mcp_ops { -+ void (*set_telecom_divisor)(struct mcp *, unsigned int); -+ void (*set_audio_divisor)(struct mcp *, unsigned int); -+ void (*reg_write)(struct mcp *, unsigned int, unsigned int); -+ unsigned int (*reg_read)(struct mcp *, unsigned int); -+ void (*enable)(struct mcp *); -+ void (*disable)(struct mcp *); -+}; -+ -+void mcp_set_telecom_divisor(struct mcp *, unsigned int); -+void mcp_set_audio_divisor(struct mcp *, unsigned int); -+void mcp_reg_write(struct mcp *, unsigned int, unsigned int); -+unsigned int mcp_reg_read(struct mcp *, unsigned int); -+void mcp_enable(struct mcp *); -+void mcp_disable(struct mcp *); -+#define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) -+ -+struct mcp *mcp_host_alloc(struct device *, size_t); -+int mcp_host_register(struct mcp *); -+void mcp_host_unregister(struct mcp *); -+ -+struct mcp_driver { -+ struct device_driver drv; -+ int (*probe)(struct mcp *); -+ void (*remove)(struct mcp *); -+ int (*suspend)(struct mcp *, pm_message_t); -+ int (*resume)(struct mcp *); -+}; -+ -+int mcp_driver_register(struct mcp_driver *); -+void mcp_driver_unregister(struct mcp_driver *); -+ -+#define mcp_get_drvdata(mcp) dev_get_drvdata(&(mcp)->attached_device) -+#define mcp_set_drvdata(mcp,d) dev_set_drvdata(&(mcp)->attached_device, d) -+ -+#define mcp_priv(mcp) ((void *)((mcp)+1)) -+ -+#endif -diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h -new file mode 100644 -index 0000000..eac3463 ---- /dev/null -+++ b/include/linux/mfd/ucb1x00.h -@@ -0,0 +1,255 @@ -+/* -+ * linux/include/mfd/ucb1x00.h -+ * -+ * Copyright (C) 2001 Russell King, All Rights Reserved. -+ * -+ * 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. -+ */ -+#ifndef UCB1200_H -+#define UCB1200_H -+ -+#include <linux/mfd/mcp.h> -+#define UCB_IO_DATA 0x00 -+#define UCB_IO_DIR 0x01 -+ -+#define UCB_IO_0 (1 << 0) -+#define UCB_IO_1 (1 << 1) -+#define UCB_IO_2 (1 << 2) -+#define UCB_IO_3 (1 << 3) -+#define UCB_IO_4 (1 << 4) -+#define UCB_IO_5 (1 << 5) -+#define UCB_IO_6 (1 << 6) -+#define UCB_IO_7 (1 << 7) -+#define UCB_IO_8 (1 << 8) -+#define UCB_IO_9 (1 << 9) -+ -+#define UCB_IE_RIS 0x02 -+#define UCB_IE_FAL 0x03 -+#define UCB_IE_STATUS 0x04 -+#define UCB_IE_CLEAR 0x04 -+#define UCB_IE_ADC (1 << 11) -+#define UCB_IE_TSPX (1 << 12) -+#define UCB_IE_TSMX (1 << 13) -+#define UCB_IE_TCLIP (1 << 14) -+#define UCB_IE_ACLIP (1 << 15) -+ -+#define UCB_IRQ_TSPX 12 -+ -+#define UCB_TC_A 0x05 -+#define UCB_TC_A_LOOP (1 << 7) /* UCB1200 */ -+#define UCB_TC_A_AMPL (1 << 7) /* UCB1300 */ -+ -+#define UCB_TC_B 0x06 -+#define UCB_TC_B_VOICE_ENA (1 << 3) -+#define UCB_TC_B_CLIP (1 << 4) -+#define UCB_TC_B_ATT (1 << 6) -+#define UCB_TC_B_SIDE_ENA (1 << 11) -+#define UCB_TC_B_MUTE (1 << 13) -+#define UCB_TC_B_IN_ENA (1 << 14) -+#define UCB_TC_B_OUT_ENA (1 << 15) -+ -+#define UCB_AC_A 0x07 -+#define UCB_AC_B 0x08 -+#define UCB_AC_B_LOOP (1 << 8) -+#define UCB_AC_B_MUTE (1 << 13) -+#define UCB_AC_B_IN_ENA (1 << 14) -+#define UCB_AC_B_OUT_ENA (1 << 15) -+ -+#define UCB_TS_CR 0x09 -+#define UCB_TS_CR_TSMX_POW (1 << 0) -+#define UCB_TS_CR_TSPX_POW (1 << 1) -+#define UCB_TS_CR_TSMY_POW (1 << 2) -+#define UCB_TS_CR_TSPY_POW (1 << 3) -+#define UCB_TS_CR_TSMX_GND (1 << 4) -+#define UCB_TS_CR_TSPX_GND (1 << 5) -+#define UCB_TS_CR_TSMY_GND (1 << 6) -+#define UCB_TS_CR_TSPY_GND (1 << 7) -+#define UCB_TS_CR_MODE_INT (0 << 8) -+#define UCB_TS_CR_MODE_PRES (1 << 8) -+#define UCB_TS_CR_MODE_POS (2 << 8) -+#define UCB_TS_CR_BIAS_ENA (1 << 11) -+#define UCB_TS_CR_TSPX_LOW (1 << 12) -+#define UCB_TS_CR_TSMX_LOW (1 << 13) -+ -+#define UCB_ADC_CR 0x0a -+#define UCB_ADC_SYNC_ENA (1 << 0) -+#define UCB_ADC_VREFBYP_CON (1 << 1) -+#define UCB_ADC_INP_TSPX (0 << 2) -+#define UCB_ADC_INP_TSMX (1 << 2) -+#define UCB_ADC_INP_TSPY (2 << 2) -+#define UCB_ADC_INP_TSMY (3 << 2) -+#define UCB_ADC_INP_AD0 (4 << 2) -+#define UCB_ADC_INP_AD1 (5 << 2) -+#define UCB_ADC_INP_AD2 (6 << 2) -+#define UCB_ADC_INP_AD3 (7 << 2) -+#define UCB_ADC_EXT_REF (1 << 5) -+#define UCB_ADC_START (1 << 7) -+#define UCB_ADC_ENA (1 << 15) -+ -+#define UCB_ADC_DATA 0x0b -+#define UCB_ADC_DAT_VAL (1 << 15) -+#define UCB_ADC_DAT(x) (((x) & 0x7fe0) >> 5) -+ -+#define UCB_ID 0x0c -+#define UCB_ID_1200 0x1004 -+#define UCB_ID_1300 0x1005 -+#define UCB_ID_TC35143 0x9712 -+ -+#define UCB_MODE 0x0d -+#define UCB_MODE_DYN_VFLAG_ENA (1 << 12) -+#define UCB_MODE_AUD_OFF_CAN (1 << 13) -+ -+ -+struct ucb1x00_irq { -+ void *devid; -+ void (*fn)(int, void *); -+}; -+ -+struct ucb1x00 { -+ spinlock_t lock; -+ struct mcp *mcp; -+ unsigned int irq; -+ struct semaphore adc_sem; -+ spinlock_t io_lock; -+ u16 id; -+ u16 io_dir; -+ u16 io_out; -+ u16 adc_cr; -+ u16 irq_fal_enbl; -+ u16 irq_ris_enbl; -+ struct ucb1x00_irq irq_handler[16]; -+ struct device dev; -+ struct list_head node; -+ struct list_head devs; -+}; -+ -+struct ucb1x00_driver; -+ -+struct ucb1x00_dev { -+ struct list_head dev_node; -+ struct list_head drv_node; -+ struct ucb1x00 *ucb; -+ struct ucb1x00_driver *drv; -+ void *priv; -+}; -+ -+struct ucb1x00_driver { -+ struct list_head node; -+ struct list_head devs; -+ int (*add)(struct ucb1x00_dev *dev); -+ void (*remove)(struct ucb1x00_dev *dev); -+ int (*suspend)(struct ucb1x00_dev *dev, pm_message_t state); -+ int (*resume)(struct ucb1x00_dev *dev); -+}; -+ -+#define classdev_to_ucb1x00(cd) container_of(cd, struct ucb1x00, dev) -+ -+int ucb1x00_register_driver(struct ucb1x00_driver *); -+void ucb1x00_unregister_driver(struct ucb1x00_driver *); -+ -+/** -+ * ucb1x00_clkrate - return the UCB1x00 SIB clock rate -+ * @ucb: UCB1x00 structure describing chip -+ * -+ * Return the SIB clock rate in Hz. -+ */ -+static inline unsigned int ucb1x00_clkrate(struct ucb1x00 *ucb) -+{ -+ return mcp_get_sclk_rate(ucb->mcp); -+} -+ -+/** -+ * ucb1x00_enable - enable the UCB1x00 SIB clock -+ * @ucb: UCB1x00 structure describing chip -+ * -+ * Enable the SIB clock. This can be called multiple times. -+ */ -+static inline void ucb1x00_enable(struct ucb1x00 *ucb) -+{ -+ mcp_enable(ucb->mcp); -+} -+ -+/** -+ * ucb1x00_disable - disable the UCB1x00 SIB clock -+ * @ucb: UCB1x00 structure describing chip -+ * -+ * Disable the SIB clock. The SIB clock will only be disabled -+ * when the number of ucb1x00_enable calls match the number of -+ * ucb1x00_disable calls. -+ */ -+static inline void ucb1x00_disable(struct ucb1x00 *ucb) -+{ -+ mcp_disable(ucb->mcp); -+} -+ -+/** -+ * ucb1x00_reg_write - write a UCB1x00 register -+ * @ucb: UCB1x00 structure describing chip -+ * @reg: UCB1x00 4-bit register index to write -+ * @val: UCB1x00 16-bit value to write -+ * -+ * Write the UCB1x00 register @reg with value @val. The SIB -+ * clock must be running for this function to return. -+ */ -+static inline void ucb1x00_reg_write(struct ucb1x00 *ucb, unsigned int reg, unsigned int val) -+{ -+ mcp_reg_write(ucb->mcp, reg, val); -+} -+ -+/** -+ * ucb1x00_reg_read - read a UCB1x00 register -+ * @ucb: UCB1x00 structure describing chip -+ * @reg: UCB1x00 4-bit register index to write -+ * -+ * Read the UCB1x00 register @reg and return its value. The SIB -+ * clock must be running for this function to return. -+ */ -+static inline unsigned int ucb1x00_reg_read(struct ucb1x00 *ucb, unsigned int reg) -+{ -+ return mcp_reg_read(ucb->mcp, reg); -+} -+/** -+ * ucb1x00_set_audio_divisor - -+ * @ucb: UCB1x00 structure describing chip -+ * @div: SIB clock divisor -+ */ -+static inline void ucb1x00_set_audio_divisor(struct ucb1x00 *ucb, unsigned int div) -+{ -+ mcp_set_audio_divisor(ucb->mcp, div); -+} -+ -+/** -+ * ucb1x00_set_telecom_divisor - -+ * @ucb: UCB1x00 structure describing chip -+ * @div: SIB clock divisor -+ */ -+static inline void ucb1x00_set_telecom_divisor(struct ucb1x00 *ucb, unsigned int div) -+{ -+ mcp_set_telecom_divisor(ucb->mcp, div); -+} -+ -+void ucb1x00_io_set_dir(struct ucb1x00 *ucb, unsigned int, unsigned int); -+void ucb1x00_io_write(struct ucb1x00 *ucb, unsigned int, unsigned int); -+unsigned int ucb1x00_io_read(struct ucb1x00 *ucb); -+ -+#define UCB_NOSYNC (0) -+#define UCB_SYNC (1) -+ -+unsigned int ucb1x00_adc_read(struct ucb1x00 *ucb, int adc_channel, int sync); -+void ucb1x00_adc_enable(struct ucb1x00 *ucb); -+void ucb1x00_adc_disable(struct ucb1x00 *ucb); -+ -+/* -+ * Which edges of the IRQ do you want to control today? -+ */ -+#define UCB_RISING (1 << 0) -+#define UCB_FALLING (1 << 1) -+ -+int ucb1x00_hook_irq(struct ucb1x00 *ucb, unsigned int idx, void (*fn)(int, void *), void *devid); -+void ucb1x00_enable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges); -+void ucb1x00_disable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges); -+int ucb1x00_free_irq(struct ucb1x00 *ucb, unsigned int idx, void *devid); -+ -+#endif --- -1.5.6.5 - |