diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:13 +0000 |
|---|---|---|
| committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:13 +0000 |
| commit | 50e19f55004e387b9cd89cfeacdd94dbbdc87bed (patch) | |
| tree | 48a8d85566d38b1a5b78c791726488d8223b9958 /drivers | |
| parent | 358011a4b9dfaa19ba15ee72cb8514ebeeed256b (diff) | |
cleanup-after-adding-andy-tracking-patchset.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/chips/pcf50633.c | 12 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index acc7011276a..ca73f8a57c9 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -2123,6 +2123,8 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind) int err = 0; int irq; + printk(KERN_INFO "************ pcf50633_detect\n"); + DEBUGP("entering\n"); if (!pcf50633_pdev) { printk(KERN_ERR "pcf50633: driver needs a platform_device!\n"); @@ -2224,10 +2226,10 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind) * LEDOUT register can be reset by disabling and enabling the * LED converter via control bit led_on in the LEDENA register" */ - pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x00); - pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01); - pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01); - pcf50633_reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f); + reg_write(pcf, PCF50633_REG_LEDENA, 0x00); + reg_write(pcf, PCF50633_REG_LEDDIM, 0x01); + reg_write(pcf, PCF50633_REG_LEDENA, 0x01); + reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f); err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING, "pcf50633", pcf); @@ -2298,7 +2300,7 @@ exit_free: static int pcf50633_attach_adapter(struct i2c_adapter *adapter) { - DEBUGP("entering, calling i2c_probe\n"); + printk(KERN_ERR "**** entering pcf50633_attach_adapter, calling i2c_probe\n"); return i2c_probe(adapter, &addr_data, &pcf50633_detect); } diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 69ac7af834c..00e3c5c5ccd 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -735,7 +735,7 @@ static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) glamo_mci_send_request(mmc); } -#if 0 +#if 1 static void glamo_mci_reset(struct glamo_mci_host *host) { if (host->suspending) { |