diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2010-06-18 15:25:05 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-19 22:37:28 +0200 |
| commit | 5202f1be17877bf9d032ad0a747d21104e16965a (patch) | |
| tree | 46391e944705b2d756c4650da863a90f0cee1a5e | |
| parent | 9898cd312d27510a09f3d896d23a415540f81e27 (diff) | |
glamo: fix two bitmask issues
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 18 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 4c8b7ea2c51..392a8be4474 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -743,14 +743,14 @@ EXPORT_SYMBOL_GPL(glamo_engine_reclock); * allows reversion to 2.6.24 settings */ static const uint16_t reg_0x200[] = { -0xe03, /* 0 waits on Async BB R & W, Use PLL 2 for mem bus */ -0xef0, /* 3 waits on Async BB R & W, Use PLL 1 for mem bus */ -0xea0, /* 2 waits on Async BB R & W, Use PLL 1 for mem bus */ -0xe50, /* 1 waits on Async BB R & W, Use PLL 1 for mem bus */ -0xe00, /* 0 waits on Async BB R & W, Use PLL 1 for mem bus */ -0xef3, /* 3 waits on Async BB R & W, Use PLL 2 for mem bus */ -0xea3, /* 2 waits on Async BB R & W, Use PLL 2 for mem bus */ -0xe53, /* 1 waits on Async BB R & W, Use PLL 2 for mem bus */ + 0xe03, /* 0 waits on Async BB R & W, Use PLL 2 for mem bus */ + 0xef0, /* 3 waits on Async BB R & W, Use PLL 1 for mem bus */ + 0xea0, /* 2 waits on Async BB R & W, Use PLL 1 for mem bus */ + 0xe50, /* 1 waits on Async BB R & W, Use PLL 1 for mem bus */ + 0xe00, /* 0 waits on Async BB R & W, Use PLL 1 for mem bus */ + 0xef3, /* 3 waits on Async BB R & W, Use PLL 2 for mem bus */ + 0xea3, /* 2 waits on Async BB R & W, Use PLL 2 for mem bus */ + 0xe53, /* 1 waits on Async BB R & W, Use PLL 2 for mem bus */ }; static int glamo_run_script(struct glamo_core *glamo, @@ -779,7 +779,7 @@ static int glamo_run_script(struct glamo_core *glamo, break; case 0x200: __reg_write(glamo, line->reg, - reg_0x200[slow_memory & 0x8]); + reg_0x200[slow_memory & 0x7]); break; default: __reg_write(glamo, line->reg, line->val); diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 63728c5fb03..4c372e0f459 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -680,7 +680,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) sd_drive = 3; glamo_reg_set_bit_mask(host, GLAMO_REG_MMC_BASIC, - GLAMO_BASIC_MMC_EN_4BIT_DATA | 0xb0, + GLAMO_BASIC_MMC_EN_4BIT_DATA | 0xc0, bus_width | sd_drive << 6); if (host->power_mode == MMC_POWER_OFF) |