summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorQuinn Jensen <quinn.jensen@freescale.com>2007-05-24 18:02:18 -0600
committerQuinn Jensen <quinn.jensen@freescale.com>2007-05-24 18:02:18 -0600
commitb4c27bce2a631c37114ae17c17cdb62b31d979f1 (patch)
treefb45da602b2c2b6195d93a7971141019ab3339af /include
parent6d144b08568cc93e51dd9ce4020572d063a82376 (diff)
CR DSPhl28981: i2c plat specific cleanup
This patch moves platform device info out of the driver. It adds support to set i2c divider based on input clock and desired i2c speed. It fixes dynamic detection of devices on i2c bus. It fixes support for multiple instances of i2c modules. http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-i2c_plat_cleanup.patch
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-mxc/board-mx27ads.h11
-rw-r--r--include/asm-arm/arch-mxc/board-mx31ads.h12
-rw-r--r--include/asm-arm/arch-mxc/board.h8
3 files changed, 8 insertions, 23 deletions
diff --git a/include/asm-arm/arch-mxc/board-mx27ads.h b/include/asm-arm/arch-mxc/board-mx27ads.h
index c6a8b722bc41..d75690d3d525 100644
--- a/include/asm-arm/arch-mxc/board-mx27ads.h
+++ b/include/asm-arm/arch-mxc/board-mx27ads.h
@@ -45,17 +45,6 @@
/* Size of contiguous memory for DMA and other h/w blocks */
#define CONSISTENT_DMA_SIZE SZ_8M
-/* I2C configuration */
-/*!
- * This defines the number of I2C modules in the MXC platform
- */
-#define I2C_NR 1
-/*!
- * This define specifies the frequency divider value to be written into
- * the I2C \b IFDR register.
- */
-#define I2C1_FRQ_DIV 0x17
-
/*!
* @name MXC UART EVB board level configurations
*/
diff --git a/include/asm-arm/arch-mxc/board-mx31ads.h b/include/asm-arm/arch-mxc/board-mx31ads.h
index 0b9a27ef321e..aaa75aaa553c 100644
--- a/include/asm-arm/arch-mxc/board-mx31ads.h
+++ b/include/asm-arm/arch-mxc/board-mx31ads.h
@@ -25,18 +25,6 @@
/* Size of contiguous memory for DMA and other h/w blocks */
#define CONSISTENT_DMA_SIZE SZ_8M
-/* I2C configuration */
-/*!
- * This defines the number of I2C modules in the MXC platform
- * Defined as 1, as MC13783 on ADS uses the other pins
- */
-#define I2C_NR 1
-/*!
- * This define specifies the frequency divider value to be written into
- * the I2C \b IFDR register.
- */
-#define I2C1_FRQ_DIV 0x17
-
/*!
* @name MXC UART EVB board level configurations
*/
diff --git a/include/asm-arm/arch-mxc/board.h b/include/asm-arm/arch-mxc/board.h
index 827295db7e93..53c874a60517 100644
--- a/include/asm-arm/arch-mxc/board.h
+++ b/include/asm-arm/arch-mxc/board.h
@@ -18,6 +18,8 @@
#error "Do not include directly."
#endif
+#include <asm/arch/clock.h>
+
#ifndef __ASSEMBLY__
struct mxc_ipu_config {
@@ -27,6 +29,12 @@ struct mxc_ipu_config {
struct mxc_ir_platform_data {
int uart_ir_mux;
};
+
+struct mxc_i2c_platform_data {
+ enum mxc_clocks clk;
+ u32 i2c_clk;
+};
+
#endif
/*