diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-03 14:21:32 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-03 14:21:32 -0500 |
| commit | afae26be424341af502233fd990bfa60f55206bd (patch) | |
| tree | 5e0391c4ec5d2a4e74fc1c71214ca7788c821b78 | |
| parent | 5aee383f259ef5114457baac04785206c1a3f009 (diff) | |
| parent | b96b5febee78ef3f8c6a870733df0764dd2c94ee (diff) | |
Merge branch 'omap4_next_l24.8' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x8p3
| -rw-r--r-- | drivers/mfd/twl-core.c | 5 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_host.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 19355ed5601a..52cba279a26d 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -226,6 +226,8 @@ #define HIGH_PERF_SQ (1 << 3) #define CK32K_LOWPWR_EN (1 << 7) +#define CLK32KG_CFG_STATE 0xBE + /* chip-specific feature flags, for i2c_device_id.driver_data */ #define TWL4030_VAUX2 BIT(0) /* pre-5030 voltage ranges */ @@ -1073,6 +1075,9 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) twl_i2c_write_u8(TWL4030_MODULE_INTBR, temp, REG_GPPUPDCTR1); } + if (twl_class_is_6030()) + twl_i2c_write_u8(TWL6030_MODULE_ID0, 0xE1, CLK32KG_CFG_STATE); + status = add_children(pdata, id->driver_data); fail: if (status < 0) diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 877d20b1dff9..07b12437066e 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -628,6 +628,11 @@ static bool musb_tx_dma_program(struct dma_controller *dma, u8 mode; #ifdef CONFIG_USB_INVENTRA_DMA + /* + * Ensure the data reaches to main memory before starting + * DMA transfer + */ + wmb(); if (length > channel->max_len) length = channel->max_len; |