diff mbox

[1/2] dma: tegra: rename driver and compatible to match with dts

Message ID 1341217328-6676-2-git-send-email-ldewangan@nvidia.com
State Not Applicable, archived
Headers show

Commit Message

Laxman Dewangan July 2, 2012, 8:22 a.m. UTC
Rename the compatible name and driver name to match with
tegra dts file and as per clock driver.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
 drivers/dma/tegra20-apb-dma.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Comments

Stephen Warren July 2, 2012, 4:01 p.m. UTC | #1
On 07/02/2012 02:22 AM, Laxman Dewangan wrote:
> Rename the compatible name and driver name to match with
> tegra dts file and as per clock driver.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>

Acked-by: Stephen Warren <swarren@wwwdotorg.org>

The separate config options for the old and new DMA drivers should
prevent them conflicting with each-other, even though they both support
the same compatible values and driver name. Hence, this patch should be
fine.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Vinod Koul July 13, 2012, 3:21 a.m. UTC | #2
On Mon, 2012-07-02 at 13:52 +0530, Laxman Dewangan wrote:
> Rename the compatible name and driver name to match with
> tegra dts file and as per clock driver.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Applied both, Thanks
diff mbox

Patch

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index c0836a7..340c617 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -1177,10 +1177,10 @@  static struct tegra_dma_chip_data tegra30_dma_chip_data = {
 
 static const struct of_device_id tegra_dma_of_match[] __devinitconst = {
 	{
-		.compatible = "nvidia,tegra30-apbdma-new",
+		.compatible = "nvidia,tegra30-apbdma",
 		.data = &tegra30_dma_chip_data,
 	}, {
-		.compatible = "nvidia,tegra20-apbdma-new",
+		.compatible = "nvidia,tegra20-apbdma",
 		.data = &tegra20_dma_chip_data,
 	}, {
 	},
@@ -1395,7 +1395,7 @@  static const struct dev_pm_ops tegra_dma_dev_pm_ops __devinitconst = {
 
 static struct platform_driver tegra_dmac_driver = {
 	.driver = {
-		.name	= "tegra20-apbdma",
+		.name	= "tegra-apbdma",
 		.owner = THIS_MODULE,
 		.pm	= &tegra_dma_dev_pm_ops,
 		.of_match_table = of_match_ptr(tegra_dma_of_match),