This is a note to let you know that I've just added the patch titled
pch_dma: Support new device LAPIS Semiconductor ML7831 IOH
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pch_dma-support-new-device-lapis-semiconductor-ml7831-ioh.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From ca7fe2db892dcf91b2c72ee352eda4ff867903a7 Mon Sep 17 00:00:00 2001
From: Tomoya MORINAGA <[email protected]>
Date: Thu, 17 Nov 2011 16:14:23 +0900
Subject: pch_dma: Support new device LAPIS Semiconductor ML7831 IOH
From: Tomoya MORINAGA <[email protected]>
commit ca7fe2db892dcf91b2c72ee352eda4ff867903a7 upstream.
ML7831 is companion chip for Intel Atom E6xx series.
Signed-off-by: Tomoya MORINAGA <[email protected]>
Signed-off-by: Vinod Koul <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/dma/Kconfig | 13 ++++++-------
drivers/dma/pch_dma.c | 8 ++++++--
2 files changed, 12 insertions(+), 9 deletions(-)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -200,18 +200,17 @@ config PL330_DMA
platform_data for a dma-pl330 device.
config PCH_DMA
- tristate "Intel EG20T PCH / OKI Semi IOH(ML7213/ML7223) DMA support"
+ tristate "Intel EG20T PCH / OKI Semi IOH(ML7213/ML7223/ML7831) DMA
support"
depends on PCI && X86
select DMA_ENGINE
help
Enable support for Intel EG20T PCH DMA engine.
-
This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
- Output Hub), ML7213 and ML7223.
- ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
- for MP(Media Phone) use.
- ML7213/ML7223 is companion chip for Intel Atom E6xx series.
- ML7213/ML7223 is completely compatible for Intel EG20T PCH.
+ Output Hub), ML7213, ML7223 and ML7831.
+ ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is
+ for MP(Media Phone) use and ML7831 IOH is for general purpose use.
+ ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
+ ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
config IMX_SDMA
tristate "i.MX SDMA support"
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -1021,6 +1021,8 @@ static void __devexit pch_dma_remove(str
#define PCI_DEVICE_ID_ML7223_DMA2_4CH 0x800E
#define PCI_DEVICE_ID_ML7223_DMA3_4CH 0x8017
#define PCI_DEVICE_ID_ML7223_DMA4_4CH 0x803B
+#define PCI_DEVICE_ID_ML7831_DMA1_8CH 0x8810
+#define PCI_DEVICE_ID_ML7831_DMA2_4CH 0x8815
DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = {
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 },
@@ -1033,6 +1035,8 @@ DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table
{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA2_4CH), 4}, /* Video SPI */
{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA3_4CH), 4}, /* Security */
{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA4_4CH), 4}, /* FPGA */
+ { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA1_8CH), 8}, /* UART */
+ { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA2_4CH), 4}, /* SPI */
{ 0, },
};
@@ -1060,7 +1064,7 @@ static void __exit pch_dma_exit(void)
module_init(pch_dma_init);
module_exit(pch_dma_exit);
-MODULE_DESCRIPTION("Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH "
- "DMA controller driver");
+MODULE_DESCRIPTION("Intel EG20T PCH / OKI SEMICON ML7213/ML7223/ML7831 IOH"
+ "DMA controller driver");
MODULE_AUTHOR("Yong Wang <[email protected]>");
MODULE_LICENSE("GPL v2");
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/pch_dma-fix-channel-locking.patch
queue-3.0/usb-gadget-pch_udc-fix-usb-suspend-issue.patch
queue-3.0/pch_dma-fix-suspend-issue.patch
queue-3.0/pch_uart-set-pcie-bus-number-using-probe-parameter.patch
queue-3.0/usb-pch_udc-support-new-device-lapis-semiconductor-ml7831-ioh.patch
queue-3.0/usb-gadget-pch_udc-fix-wrong-return-value.patch
queue-3.0/usb-gadget-pch_udc-fix-usb-gadget-pch_udc-fix-ether.patch
queue-3.0/usb-gadget-pch_udc-fix-disconnect-issue.patch
queue-3.0/pch_dma-support-new-device-lapis-semiconductor-ml7831-ioh.patch
queue-3.0/pch_dma-fix-dma-issue-ch8-ch11.patch
queue-3.0/pch_phub-improve-ade-address-decode-enable-control.patch
queue-3.0/usb-gadget-pch_udc-reduce-redundant-interrupt.patch
queue-3.0/8250_pci-fix-kernel-panic-when-pch_uart-is-disabled.patch
queue-3.0/pch_dma-fix-ctl-register-access-issue.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
