mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
mfd: let asic3 use mem resource instead of bus_shift
The bus_shift parameter in platform_data is not needed as we can tell the driver with the IOMEM_RESOURCE whether the ASIC is located on a 16bit or 32bit memory bus. The htc-egpio driver uses a more descriptive bus_width parameter, but for drivers where the register map size fixed, we don't even need this. Signed-off-by: Philipp Zabel <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
This commit is contained in:
parent
279cac484e
commit
99cdb0c8c5
2 changed files with 7 additions and 9 deletions
|
|
@ -313,6 +313,7 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
|
|||
struct asic3 *asic = platform_get_drvdata(pdev);
|
||||
unsigned long clksel = 0;
|
||||
unsigned int irq, irq_base;
|
||||
int map_size;
|
||||
|
||||
asic->irq_nr = platform_get_irq(pdev, 0);
|
||||
if (asic->irq_nr < 0)
|
||||
|
|
@ -551,8 +552,8 @@ static int __init asic3_probe(struct platform_device *pdev)
|
|||
goto out_free;
|
||||
}
|
||||
|
||||
|
||||
asic->mapping = ioremap(mem->start, PAGE_SIZE);
|
||||
map_size = mem->end - mem->start + 1;
|
||||
asic->mapping = ioremap(mem->start, map_size);
|
||||
if (!asic->mapping) {
|
||||
ret = -ENOMEM;
|
||||
dev_err(asic->dev, "Couldn't ioremap\n");
|
||||
|
|
@ -561,10 +562,8 @@ static int __init asic3_probe(struct platform_device *pdev)
|
|||
|
||||
asic->irq_base = pdata->irq_base;
|
||||
|
||||
if (pdata && pdata->bus_shift)
|
||||
asic->bus_shift = 2 - pdata->bus_shift;
|
||||
else
|
||||
asic->bus_shift = 0;
|
||||
/* calculate bus shift from mem resource */
|
||||
asic->bus_shift = 2 - (map_size >> 12);
|
||||
|
||||
clksel = 0;
|
||||
asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL), clksel);
|
||||
|
|
|
|||
Loading…
Reference in a new issue