From 234c79d3ac17bd3b970836fae2fec668f5b029e4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 17 Feb 2009 10:09:44 +0100 Subject: [PATCH] --- yaml --- r: 142011 b: refs/heads/master c: 47c10edd715d420cabd8622a4a458e9ac755b24d h: refs/heads/master i: 142009: 98babfee5a2af5c63a8a8135c2bfe3a8c5de4b39 142007: 7c8ca3c2bc4334e0df906e28072fea2ceb56785c v: v3 --- [refs] | 2 +- trunk/drivers/mfd/htc-pasic3.c | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 38fd0453de15..3a639e96f54b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d33ccbeecd8393cc690cf9a71008236cdd7cc2c +refs/heads/master: 47c10edd715d420cabd8622a4a458e9ac755b24d diff --git a/trunk/drivers/mfd/htc-pasic3.c b/trunk/drivers/mfd/htc-pasic3.c index 92b683790ad8..386da1566fcc 100644 --- a/trunk/drivers/mfd/htc-pasic3.c +++ b/trunk/drivers/mfd/htc-pasic3.c @@ -167,15 +167,19 @@ static int __init pasic3_probe(struct platform_device *pdev) /* calculate bus shift from mem resource */ asic->bus_shift = (resource_size(r) - 5) >> 3; - /* the first 5 PASIC3 registers control the DS1WM */ - ds1wm_resources[0].end = (5 << asic->bus_shift) - 1; - ds1wm_cell.platform_data = &ds1wm_cell; - ds1wm_cell.data_size = sizeof(ds1wm_cell); - ret = mfd_add_devices(&pdev->dev, pdev->id, &ds1wm_cell, 1, r, irq); - if (ret < 0) - dev_warn(dev, "failed to register DS1WM\n"); - - if (pdata->led_pdata) { + if (pdata && pdata->clock_rate) { + ds1wm_pdata.clock_rate = pdata->clock_rate; + /* the first 5 PASIC3 registers control the DS1WM */ + ds1wm_resources[0].end = (5 << asic->bus_shift) - 1; + ds1wm_cell.platform_data = &ds1wm_cell; + ds1wm_cell.data_size = sizeof(ds1wm_cell); + ret = mfd_add_devices(&pdev->dev, pdev->id, + &ds1wm_cell, 1, r, irq); + if (ret < 0) + dev_warn(dev, "failed to register DS1WM\n"); + } + + if (pdata && pdata->led_pdata) { led_cell.driver_data = pdata->led_pdata; led_cell.platform_data = &led_cell; led_cell.data_size = sizeof(ds1wm_cell);