diff options
| -rw-r--r-- | drivers/dma/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/dma/pch_dma.c | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 606592ecd04f..7ec0d6cef0c3 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -201,18 +201,18 @@ config PL330_DMA | |||
| 201 | platform_data for a dma-pl330 device. | 201 | platform_data for a dma-pl330 device. |
| 202 | 202 | ||
| 203 | config PCH_DMA | 203 | config PCH_DMA |
| 204 | tristate "Intel EG20T PCH / LAPIS Semi IOH(ML7213/ML7223) DMA support" | 204 | tristate "Intel EG20T PCH / LAPIS Semicon IOH(ML7213/ML7223/ML7831) DMA" |
| 205 | depends on PCI && X86 | 205 | depends on PCI && X86 |
| 206 | select DMA_ENGINE | 206 | select DMA_ENGINE |
| 207 | help | 207 | help |
| 208 | Enable support for Intel EG20T PCH DMA engine. | 208 | Enable support for Intel EG20T PCH DMA engine. |
| 209 | 209 | ||
| 210 | This driver also can be used for LAPIS Semiconductor IOH(Input/ | 210 | This driver also can be used for LAPIS Semiconductor IOH(Input/ |
| 211 | Output Hub), ML7213 and ML7223. | 211 | Output Hub), ML7213, ML7223 and ML7831. |
| 212 | ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is | 212 | ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is |
| 213 | for MP(Media Phone) use. | 213 | for MP(Media Phone) use and ML7831 IOH is for general purpose use. |
| 214 | ML7213/ML7223 is companion chip for Intel Atom E6xx series. | 214 | ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series. |
| 215 | ML7213/ML7223 is completely compatible for Intel EG20T PCH. | 215 | ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH. |
| 216 | 216 | ||
| 217 | config IMX_SDMA | 217 | config IMX_SDMA |
| 218 | tristate "i.MX SDMA support" | 218 | tristate "i.MX SDMA support" |
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c index a9b8a7971211..60aca37e22ea 100644 --- a/drivers/dma/pch_dma.c +++ b/drivers/dma/pch_dma.c | |||
| @@ -1018,6 +1018,8 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev) | |||
| 1018 | #define PCI_DEVICE_ID_ML7223_DMA2_4CH 0x800E | 1018 | #define PCI_DEVICE_ID_ML7223_DMA2_4CH 0x800E |
| 1019 | #define PCI_DEVICE_ID_ML7223_DMA3_4CH 0x8017 | 1019 | #define PCI_DEVICE_ID_ML7223_DMA3_4CH 0x8017 |
| 1020 | #define PCI_DEVICE_ID_ML7223_DMA4_4CH 0x803B | 1020 | #define PCI_DEVICE_ID_ML7223_DMA4_4CH 0x803B |
| 1021 | #define PCI_DEVICE_ID_ML7831_DMA1_8CH 0x8810 | ||
| 1022 | #define PCI_DEVICE_ID_ML7831_DMA2_4CH 0x8815 | ||
| 1021 | 1023 | ||
| 1022 | DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = { | 1024 | DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = { |
| 1023 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 }, | 1025 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 }, |
| @@ -1030,6 +1032,8 @@ DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = { | |||
| 1030 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA2_4CH), 4}, /* Video SPI */ | 1032 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA2_4CH), 4}, /* Video SPI */ |
| 1031 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA3_4CH), 4}, /* Security */ | 1033 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA3_4CH), 4}, /* Security */ |
| 1032 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA4_4CH), 4}, /* FPGA */ | 1034 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA4_4CH), 4}, /* FPGA */ |
| 1035 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA1_8CH), 8}, /* UART */ | ||
| 1036 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA2_4CH), 4}, /* SPI */ | ||
| 1033 | { 0, }, | 1037 | { 0, }, |
| 1034 | }; | 1038 | }; |
| 1035 | 1039 | ||
| @@ -1057,7 +1061,7 @@ static void __exit pch_dma_exit(void) | |||
| 1057 | module_init(pch_dma_init); | 1061 | module_init(pch_dma_init); |
| 1058 | module_exit(pch_dma_exit); | 1062 | module_exit(pch_dma_exit); |
| 1059 | 1063 | ||
| 1060 | MODULE_DESCRIPTION("Intel EG20T PCH / LAPIS Semiconductor ML7213/ML7223 IOH " | 1064 | MODULE_DESCRIPTION("Intel EG20T PCH / LAPIS Semicon ML7213/ML7223/ML7831 IOH " |
| 1061 | "DMA controller driver"); | 1065 | "DMA controller driver"); |
| 1062 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); | 1066 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); |
| 1063 | MODULE_LICENSE("GPL v2"); | 1067 | MODULE_LICENSE("GPL v2"); |
