From: Jagan Teki <jagan@amarulasolutions.com>
To: Yong Deng <yong.deng@magewell.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Chen-Yu Tsai <wens@csie.org>,
linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-sunxi <linux-sunxi@googlegroups.com>,
linux-amarula@amarulasolutions.com,
Michael Trimarchi <michael@amarulasolutions.com>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Subject: [PATCH v5 2/6] media: sun6i: Add mod_rate quirk
Date: Thu, 20 Dec 2018 18:24:34 +0530 [thread overview]
Message-ID: <20181220125438.11700-3-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20181220125438.11700-1-jagan@amarulasolutions.com>
Unfortunately default CSI_SCLK rate cannot work properly to
drive the connected sensor interface, particularly on few
Allwinner SoC's like A64.
So, add mod_rate quirk via driver data so-that the respective
SoC's which require to alter the default mod clock rate can assign
the operating clock rate.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
.../platform/sunxi/sun6i-csi/sun6i_csi.c | 34 +++++++++++++++----
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index ee882b66a5ea..fe002beae09c 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -15,6 +15,7 @@
#include <linux/ioctl.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
@@ -28,8 +29,13 @@
#define MODULE_NAME "sun6i-csi"
+struct sun6i_csi_variant {
+ unsigned long mod_rate;
+};
+
struct sun6i_csi_dev {
struct sun6i_csi csi;
+ const struct sun6i_csi_variant *variant;
struct device *dev;
struct regmap *regmap;
@@ -822,33 +828,43 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,
return PTR_ERR(sdev->clk_mod);
}
+ if (sdev->variant->mod_rate)
+ clk_set_rate_exclusive(sdev->clk_mod, sdev->variant->mod_rate);
+
sdev->clk_ram = devm_clk_get(&pdev->dev, "ram");
if (IS_ERR(sdev->clk_ram)) {
dev_err(&pdev->dev, "Unable to acquire dram-csi clock\n");
- return PTR_ERR(sdev->clk_ram);
+ ret = PTR_ERR(sdev->clk_ram);
+ goto err_unprotect_clk;
}
sdev->rstc_bus = devm_reset_control_get_shared(&pdev->dev, NULL);
if (IS_ERR(sdev->rstc_bus)) {
dev_err(&pdev->dev, "Cannot get reset controller\n");
return PTR_ERR(sdev->rstc_bus);
+ goto err_unprotect_clk;
}
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(&pdev->dev, "No csi IRQ specified\n");
ret = -ENXIO;
- return ret;
+ goto err_unprotect_clk;
}
ret = devm_request_irq(&pdev->dev, irq, sun6i_csi_isr, 0, MODULE_NAME,
sdev);
if (ret) {
dev_err(&pdev->dev, "Cannot request csi IRQ\n");
- return ret;
+ goto err_unprotect_clk;
}
return 0;
+
+err_unprotect_clk:
+ if (sdev->variant->mod_rate)
+ clk_rate_exclusive_put(sdev->clk_mod);
+ return ret;
}
/*
@@ -871,6 +887,7 @@ static int sun6i_csi_probe(struct platform_device *pdev)
sdev->dev = &pdev->dev;
/* The DMA bus has the memory mapped at 0 */
sdev->dev->dma_pfn_offset = PHYS_OFFSET >> PAGE_SHIFT;
+ sdev->variant = of_device_get_match_data(sdev->dev);
ret = sun6i_csi_resource_request(sdev, pdev);
if (ret)
@@ -887,14 +904,19 @@ static int sun6i_csi_remove(struct platform_device *pdev)
struct sun6i_csi_dev *sdev = platform_get_drvdata(pdev);
sun6i_csi_v4l2_cleanup(&sdev->csi);
+ if (sdev->variant->mod_rate)
+ clk_rate_exclusive_put(sdev->clk_mod);
return 0;
}
+static const struct sun6i_csi_variant sun6i_a31_csi = {
+};
+
static const struct of_device_id sun6i_csi_of_match[] = {
- { .compatible = "allwinner,sun6i-a31-csi", },
- { .compatible = "allwinner,sun8i-h3-csi", },
- { .compatible = "allwinner,sun8i-v3s-csi", },
+ { .compatible = "allwinner,sun6i-a31-csi", .data = &sun6i_a31_csi, },
+ { .compatible = "allwinner,sun8i-h3-csi", .data = &sun6i_a31_csi, },
+ { .compatible = "allwinner,sun8i-v3s-csi", .data = &sun6i_a31_csi, },
{},
};
MODULE_DEVICE_TABLE(of, sun6i_csi_of_match);
--
2.18.0.321.gffc6fa0e3
next prev parent reply other threads:[~2018-12-20 12:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 12:54 [PATCH v5 0/6] media/sun6i: Allwinner A64 CSI support Jagan Teki
2018-12-20 12:54 ` [PATCH v5 1/6] dt-bindings: media: sun6i: Add A64 CSI compatible Jagan Teki
2018-12-20 12:54 ` Jagan Teki [this message]
2018-12-21 13:00 ` [PATCH v5 2/6] media: sun6i: Add mod_rate quirk Maxime Ripard
2018-12-24 15:27 ` Jagan Teki
2019-01-06 16:30 ` Jagan Teki
2019-01-07 13:29 ` Maxime Ripard
2019-01-11 6:05 ` Jagan Teki
2019-01-11 6:24 ` Jagan Teki
2019-01-16 11:11 ` Maxime Ripard
2019-01-17 4:34 ` Jagan Teki
2018-12-20 12:54 ` [PATCH v5 3/6] media: sun6i: Add A64 CSI block support Jagan Teki
2018-12-20 12:54 ` [PATCH v5 4/6] arm64: dts: allwinner: a64: Add A64 CSI controller Jagan Teki
2018-12-20 12:54 ` [PATCH v5 5/6] arm64: dts: allwinner: a64: Add pinmux setting for CSI MCLK on PE1 Jagan Teki
2018-12-20 12:54 ` [DO NOT MERGE] [PATCH v5 6/6] arm64: dts: allwinner: bananapi-m64: Add HDF5640 camera module Jagan Teki
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=20181220125438.11700-3-jagan@amarulasolutions.com \
--to=jagan@amarulasolutions.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=mchehab@kernel.org \
--cc=michael@amarulasolutions.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
--cc=yong.deng@magewell.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;
as well as URLs for NNTP newsgroup(s).