diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-02 06:53:36 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-02 06:53:36 +0400 |
| commit | b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 (patch) | |
| tree | 194e13dfa85d2d2af8bd125acd80a445ee0def62 /drivers/mfd/timberdale.h | |
| parent | fe955682d2153b35dffcf1673dff0491096a3f0a (diff) | |
| parent | 0a76a34ff0804f1f413807b2e2d12117c2b602ca (diff) | |
| download | linux-b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732.tar.xz | |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
Diffstat (limited to 'drivers/mfd/timberdale.h')
| -rw-r--r-- | drivers/mfd/timberdale.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/mfd/timberdale.h b/drivers/mfd/timberdale.h index 8d27ffabc25d..c11bf6ebfe00 100644 --- a/drivers/mfd/timberdale.h +++ b/drivers/mfd/timberdale.h @@ -23,7 +23,7 @@ #ifndef MFD_TIMBERDALE_H #define MFD_TIMBERDALE_H -#define DRV_VERSION "0.1" +#define DRV_VERSION "0.2" /* This driver only support versions >= 3.8 and < 4.0 */ #define TIMB_SUPPORTED_MAJOR 3 @@ -66,7 +66,7 @@ #define CHIPCTLOFFSET 0x800 #define CHIPCTLEND 0x8ff -#define CHIPCTLSIZE (CHIPCTLEND - CHIPCTLOFFSET) +#define CHIPCTLSIZE (CHIPCTLEND - CHIPCTLOFFSET + 1) #define INTCOFFSET 0xc00 #define INTCEND 0xfff @@ -127,4 +127,16 @@ #define GPIO_PIN_BT_RST 15 #define GPIO_NR_PINS 16 +/* DMA Channels */ +#define DMA_UART_RX 0 +#define DMA_UART_TX 1 +#define DMA_MLB_RX 2 +#define DMA_MLB_TX 3 +#define DMA_VIDEO_RX 4 +#define DMA_VIDEO_DROP 5 +#define DMA_SDHCI_RX 6 +#define DMA_SDHCI_TX 7 +#define DMA_ETH_RX 8 +#define DMA_ETH_TX 9 + #endif |