From: Heiko Stuebner <heiko@sntech.de> To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl Cc: ezequiel@collabora.com, dafna.hirschfeld@collabora.com, helen.koike@collabora.com, Laurent.pinchart@ideasonboard.com, linux-rockchip@lists.infradead.org, linux-media@vger.kernel.org, heiko@sntech.de, robh+dt@kernel.org, devicetree@vger.kernel.org, Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Subject: [PATCH v7 10/10] media: rockchip: rkisp1: add support for px30 isp version Date: Fri, 23 Jul 2021 09:32:21 +0200 [thread overview] Message-ID: <20210723073221.1276358-11-heiko@sntech.de> (raw) In-Reply-To: <20210723073221.1276358-1-heiko@sntech.de> 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 290e9bc4c060..23ca49289feb 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, + .clk_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, -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Heiko Stuebner <heiko@sntech.de> To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl Cc: ezequiel@collabora.com, dafna.hirschfeld@collabora.com, helen.koike@collabora.com, Laurent.pinchart@ideasonboard.com, linux-rockchip@lists.infradead.org, linux-media@vger.kernel.org, heiko@sntech.de, robh+dt@kernel.org, devicetree@vger.kernel.org, Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Subject: [PATCH v7 10/10] media: rockchip: rkisp1: add support for px30 isp version Date: Fri, 23 Jul 2021 09:32:21 +0200 [thread overview] Message-ID: <20210723073221.1276358-11-heiko@sntech.de> (raw) In-Reply-To: <20210723073221.1276358-1-heiko@sntech.de> 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 290e9bc4c060..23ca49289feb 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, + .clk_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, -- 2.29.2 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2021-07-23 7:36 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-23 7:32 [PATCH v7 0/10] rkisp1 support for px30 Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 01/10] media: rockchip: rkisp1: remove unused irq variable Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 02/10] dt-bindings: media: rkisp1: fix pclk clock-name Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 03/10] dt-bindings: media: rkisp1: document different irq possibilities Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 04/10] media: rockchip: rkisp1: allow separate interrupts Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 05/10] media: rockchip: rkisp1: make some isp-param functions variable Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 06/10] media: rockchip: rkisp1: make some isp-stats " Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 07/10] media: rockchip: rkisp1: add prefixes for v10 specific parts Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 08/10] media: rockchip: rkisp1: add support for v12 isp variants Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` [PATCH v7 09/10] dt-bindings: media: rkisp1: document px30 isp compatible Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner 2021-07-23 7:32 ` Heiko Stuebner [this message] 2021-07-23 7:32 ` [PATCH v7 10/10] media: rockchip: rkisp1: add support for px30 isp version Heiko Stuebner
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=20210723073221.1276358-11-heiko@sntech.de \ --to=heiko@sntech.de \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=dafna.hirschfeld@collabora.com \ --cc=devicetree@vger.kernel.org \ --cc=ezequiel@collabora.com \ --cc=heiko.stuebner@theobroma-systems.com \ --cc=helen.koike@collabora.com \ --cc=hverkuil-cisco@xs4all.nl \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mchehab@kernel.org \ --cc=robh+dt@kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.