pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
PATCH v2 1/2 pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
On October 1 in 2011,
OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor Co., Ltd.
Signed-off-by Tomoya MORINAGA <[email protected]>
--- drivers/dma/Kconfig | 4 ++-- drivers/dma/pch_dma.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/dma/Kconfig +2 -2
@@ -201,13 +201,13 @@ 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 / LAPIS Semi IOH(ML7213/ML7223) 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/ + This driver also can be used for LAPIS 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.
drivers/dma/pch_dma.c +2 -2
@@ -1,7 +1,7 @@/* * Topcliff PCH DMA controller driver * Copyright (c) 2010 Intel Corporation -* Copyright (C) 2011 OKI SEMICONDUCTOR CO., LTD. +* Copyright (C) 2011 LAPIS Semiconductor Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -1057,7 +1057,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 " +MODULE_DESCRIPTION ("Intel EG20T PCH / LAPIS Semiconductor ML7213/ML7223 IOH " "DMA controller driver" );MODULE_AUTHOR ("Yong Wang <[email protected]>" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
1.7.4.4
PATCH v2 2/2 pch_dma: Support new device LAPIS Semiconductor ML7831 IOH
ML7831 is companion chip for Intel Atom E6xx series.
Signed-off-by Tomoya MORINAGA <[email protected]>
--- drivers/dma/Kconfig | 12 ++++++------ drivers/dma/pch_dma.c | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-)
drivers/dma/Kconfig +6 -6
@@ -201,18 +201,18 @@ config PL330_DMA platform_data for a dma-pl330 device. config PCH_DMA - tristate "Intel EG20T PCH / LAPIS Semi IOH(ML7213/ML7223) DMA support" + tristate "Intel EG20T PCH / LAPIS Semicon IOH(ML7213/ML7223/ML7831) DMA" depends on PCI && X86 select DMA_ENGINE help Enable support for Intel EG20T PCH DMA engine. This driver also can be used for LAPIS 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"
drivers/dma/pch_dma.c +5 -1
@@ -1018,6 +1018,8 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev)#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 0x8815DEFINE_PCI_DEVICE_TABLE (pch_dma_id_table) = { {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_EG20T_PCH_DMA_8CH ),8 },
@@ -1030,6 +1032,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, }, };
@@ -1057,7 +1061,7 @@ static void __exit pch_dma_exit(void)module_init (pch_dma_init);module_exit (pch_dma_exit); -MODULE_DESCRIPTION ("Intel EG20T PCH / LAPIS Semiconductor ML7213/ML7223 IOH " +MODULE_DESCRIPTION ("Intel EG20T PCH / LAPIS Semicon ML7213/ML7223/ML7831 IOH " "DMA controller driver" );MODULE_AUTHOR ("Yong Wang <[email protected]>" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
1.7.4.4
Vinod Koul
AppliedQuoted 5 lines · Tomoya MORINAGA
On October 1 in 2011,
OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor Co., Ltd.Signed-off-by Tomoya MORINAGA <[email protected]>
Applied both, Thanks
Quoted 47 lines
--- drivers/dma/Kconfig | 4 ++-- drivers/dma/pch_dma.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/dma/Kconfig +2
-2@@ -201,13 +201,13 @@ 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 / LAPIS Semi IOH(ML7213/ML7223) 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/ + This driver also can be used for LAPIS 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.drivers/dma/pch_dma.c +2
-2@@ -1,7 +1,7 @@/* * Topcliff PCH DMA controller driver * Copyright (c) 2010 Intel Corporation -* Copyright (C) 2011 OKI SEMICONDUCTOR CO., LTD. +* Copyright (C) 2011 LAPIS Semiconductor Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -1057,7 +1057,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 " +MODULE_DESCRIPTION ("Intel EG20T PCH / LAPIS Semiconductor ML7213/ML7223 IOH " "DMA controller driver" );MODULE_AUTHOR ("Yong Wang <[email protected]>" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
~Vinod