diff options
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/Kconfig | 9 | ||||
-rw-r--r-- | drivers/dma/pch_dma.c | 19 |
2 files changed, 21 insertions, 7 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 6ee23592700a..1b61d3aa2962 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
@@ -200,11 +200,16 @@ config PL330_DMA | |||
200 | platform_data for a dma-pl330 device. | 200 | platform_data for a dma-pl330 device. |
201 | 201 | ||
202 | config PCH_DMA | 202 | config PCH_DMA |
203 | tristate "Topcliff (Intel EG20T) PCH DMA support" | 203 | tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH DMA support" |
204 | depends on PCI && X86 | 204 | depends on PCI && X86 |
205 | select DMA_ENGINE | 205 | select DMA_ENGINE |
206 | help | 206 | help |
207 | Enable support for the Topcliff (Intel EG20T) PCH DMA engine. | 207 | Enable support for Intel EG20T PCH DMA engine. |
208 | |||
209 | This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/ | ||
210 | Output Hub) which is for IVI(In-Vehicle Infotainment) use. | ||
211 | ML7213 is companion chip for Intel Atom E6xx series. | ||
212 | ML7213 is completely compatible for Intel EG20T PCH. | ||
208 | 213 | ||
209 | config IMX_SDMA | 214 | config IMX_SDMA |
210 | tristate "i.MX SDMA support" | 215 | tristate "i.MX SDMA support" |
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c index c064c89420d0..1c38418ae61f 100644 --- a/drivers/dma/pch_dma.c +++ b/drivers/dma/pch_dma.c | |||
@@ -1,6 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Topcliff PCH DMA controller driver | 2 | * Topcliff PCH DMA controller driver |
3 | * Copyright (c) 2010 Intel Corporation | 3 | * Copyright (c) 2010 Intel Corporation |
4 | * Copyright (C) 2011 OKI SEMICONDUCTOR CO., LTD. | ||
4 | * | 5 | * |
5 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
@@ -921,12 +922,19 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev) | |||
921 | } | 922 | } |
922 | 923 | ||
923 | /* PCI Device ID of DMA device */ | 924 | /* PCI Device ID of DMA device */ |
924 | #define PCI_DEVICE_ID_PCH_DMA_8CH 0x8810 | 925 | #define PCI_VENDOR_ID_ROHM 0x10DB |
925 | #define PCI_DEVICE_ID_PCH_DMA_4CH 0x8815 | 926 | #define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH 0x8810 |
927 | #define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH 0x8815 | ||
928 | #define PCI_DEVICE_ID_ML7213_DMA1_8CH 0x8026 | ||
929 | #define PCI_DEVICE_ID_ML7213_DMA2_8CH 0x802B | ||
930 | #define PCI_DEVICE_ID_ML7213_DMA3_4CH 0x8034 | ||
926 | 931 | ||
927 | static const struct pci_device_id pch_dma_id_table[] = { | 932 | static const struct pci_device_id pch_dma_id_table[] = { |
928 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_8CH), 8 }, | 933 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 }, |
929 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_4CH), 4 }, | 934 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_4CH), 4 }, |
935 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA1_8CH), 8}, /* UART Video */ | ||
936 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA2_8CH), 8}, /* PCMIF SPI */ | ||
937 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA3_4CH), 4}, /* FPGA */ | ||
930 | { 0, }, | 938 | { 0, }, |
931 | }; | 939 | }; |
932 | 940 | ||
@@ -954,6 +962,7 @@ static void __exit pch_dma_exit(void) | |||
954 | module_init(pch_dma_init); | 962 | module_init(pch_dma_init); |
955 | module_exit(pch_dma_exit); | 963 | module_exit(pch_dma_exit); |
956 | 964 | ||
957 | MODULE_DESCRIPTION("Topcliff PCH DMA controller driver"); | 965 | MODULE_DESCRIPTION("Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH " |
966 | "DMA controller driver"); | ||
958 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); | 967 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); |
959 | MODULE_LICENSE("GPL v2"); | 968 | MODULE_LICENSE("GPL v2"); |