* [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
@ 2011-11-17 7:14 Tomoya MORINAGA
2011-11-17 7:14 ` [PATCH 2/2 v2] pch_dma: Support new device LAPIS Semiconductor ML7831 IOH Tomoya MORINAGA
2011-11-17 9:02 ` [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Tomoya MORINAGA @ 2011-11-17 7:14 UTC (permalink / raw)
To: Dan Williams, Vinod Koul, linux-kernel
Cc: qi.wang, yong.y.wang, joel.clark, kok.howg.ewe, 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 <tomoya.rohm@gmail.com>
---
drivers/dma/Kconfig | 4 ++--
drivers/dma/pch_dma.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index ab8f469..495e841 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -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.
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index a6d0e3d..a9b8a79 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -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 <yong.y.wang@intel.com>");
MODULE_LICENSE("GPL v2");
--
1.7.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2 v2] pch_dma: Support new device LAPIS Semiconductor ML7831 IOH
2011-11-17 7:14 [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Tomoya MORINAGA
@ 2011-11-17 7:14 ` Tomoya MORINAGA
2011-11-17 9:02 ` [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Tomoya MORINAGA @ 2011-11-17 7:14 UTC (permalink / raw)
To: Dan Williams, Vinod Koul, linux-kernel
Cc: qi.wang, yong.y.wang, joel.clark, kok.howg.ewe, Tomoya MORINAGA
ML7831 is companion chip for Intel Atom E6xx series.
Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
---
drivers/dma/Kconfig | 12 ++++++------
drivers/dma/pch_dma.c | 6 +++++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 495e841..22439e2 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -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"
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index a9b8a79..60aca37 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)
#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 },
@@ -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 <yong.y.wang@intel.com>");
MODULE_LICENSE("GPL v2");
--
1.7.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
2011-11-17 7:14 [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Tomoya MORINAGA
2011-11-17 7:14 ` [PATCH 2/2 v2] pch_dma: Support new device LAPIS Semiconductor ML7831 IOH Tomoya MORINAGA
@ 2011-11-17 9:02 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2011-11-17 9:02 UTC (permalink / raw)
To: Tomoya MORINAGA
Cc: Dan Williams, linux-kernel, qi.wang, yong.y.wang, joel.clark,
kok.howg.ewe
On Thu, 2011-11-17 at 16:14 +0900, Tomoya MORINAGA wrote:
> On October 1 in 2011,
> OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor
> Co., Ltd.
>
> Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
Applied both, Thanks
> ---
> drivers/dma/Kconfig | 4 ++--
> drivers/dma/pch_dma.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index ab8f469..495e841 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -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.
> diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
> index a6d0e3d..a9b8a79 100644
> --- a/drivers/dma/pch_dma.c
> +++ b/drivers/dma/pch_dma.c
> @@ -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 <yong.y.wang@intel.com>");
> MODULE_LICENSE("GPL v2");
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-17 9:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-17 7:14 [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Tomoya MORINAGA
2011-11-17 7:14 ` [PATCH 2/2 v2] pch_dma: Support new device LAPIS Semiconductor ML7831 IOH Tomoya MORINAGA
2011-11-17 9:02 ` [PATCH 1/2 v2] pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).