lkml.org 
[lkml]   [2012]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 52/59] pch_dma: Support new device LAPIS Semiconductor ML7831 IOH
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tomoya MORINAGA <tomoya.rohm@gmail.com>

    commit ca7fe2db892dcf91b2c72ee352eda4ff867903a7 upstream.

    ML7831 is companion chip for Intel Atom E6xx series.

    Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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 <yong.y.wang@intel.com>");
    MODULE_LICENSE("GPL v2");



    \
     
     \ /
      Last update: 2012-04-19 23:39    [W:4.426 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site