Commit bc67ec9e authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Mauro Carvalho Chehab

media: sun6i-csi: Define and use variant to get module clock rate

Introduce a proper variant structure with the module clock rate
instead of hardcoding it with a manual check on the compatible.
Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 740b5b3d
...@@ -808,11 +808,15 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, ...@@ -808,11 +808,15 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,
struct platform_device *platform_dev) struct platform_device *platform_dev)
{ {
struct device *dev = csi_dev->dev; struct device *dev = csi_dev->dev;
unsigned long clock_mod_rate; const struct sun6i_csi_variant *variant;
void __iomem *io_base; void __iomem *io_base;
int ret; int ret;
int irq; int irq;
variant = of_device_get_match_data(dev);
if (!variant)
return -EINVAL;
/* Registers */ /* Registers */
io_base = devm_platform_ioremap_resource(platform_dev, 0); io_base = devm_platform_ioremap_resource(platform_dev, 0);
...@@ -840,12 +844,8 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, ...@@ -840,12 +844,8 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,
return PTR_ERR(csi_dev->clock_ram); return PTR_ERR(csi_dev->clock_ram);
} }
if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi")) ret = clk_set_rate_exclusive(csi_dev->clock_mod,
clock_mod_rate = 300000000; variant->clock_mod_rate);
else
clock_mod_rate = 297000000;
ret = clk_set_rate_exclusive(csi_dev->clock_mod, clock_mod_rate);
if (ret) { if (ret) {
dev_err(dev, "failed to set mod clock rate\n"); dev_err(dev, "failed to set mod clock rate\n");
return ret; return ret;
...@@ -928,12 +928,35 @@ static int sun6i_csi_remove(struct platform_device *pdev) ...@@ -928,12 +928,35 @@ static int sun6i_csi_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct sun6i_csi_variant sun6i_a31_csi_variant = {
.clock_mod_rate = 297000000,
};
static const struct sun6i_csi_variant sun50i_a64_csi_variant = {
.clock_mod_rate = 300000000,
};
static const struct of_device_id sun6i_csi_of_match[] = { static const struct of_device_id sun6i_csi_of_match[] = {
{ .compatible = "allwinner,sun6i-a31-csi", }, {
{ .compatible = "allwinner,sun8i-a83t-csi", }, .compatible = "allwinner,sun6i-a31-csi",
{ .compatible = "allwinner,sun8i-h3-csi", }, .data = &sun6i_a31_csi_variant,
{ .compatible = "allwinner,sun8i-v3s-csi", }, },
{ .compatible = "allwinner,sun50i-a64-csi", }, {
.compatible = "allwinner,sun8i-a83t-csi",
.data = &sun6i_a31_csi_variant,
},
{
.compatible = "allwinner,sun8i-h3-csi",
.data = &sun6i_a31_csi_variant,
},
{
.compatible = "allwinner,sun8i-v3s-csi",
.data = &sun6i_a31_csi_variant,
},
{
.compatible = "allwinner,sun50i-a64-csi",
.data = &sun50i_a64_csi_variant,
},
{}, {},
}; };
......
...@@ -58,6 +58,10 @@ struct sun6i_csi_device { ...@@ -58,6 +58,10 @@ struct sun6i_csi_device {
int planar_offset[3]; int planar_offset[3];
}; };
struct sun6i_csi_variant {
unsigned long clock_mod_rate;
};
/** /**
* sun6i_csi_is_format_supported() - check if the format supported by csi * sun6i_csi_is_format_supported() - check if the format supported by csi
* @csi_dev: pointer to the csi device * @csi_dev: pointer to the csi device
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment