[PATCH 1/2] glamo: fix two bitmask issues

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] glamo: fix two bitmask issues

Thibaut Girka
---
 drivers/mfd/glamo/glamo-core.c |   18 +++++++++---------
 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 4c8b7ea..392a8be 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 63728c5..4c372e0 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)
--
1.7.1


Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] glamo-core: drop unused attribute irq_works

Thibaut Girka
---
 drivers/mfd/glamo/glamo-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
index 392a8be..3cb48b2 100644
--- a/drivers/mfd/glamo/glamo-core.c
+++ b/drivers/mfd/glamo/glamo-core.c
@@ -995,7 +995,6 @@ static int __devinit glamo_probe(struct platform_device *pdev)
  set_irq_type(glamo->irq, IRQ_TYPE_EDGE_FALLING);
  set_irq_data(glamo->irq, glamo);
  set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler);
- glamo->irq_works = 1;
 
  ret = mfd_add_devices(&pdev->dev, pdev->id, glamo_cells,
  ARRAY_SIZE(glamo_cells), mem, glamo->irq_base);
--
1.7.1