From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Viresh Kumar <viresh.linux@gmail.com>,
Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCHv1 1/6] dmaengine: dw_dmac: Remove clk API dependency
Date: Tue, 25 Sep 2012 15:13:05 +0300 [thread overview]
Message-ID: <1348575190-11761-2-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1348575190-11761-1-git-send-email-andriy.shevchenko@linux.intel.com>
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Not all platforms support clk API.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/Kconfig | 1 -
drivers/dma/dw_dmac.c | 18 +++---------------
drivers/dma/dw_dmac_regs.h | 1 -
3 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 677cd6e..df32537 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -83,7 +83,6 @@ config INTEL_IOP_ADMA
config DW_DMAC
tristate "Synopsys DesignWare AHB DMA support"
- depends on HAVE_CLK
select DMA_ENGINE
default y if CPU_AT32AP7000
help
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 9316d03..d9344a7 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1,9 +1,9 @@
/*
- * Driver for the Synopsys DesignWare DMA Controller (aka DMACA on
- * AVR32 systems.)
+ * Core driver for the Synopsys DesignWare DMA Controller
*
* Copyright (C) 2007-2008 Atmel Corporation
* Copyright (C) 2010-2011 ST Microelectronics
+ * Copyright (C) 2012 Intel Corporation
*
* 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
@@ -12,7 +12,6 @@
#define VERBOSE_DEBUG
#define DEBUG
#include <linux/bitops.h>
-#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
@@ -224,7 +223,6 @@ static inline void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
channel_readl(dwc, CTL_LO));
}
-
static inline void dwc_chan_disable(struct dw_dma *dw, struct dw_dma_chan *dwc)
{
channel_clear_bit(dw, CH_EN, dwc->mask);
@@ -1508,11 +1506,6 @@ static int __devinit dw_probe(struct platform_device *pdev)
if (!dw)
return -ENOMEM;
- dw->clk = devm_clk_get(&pdev->dev, "hclk");
- if (IS_ERR(dw->clk))
- return PTR_ERR(dw->clk);
- clk_prepare_enable(dw->clk);
-
dw->regs = regs;
/* get hardware configuration parameters */
@@ -1657,19 +1650,14 @@ static int __devexit dw_remove(struct platform_device *pdev)
static void dw_shutdown(struct platform_device *pdev)
{
- struct dw_dma *dw = platform_get_drvdata(pdev);
-
dw_dma_off(platform_get_drvdata(pdev));
- clk_disable_unprepare(dw->clk);
}
static int dw_suspend_noirq(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
- struct dw_dma *dw = platform_get_drvdata(pdev);
dw_dma_off(platform_get_drvdata(pdev));
- clk_disable_unprepare(dw->clk);
return 0;
}
@@ -1679,8 +1667,8 @@ static int dw_resume_noirq(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct dw_dma *dw = platform_get_drvdata(pdev);
- clk_prepare_enable(dw->clk);
dma_writel(dw, CFG, DW_CFG_DMA_EN);
+
return 0;
}
diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h
index ff39fa6..50e0b63 100644
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw_dmac_regs.h
@@ -229,7 +229,6 @@ struct dw_dma {
struct dma_device dma;
void __iomem *regs;
struct tasklet_struct tasklet;
- struct clk *clk;
u8 all_chan_mask;
--
1.7.10.4
next prev parent reply other threads:[~2012-09-25 12:14 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 12:13 [PATCHv1 0/6] dw_dmac: split the driver and introduce PCI part Andy Shevchenko
2012-09-25 12:13 ` Andy Shevchenko [this message]
2012-09-26 3:42 ` [PATCHv1 1/6] dmaengine: dw_dmac: Remove clk API dependency viresh kumar
2012-09-26 12:33 ` Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 2/6] dmaengine: dw_dmac: add driver for Atmel AT32 Andy Shevchenko
2012-09-26 3:50 ` viresh kumar
2012-09-26 6:47 ` Andy Shevchenko
2012-09-26 6:51 ` viresh kumar
2012-09-26 6:56 ` Andy Shevchenko
2012-09-26 3:52 ` viresh kumar
2012-09-25 12:13 ` [PATCHv1 3/6] dmaengine: dw_dmac: Add PCI part of the driver Andy Shevchenko
2012-09-26 4:00 ` viresh kumar
2012-09-26 7:48 ` Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 4/6] avr32: at32ap700x: rename DMA controller Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 5/6] MAINTAINERS: fix indentation for Viresh Kumar Andy Shevchenko
2012-09-26 3:36 ` viresh kumar
2012-09-26 7:10 ` Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 6/6] MAINTAINERS: add recently created files to dw_dmac section Andy Shevchenko
2012-09-25 13:19 ` Joe Perches
2012-09-25 13:37 ` Andy Shevchenko
2012-09-25 15:33 ` Vinod Koul
2012-09-25 16:57 ` Joe Perches
2012-09-26 6:44 ` Andy Shevchenko
2012-09-26 3:39 ` viresh kumar
2012-09-26 12:40 ` [PATCHv2 0/4] dw_dmac: split the driver and introduce PCI part Andy Shevchenko
2012-09-26 12:40 ` [PATCHv2 1/4] dmaengine: dw_dmac: convert to platform driver Andy Shevchenko
2012-09-26 14:13 ` viresh kumar
2012-09-26 18:00 ` Andy Shevchenko
2012-09-27 3:47 ` viresh kumar
2012-09-26 12:40 ` [PATCHv2 2/4] dmaengine: dw_dmac: Add PCI part of the driver Andy Shevchenko
2012-09-26 14:33 ` viresh kumar
2012-09-26 17:55 ` Andy Shevchenko
2012-09-26 19:41 ` Arnd Bergmann
2012-09-27 3:53 ` viresh kumar
2012-09-27 7:41 ` Arnd Bergmann
2012-09-27 14:22 ` Vinod Koul
2012-09-27 14:42 ` Arnd Bergmann
2012-09-26 12:40 ` [PATCHv2 3/4] dma: move dw_dmac driver to an own directory Andy Shevchenko
2012-09-26 14:53 ` viresh kumar
2012-09-26 17:50 ` Andy Shevchenko
2012-09-26 12:40 ` [PATCHv2 4/4] MAINTAINERS: add recently created files to dw_dmac section Andy Shevchenko
2012-09-26 14:45 ` viresh kumar
2012-09-26 14:48 ` viresh kumar
2012-09-26 17:49 ` Andy Shevchenko
2012-09-27 6:38 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348575190-11761-2-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
--cc=viresh.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome