From: josh.wu@atmel.com (Josh Wu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] media: atmel-isi: remove mck back compatiable code as we don't need it
Date: Thu, 5 Mar 2015 13:01:01 +0800 [thread overview]
Message-ID: <1425531661-20040-4-git-send-email-josh.wu@atmel.com> (raw)
In-Reply-To: <1425531661-20040-1-git-send-email-josh.wu@atmel.com>
The master clock should handled by sensor itself.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
drivers/media/platform/soc_camera/atmel-isi.c | 32 ---------------------------
1 file changed, 32 deletions(-)
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 4a384f1..50375ce 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -83,8 +83,6 @@ struct atmel_isi {
struct completion complete;
/* ISI peripherial clock */
struct clk *pclk;
- /* ISI_MCK, feed to camera sensor to generate pixel clock */
- struct clk *mck;
unsigned int irq;
struct isi_platform_data pdata;
@@ -725,26 +723,12 @@ static void isi_camera_remove_device(struct soc_camera_device *icd)
/* Called with .host_lock held */
static int isi_camera_clock_start(struct soc_camera_host *ici)
{
- struct atmel_isi *isi = ici->priv;
- int ret;
-
- if (!IS_ERR(isi->mck)) {
- ret = clk_prepare_enable(isi->mck);
- if (ret) {
- return ret;
- }
- }
-
return 0;
}
/* Called with .host_lock held */
static void isi_camera_clock_stop(struct soc_camera_host *ici)
{
- struct atmel_isi *isi = ici->priv;
-
- if (!IS_ERR(isi->mck))
- clk_disable_unprepare(isi->mck);
}
static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
@@ -894,7 +878,6 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi,
/* Default settings for ISI */
isi->pdata.full_mode = 1;
- isi->pdata.mck_hz = ISI_DEFAULT_MCLK_FREQ;
isi->pdata.frate = ISI_CFG1_FRATE_CAPTURE_ALL;
np = of_graph_get_next_endpoint(np, NULL);
@@ -970,21 +953,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&isi->video_buffer_list);
INIT_LIST_HEAD(&isi->dma_desc_head);
- /* ISI_MCK is the sensor master clock. It should be handled by the
- * sensor driver directly, as the ISI has no use for that clock. Make
- * the clock optional here while platforms transition to the correct
- * model.
- */
- isi->mck = devm_clk_get(dev, "isi_mck");
- if (!IS_ERR(isi->mck)) {
- /* Set ISI_MCK's frequency, it should be faster than pixel
- * clock.
- */
- ret = clk_set_rate(isi->mck, isi->pdata.mck_hz);
- if (ret < 0)
- return ret;
- }
-
isi->p_fb_descriptors = dma_alloc_coherent(&pdev->dev,
sizeof(struct fbd) * MAX_BUFFER_NUM,
&isi->fb_descriptors_phys,
--
1.9.1
next prev parent reply other threads:[~2015-03-05 5:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-05 5:00 [PATCH 0/3] media: atmel-isi: rework on the clock part and add runtime pm support Josh Wu
2015-03-05 5:00 ` [PATCH 1/3] media: atmel-isi: move the peripheral clock to start/stop_stream() function Josh Wu
2015-03-05 10:39 ` Laurent Pinchart
2015-03-06 10:16 ` Josh Wu
2015-03-05 5:01 ` [PATCH 2/3] media: atmel-isi: add runtime pm support Josh Wu
2015-03-05 10:36 ` Laurent Pinchart
2015-03-06 10:10 ` Josh Wu
2015-03-05 5:01 ` Josh Wu [this message]
2015-03-05 10:41 ` [PATCH 3/3] media: atmel-isi: remove mck back compatiable code as we don't need it Laurent Pinchart
2015-03-06 10:13 ` Josh Wu
2015-03-06 20:25 ` Guennadi Liakhovetski
2015-03-08 0:28 ` Laurent Pinchart
2015-03-09 1:33 ` Josh Wu
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=1425531661-20040-4-git-send-email-josh.wu@atmel.com \
--to=josh.wu@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).