diff options
Diffstat (limited to 'drivers/mfd/sm501.c')
-rw-r--r-- | drivers/mfd/sm501.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index dc9ea95c0561..7b6652f60117 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
@@ -523,7 +523,7 @@ unsigned long sm501_set_clock(struct device *dev, | |||
523 | unsigned long clock = readl(sm->regs + SM501_CURRENT_CLOCK); | 523 | unsigned long clock = readl(sm->regs + SM501_CURRENT_CLOCK); |
524 | unsigned char reg; | 524 | unsigned char reg; |
525 | unsigned int pll_reg = 0; | 525 | unsigned int pll_reg = 0; |
526 | unsigned long sm501_freq; /* the actual frequency acheived */ | 526 | unsigned long sm501_freq; /* the actual frequency achieved */ |
527 | 527 | ||
528 | struct sm501_clock to; | 528 | struct sm501_clock to; |
529 | 529 | ||
@@ -533,7 +533,7 @@ unsigned long sm501_set_clock(struct device *dev, | |||
533 | 533 | ||
534 | switch (clksrc) { | 534 | switch (clksrc) { |
535 | case SM501_CLOCK_P2XCLK: | 535 | case SM501_CLOCK_P2XCLK: |
536 | /* This clock is divided in half so to achive the | 536 | /* This clock is divided in half so to achieve the |
537 | * requested frequency the value must be multiplied by | 537 | * requested frequency the value must be multiplied by |
538 | * 2. This clock also has an additional pre divisor */ | 538 | * 2. This clock also has an additional pre divisor */ |
539 | 539 | ||
@@ -562,7 +562,7 @@ unsigned long sm501_set_clock(struct device *dev, | |||
562 | break; | 562 | break; |
563 | 563 | ||
564 | case SM501_CLOCK_V2XCLK: | 564 | case SM501_CLOCK_V2XCLK: |
565 | /* This clock is divided in half so to achive the | 565 | /* This clock is divided in half so to achieve the |
566 | * requested frequency the value must be multiplied by 2. */ | 566 | * requested frequency the value must be multiplied by 2. */ |
567 | 567 | ||
568 | sm501_freq = (sm501_select_clock(2 * req_freq, &to, 3) / 2); | 568 | sm501_freq = (sm501_select_clock(2 * req_freq, &to, 3) / 2); |
@@ -648,7 +648,7 @@ unsigned long sm501_find_clock(struct device *dev, | |||
648 | unsigned long req_freq) | 648 | unsigned long req_freq) |
649 | { | 649 | { |
650 | struct sm501_devdata *sm = dev_get_drvdata(dev); | 650 | struct sm501_devdata *sm = dev_get_drvdata(dev); |
651 | unsigned long sm501_freq; /* the frequency achiveable by the 501 */ | 651 | unsigned long sm501_freq; /* the frequency achieveable by the 501 */ |
652 | struct sm501_clock to; | 652 | struct sm501_clock to; |
653 | 653 | ||
654 | switch (clksrc) { | 654 | switch (clksrc) { |
@@ -1430,7 +1430,7 @@ static int __devinit sm501_plat_probe(struct platform_device *dev) | |||
1430 | } | 1430 | } |
1431 | 1431 | ||
1432 | sm->regs_claim = request_mem_region(sm->io_res->start, | 1432 | sm->regs_claim = request_mem_region(sm->io_res->start, |
1433 | resource_size(sm->io_res), "sm501"); | 1433 | 0x100, "sm501"); |
1434 | 1434 | ||
1435 | if (sm->regs_claim == NULL) { | 1435 | if (sm->regs_claim == NULL) { |
1436 | dev_err(&dev->dev, "cannot claim registers\n"); | 1436 | dev_err(&dev->dev, "cannot claim registers\n"); |
@@ -1644,7 +1644,7 @@ static int __devinit sm501_pci_probe(struct pci_dev *dev, | |||
1644 | sm->mem_res = &dev->resource[0]; | 1644 | sm->mem_res = &dev->resource[0]; |
1645 | 1645 | ||
1646 | sm->regs_claim = request_mem_region(sm->io_res->start, | 1646 | sm->regs_claim = request_mem_region(sm->io_res->start, |
1647 | resource_size(sm->io_res), "sm501"); | 1647 | 0x100, "sm501"); |
1648 | if (sm->regs_claim == NULL) { | 1648 | if (sm->regs_claim == NULL) { |
1649 | dev_err(&dev->dev, "cannot claim registers\n"); | 1649 | dev_err(&dev->dev, "cannot claim registers\n"); |
1650 | err= -EBUSY; | 1650 | err= -EBUSY; |