History

Merge branch 'topic/qcom' into for-linus

Vinod Koul committed 9 years ago

Commit 3378e7a2 parents dd2b9ff dc7c7332 files · +21 −0Browse files

Unified · Split

2 files
  1. drivers/dma/qcom/hidma.c +15 −0
  2. drivers/dma/qcom/hidma_ll.c +6 −0
drivers/dma/qcom/hidma.c+15−0
@@ -865,6 +865,20 @@ bailout: · 864 unmodified lines
865 return rc;865 return rc;
866}866}
867 867
868static void hidma_shutdown(struct platform_device *pdev)
869{
870 struct hidma_dev *dmadev = platform_get_drvdata(pdev);
871
872 dev_info(dmadev->ddev.dev, "HI-DMA engine shutdown\n");
873
874 pm_runtime_get_sync(dmadev->ddev.dev);
875 if (hidma_ll_disable(dmadev->lldev))
876 dev_warn(dmadev->ddev.dev, "channel did not stop\n");
877 pm_runtime_mark_last_busy(dmadev->ddev.dev);
878 pm_runtime_put_autosuspend(dmadev->ddev.dev);
879
880}
881
868static int hidma_remove(struct platform_device *pdev)882static int hidma_remove(struct platform_device *pdev)
869{883{
870 struct hidma_dev *dmadev = platform_get_drvdata(pdev);884 struct hidma_dev *dmadev = platform_get_drvdata(pdev);
@@ -908,6 +922,7 @@ MODULE_DEVICE_TABLE(of, hidma_match); · 37 unmodified lines
908static struct platform_driver hidma_driver = {922static struct platform_driver hidma_driver = {
909 .probe = hidma_probe,923 .probe = hidma_probe,
910 .remove = hidma_remove,924 .remove = hidma_remove,
925 .shutdown = hidma_shutdown,
911 .driver = {926 .driver = {
912 .name = "hidma",927 .name = "hidma",
913 .of_match_table = hidma_match,928 .of_match_table = hidma_match,
drivers/dma/qcom/hidma_ll.c+6−0
@@ -499,6 +499,9 @@ int hidma_ll_enable(struct hidma_lldev *lldev) · 498 unmodified lines
499 lldev->trch_state = HIDMA_CH_ENABLED;499 lldev->trch_state = HIDMA_CH_ENABLED;
500 lldev->evch_state = HIDMA_CH_ENABLED;500 lldev->evch_state = HIDMA_CH_ENABLED;
501 501
502 /* enable irqs */
503 writel(ENABLE_IRQS, lldev->evca + HIDMA_EVCA_IRQ_EN_REG);
504
502 return 0;505 return 0;
503}506}
504 507
@@ -596,6 +599,9 @@ int hidma_ll_disable(struct hidma_lldev *lldev) · 91 unmodified lines
596 599
597 lldev->trch_state = HIDMA_CH_SUSPENDED;600 lldev->trch_state = HIDMA_CH_SUSPENDED;
598 lldev->evch_state = HIDMA_CH_SUSPENDED;601 lldev->evch_state = HIDMA_CH_SUSPENDED;
602
603 /* disable interrupts */
604 writel(0, lldev->evca + HIDMA_EVCA_IRQ_EN_REG);
599 return 0;605 return 0;
600}606}
601 607

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t