Commit 3df0d961 authored by 吴智聪John's avatar 吴智聪John

i2c host work ok but conflict with ide driver so disable ide driver temporarily

parent e1a65f63
...@@ -493,7 +493,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 ...@@ -493,7 +493,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set # CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set # CONFIG_ATA_OVER_ETH is not set
CONFIG_IDE=y # CONFIG_IDE=y
CONFIG_IDE_MAX_HWIFS=4 CONFIG_IDE_MAX_HWIFS=4
CONFIG_BLK_DEV_IDE=y CONFIG_BLK_DEV_IDE=y
......
...@@ -212,8 +212,13 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) ...@@ -212,8 +212,13 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
int i; int i;
/* Introduce a 100musec delay. Required for Davinci EVM board only */ /* Introduce a 100musec delay. Required for Davinci EVM board only */
if (machine_is_davinci_evm()) #ifdef CONFIG_MACH_DAVINCI_EVM
udelay(100); udelay(100);
#else
#ifdef CONFIG_MACH_NTOSD_644XA
udelay(100);
#endif
#endif
/* set the slave address */ /* set the slave address */
dev->regs->icsar = msg->addr; dev->regs->icsar = msg->addr;
...@@ -500,13 +505,18 @@ davinci_i2c_probe(struct platform_device *pdev) ...@@ -500,13 +505,18 @@ davinci_i2c_probe(struct platform_device *pdev)
* so that the MSP430, which is doing software i2c, has * so that the MSP430, which is doing software i2c, has
* some extra processing time * some extra processing time
*/ */
if (machine_is_davinci_evm()) #ifdef CONFIG_MACH_DAVINCI_EVM
bus_freq = 20; bus_freq = 20;
#else
else if (bus_freq > 200) #ifdef CONFIG_MACH_NTOSD_644XA
bus_freq = 20;
#else
if (bus_freq > 200)
bus_freq = 400; /* Fast mode */ bus_freq = 400; /* Fast mode */
else else
bus_freq = 100; /* Standard mode */ bus_freq = 100; /* Standard mode */
#endif
#endif
dev->clk = clk_get (&pdev->dev, "I2CCLK"); dev->clk = clk_get (&pdev->dev, "I2CCLK");
if (IS_ERR(dev->clk)) if (IS_ERR(dev->clk))
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
// Digital interface register // Digital interface register
#define ACT_ON 0x0001 #define ACT_ON 0x0001
#define TLV320AIC23ID1 (0x1a) // cs low #define TLV320AIC23ID1 (0x18) // cs low
#define TLV320AIC23ID2 (0x1b) // cs high #define TLV320AIC23ID2 (0x1b) // cs high
void tlv320aic23_power_up(void); void tlv320aic23_power_up(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment