Message ID | 20210617162745.4080975-11-heiko@sntech.de |
---|---|
State | Superseded |
Headers | show |
Series | rkisp1 support for px30 | expand |
Hi, On 17.06.21 19:27, Heiko Stuebner wrote: > From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> > > The px30 uses a V12 isp block so add compatible and matchdata > for it. > > Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > --- > .../platform/rockchip/rkisp1/rkisp1-dev.c | 25 +++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > index a14a0bc39fb0..8a9bb97d334a 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > @@ -405,6 +405,27 @@ static irqreturn_t rkisp1_isr(int irq, void *ctx) > return IRQ_HANDLED; > } > > +static const char * const px30_isp_clks[] = { > + "isp", > + "aclk", > + "hclk", > + "pclk", > +}; > + > +static const struct rkisp1_isr_data px30_isp_isrs[] = { > + { "isp", rkisp1_isp_isr }, > + { "mi", rkisp1_capture_isr }, > + { "mipi", rkisp1_mipi_isr }, > +}; > + > +static const struct rkisp1_match_data px30_isp_match_data = { > + .clks = px30_isp_clks, > + .size = ARRAY_SIZE(px30_isp_clks), > + .isrs = px30_isp_isrs, > + .isr_size = ARRAY_SIZE(px30_isp_isrs), > + .isp_ver = RKISP1_V12, > +}; > + > static const char * const rk3399_isp_clks[] = { > "isp", > "aclk", > @@ -424,6 +445,10 @@ static const struct rkisp1_match_data rk3399_isp_match_data = { > }; > > static const struct of_device_id rkisp1_of_match[] = { > + { > + .compatible = "rockchip,px30-cif-isp", > + .data = &px30_isp_match_data, > + }, > { > .compatible = "rockchip,rk3399-cif-isp", > .data = &rk3399_isp_match_data, >
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index a14a0bc39fb0..8a9bb97d334a 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -405,6 +405,27 @@ static irqreturn_t rkisp1_isr(int irq, void *ctx) return IRQ_HANDLED; } +static const char * const px30_isp_clks[] = { + "isp", + "aclk", + "hclk", + "pclk", +}; + +static const struct rkisp1_isr_data px30_isp_isrs[] = { + { "isp", rkisp1_isp_isr }, + { "mi", rkisp1_capture_isr }, + { "mipi", rkisp1_mipi_isr }, +}; + +static const struct rkisp1_match_data px30_isp_match_data = { + .clks = px30_isp_clks, + .size = ARRAY_SIZE(px30_isp_clks), + .isrs = px30_isp_isrs, + .isr_size = ARRAY_SIZE(px30_isp_isrs), + .isp_ver = RKISP1_V12, +}; + static const char * const rk3399_isp_clks[] = { "isp", "aclk", @@ -424,6 +445,10 @@ static const struct rkisp1_match_data rk3399_isp_match_data = { }; static const struct of_device_id rkisp1_of_match[] = { + { + .compatible = "rockchip,px30-cif-isp", + .data = &px30_isp_match_data, + }, { .compatible = "rockchip,rk3399-cif-isp", .data = &rk3399_isp_match_data,