rkisp1 support for px30
Heiko Stuebner
maintainerv5 cover rkisp1 support for px30
This series adds support for the slightly different v12 variant of the ISP used for example in the px30 soc.
changes in v5:
- handle interrupt-names as conditional required property (Dafna)
- add second example for showing interrupt-names (Dafna)
changes in v4:
- clean up multi-irq case (Dafna)
Now each variant can have a list of interrupts
and their respective handlers, with or without
interrupt-names
changes in v3:
- add necessary binding additions
- fix pclk naming in binding
- move v12 clk_ctrl register bits to v12 addition patch
- fix rebase artefact with hst_enable
changes in v2 (from rfc):
- split out phy patch into a separate series
- drop dts patches for now
- split v12 addition and v10 prefixes into separate patches to enable easier review (Dafna)
- remove {stats,params}_config structs, we can just use the correct constant (Dafna)
- adapt to styling comments from Dafna and Helen
- add patch to remove the unused irq variable in struct rkisp
Heiko Stuebner (10):
media: rockchip: rkisp1: remove unused irq variable
dt-bindings: media: rkisp1: fix pclk clock-name
dt-bindings: media: rkisp1: document different irq possibilities
media: rockchip: rkisp1: allow separate interrupts
media: rockchip: rkisp1: make some isp-param functions variable
media: rockchip: rkisp1: make some isp-stats functions variable
media: rockchip: rkisp1: add prefixes for v10 specific parts
media: rockchip: rkisp1: add support for v12 isp variants
dt-bindings: media: rkisp1: document px30 isp compatible
media: rockchip: rkisp1: add support for px30 isp version
.../bindings/media/rockchip-isp1.yaml | 113 +++- .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 +- .../platform/rockchip/rkisp1/rkisp1-common.h | 44 +- .../platform/rockchip/rkisp1/rkisp1-dev.c | 71 ++- .../platform/rockchip/rkisp1/rkisp1-isp.c | 29 +- .../platform/rockchip/rkisp1/rkisp1-params.c | 557 ++++++++++++++---- .../platform/rockchip/rkisp1/rkisp1-regs.h | 406 ++++++++----- .../platform/rockchip/rkisp1/rkisp1-stats.c | 107 +++- 8 files changed, 1044 insertions(+), 292 deletions(-)
Signature · 1 line
2.29.2
Heiko Stuebner
maintainerPATCH v5 1/10 media: rockchip: rkisp1: remove unused irq variable
From: Heiko Stuebner <[email protected]>
The irq variable in struct rkisp1 is unused as it is only used to request the irq during probe, so remove it.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-common.h | 1 - drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 -- 2 files changed, 3 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +0 -1
@@ -352,7 +352,6 @@ struct rkisp1_debug {*/ struct rkisp1_device {void __iomem *base_addr; -int irq;struct device *dev;unsigned int clk_size;struct clk_bulk_data clks[RKISP1_MAX_BUS_CLK ];
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +0 -2
@@ -489,8 +489,6 @@ static int rkisp1_probe(struct platform_device *pdev)return ret; } - rkisp1->irq = irq; -for (i =0 ; i < match_data->size; i++) rkisp1->clks[i].id = match_data->clks[i]; ret =devm_clk_bulk_get (dev, match_data->size, rkisp1->clks);
Signature · 1 line
2.29.2
Heiko Stuebner
maintainerPATCH v5 2/10 dt-bindings: media: rkisp1: fix pclk clock-name
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Having a clock name as "pclk_isp" suggests really hard a remnant from the vendor kernel.
Right now no driver _and_ no devicetree actually uses this clock name so there is still time to fix that naming.
Therefore drop the "_isp" suffix and only name it pclk.
--- Documentation/devicetree/bindings/media/rockchip-isp1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/media/rockchip-isp1.yaml +1 -1
@@ -41,7 +41,7 @@ properties: - const: aclk - const: hclk # only for isp1 - - const: pclk_isp + - const: pclk iommus: maxItems: 1
Signature · 1 line
2.29.2
Heiko Stuebner
maintainerPATCH v5 3/10 dt-bindings: media: rkisp1: document different irq possibilities
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Some variants have one irq signaling all of MI, MIPI and ISP events while some rkisp1 variants use separate irqs for each.
Adapt the binding to handle both cases.
--- .../bindings/media/rockchip-isp1.yaml | 45 +++++++++++++------ 1 file changed, 31 insertions(+), 14 deletions(-)
Documentation/devicetree/bindings/media/rockchip-isp1.yaml +31 -14
@@ -21,7 +21,14 @@ properties: maxItems: 1 interrupts: - maxItems: 1 + minItems: 1 + maxItems: 3 + + interrupt-names: + items: + - const: isp + - const: mi + - const: mipi clocks: minItems: 3
@@ -90,19 +97,29 @@ required: - power-domains - ports -if: - properties: - compatible: - contains: - const: rockchip,rk3399-cif-isp -then: - properties: - clocks: - minItems: 3 - maxItems: 4 - clock-names: - minItems: 3 - maxItems: 4 +allOf: + - if: + properties: + compatible: + contains: + const: rockchip,rk3399-cif-isp + then: + properties: + clocks: + minItems: 3 + maxItems: 4 + clock-names: + minItems: 3 + maxItems: 4 + + - if: + properties: + compatible: + contains: + const: rockchip,px30-cif-isp + then: + required: + - interrupt-names additionalProperties: false
Signature · 1 line
2.29.2
Heiko Stuebner
maintainerPATCH v5 4/10 media: rockchip: rkisp1: allow separate interrupts
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Depending on the per-soc implementation there can be one interrupt for isp, mipi and capture events or separate per-event interrupts.
So simply check for the presence of a named "mi" interrupt to differentiate between the two cases.
--- .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 +++- .../platform/rockchip/rkisp1/rkisp1-common.h | 7 +-- .../platform/rockchip/rkisp1/rkisp1-dev.c | 44 ++++++++++++------- .../platform/rockchip/rkisp1/rkisp1-isp.c | 16 +++++-- 4 files changed, 53 insertions(+), 23 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +8 -1
@@ -685,12 +685,17 @@ static void rkisp1_handle_buffer(struct rkisp1_capture *cap)spin_unlock (&cap->buf.lock); } -void rkisp1_capture_isr (struct rkisp1_device *rkisp1) +irqreturn_t rkisp1_capture_isr (int irq,void *ctx) { +struct device *dev = ctx; +struct rkisp1_device *rkisp1 =dev_get_drvdata (dev);unsigned int i;u32 status; status =rkisp1_read (rkisp1,RKISP1_CIF_MI_MIS ); +if (!status) +return IRQ_NONE ; +rkisp1_write (rkisp1, status,RKISP1_CIF_MI_ICR );for (i =0 ; i <ARRAY_SIZE (rkisp1->capture_devs); ++i) {
@@ -718,6 +723,8 @@ void rkisp1_capture_isr(struct rkisp1_device *rkisp1) cap->is_streaming = false;wake_up (&cap->done); } + +return IRQ_HANDLED ; }/* ----------------------------------------------------------------------------
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +4 -3
@@ -12,6 +12,7 @@#define _RKISP1_COMMON_H#include <linux/clk.h> +#include <linux/interrupt.h> #include <linux/mutex.h> #include <linux/rkisp1-config.h> #include <media/media-device.h>
@@ -459,9 +460,9 @@ void rkisp1_params_configure(struct rkisp1_params *params,void rkisp1_params_disable (struct rkisp1_params *params);/* irq handlers */ -void rkisp1_isp_isr (struct rkisp1_device *rkisp1); -void rkisp1_mipi_isr (struct rkisp1_device *rkisp1); -void rkisp1_capture_isr (struct rkisp1_device *rkisp1); +irqreturn_t rkisp1_isp_isr (int irq,void *ctx); +irqreturn_t rkisp1_mipi_isr (int irq,void *ctx); +irqreturn_t rkisp1_capture_isr (int irq,void *ctx);void rkisp1_stats_isr (struct rkisp1_stats *stats,u32 isp_ris);void rkisp1_params_isr (struct rkisp1_device *rkisp1);
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +29 -15
80 lines not on this page · raw message
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +12 -4
@@ -1090,13 +1090,15 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)* Interrupt handlers */ -void rkisp1_mipi_isr (struct rkisp1_device *rkisp1) +irqreturn_t rkisp1_mipi_isr (int irq,void *ctx) { +struct device *dev = ctx; +struct rkisp1_device *rkisp1 =dev_get_drvdata (dev);u32 val, status; status =rkisp1_read (rkisp1,RKISP1_CIF_MIPI_MIS );if (!status) -return ; +return IRQ_NONE ;rkisp1_write (rkisp1, status,RKISP1_CIF_MIPI_ICR );
@@ -1131,6 +1133,8 @@ void rkisp1_mipi_isr(struct rkisp1_device *rkisp1) }else { rkisp1->debug.mipi_error++; } + +return IRQ_HANDLED ; }static void rkisp1_isp_queue_event_sof (struct rkisp1_isp *isp)
@@ -1143,13 +1147,15 @@ static void rkisp1_isp_queue_event_sof(struct rkisp1_isp *isp)v4l2_event_queue (isp->sd.devnode, &event); } -void rkisp1_isp_isr (struct rkisp1_device *rkisp1) +irqreturn_t rkisp1_isp_isr (int irq,void *ctx) { +struct device *dev = ctx; +struct rkisp1_device *rkisp1 =dev_get_drvdata (dev);u32 status, isp_err; status =rkisp1_read (rkisp1,RKISP1_CIF_ISP_MIS );if (!status) -return ; +return IRQ_NONE ;rkisp1_write (rkisp1, status,RKISP1_CIF_ISP_ICR );
@@ -1191,4 +1197,6 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)*/ rkisp1_params_isr (rkisp1); } + +return IRQ_HANDLED ; }
Signature · 1 line
2.29.2
Re: [PATCH v5 04/10] media: rockchip: rkisp1: allow separate interrupts
Quoted 79 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
Depending on the per-soc implementation there can be one interrupt for isp, mipi and capture events or separate per-event interrupts.
So simply check for the presence of a named "mi" interrupt to differentiate between the two cases.
Signed-off-by Heiko Stuebner <[email protected]>--- .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 +++- .../platform/rockchip/rkisp1/rkisp1-common.h | 7 +-- .../platform/rockchip/rkisp1/rkisp1-dev.c | 44 ++++++++++++------- .../platform/rockchip/rkisp1/rkisp1-isp.c | 16 +++++-- 4 files changed, 53 insertions(+), 23 deletions(-)drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +8
-1@@ -685,12 +685,17 @@ static void rkisp1_handle_buffer(struct rkisp1_capture *cap)spin_unlock (&cap->buf.lock); } -void rkisp1_capture_isr (struct rkisp1_device *rkisp1) +irqreturn_t rkisp1_capture_isr (int irq,void *ctx) { +struct device *dev = ctx; +struct rkisp1_device *rkisp1 =dev_get_drvdata (dev);unsigned int i;u32 status; status =rkisp1_read (rkisp1,RKISP1_CIF_MI_MIS ); +if (!status) +return IRQ_NONE ; +rkisp1_write (rkisp1, status,RKISP1_CIF_MI_ICR );for (i =0 ; i <ARRAY_SIZE (rkisp1->capture_devs); ++i) {@@ -718,6 +723,8 @@ void rkisp1_capture_isr(struct rkisp1_device *rkisp1) cap->is_streaming = false;wake_up (&cap->done); } + +return IRQ_HANDLED ; }/* ---------------------------------------------------------------------------- drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +4
-3@@ -12,6 +12,7 @@#define _RKISP1_COMMON_H#include <linux/clk.h> +#include <linux/interrupt.h> #include <linux/mutex.h> #include <linux/rkisp1-config.h> #include <media/media-device.h> @@ -459,9 +460,9 @@ void rkisp1_params_configure(struct rkisp1_params *params,void rkisp1_params_disable (struct rkisp1_params *params);/* irq handlers */ -void rkisp1_isp_isr (struct rkisp1_device *rkisp1); -void rkisp1_mipi_isr (struct rkisp1_device *rkisp1); -void rkisp1_capture_isr (struct rkisp1_device *rkisp1); +irqreturn_t rkisp1_isp_isr (int irq,void *ctx); +irqreturn_t rkisp1_mipi_isr (int irq,void *ctx); +irqreturn_t rkisp1_capture_isr (int irq,void *ctx);void rkisp1_stats_isr (struct rkisp1_stats *stats,u32 isp_ris);void rkisp1_params_isr (struct rkisp1_device *rkisp1);drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +0
-0@@ -101,9 +101,16 @@* +-----------+ +-----------+
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c line 111
Quoted 10 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +5
-0*/ +struct rkisp1_isr_data { +const char *name; +irqreturn_t (*isr)(int irq,void *ctx); +}; +struct rkisp1_match_data {const char *const *clks;unsigned int size;
now that we have two arrays, maybe rename 'size' to 'clks_size'?
Quoted 129 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +24
-15+const struct rkisp1_isr_data *isrs; +unsigned int isr_size;enum rkisp1_cif_isp_version isp_ver; };@@ -385,18 +392,15 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1)static irqreturn_t rkisp1_isr (int irq,void *ctx) { -struct device *dev = ctx; -struct rkisp1_device *rkisp1 =dev_get_drvdata (dev); -/* * Call rkisp1_capture_isr() first to handle the frame that * potentially completed using the current frame_sequence number before * it is potentially incremented by rkisp1_isp_isr() in the vertical * sync. */ -rkisp1_capture_isr (rkisp1); -rkisp1_isp_isr (rkisp1); -rkisp1_mipi_isr (rkisp1); +rkisp1_capture_isr (irq, ctx); +rkisp1_isp_isr (irq, ctx); +rkisp1_mipi_isr (irq, ctx);return IRQ_HANDLED ; }@@ -407,9 +411,15 @@ static const char * const rk3399_isp_clks[] = { "hclk", }; +static const struct rkisp1_isr_data rk3399_isp_isrs[] = { + {NULL , rkisp1_isr }, +}; +static const struct rkisp1_match_data rk3399_isp_match_data = { .clks = rk3399_isp_clks, .size =ARRAY_SIZE (rk3399_isp_clks), + .isrs = rk3399_isp_isrs, + .isr_size =ARRAY_SIZE (rk3399_isp_isrs), .isp_ver =RKISP1_V10 , };@@ -478,15 +488,19 @@ static int rkisp1_probe(struct platform_device *pdev)if (IS_ERR (rkisp1->base_addr))return PTR_ERR (rkisp1->base_addr); - irq =platform_get_irq (pdev,0 ); -if (irq <0 ) -return irq; - - ret =devm_request_irq (dev, irq, rkisp1_isr,IRQF_SHARED , -dev_driver_string (dev), dev); -if (ret) { -dev_err (dev,"request irq failed: %d\n" , ret); -return ret; +for (i =0 ; i < match_data->isr_size; i++) { + irq = (match_data->isrs[i].name) ? +platform_get_irq_byname (pdev, match_data->isrs[i].name) : +platform_get_irq (pdev, i); +if (irq <0 ) +return irq; + + ret =devm_request_irq (dev, irq, match_data->isrs[i].isr,IRQF_SHARED , +dev_driver_string (dev), dev); +if (ret) { +dev_err (dev,"request irq failed: %d\n" , ret); +return ret; + } }for (i =0 ; i < match_data->size; i++)drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +12
-4@@ -1090,13 +1090,15 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)* Interrupt handlers */ -void rkisp1_mipi_isr (struct rkisp1_device *rkisp1) +irqreturn_t rkisp1_mipi_isr (int irq,void *ctx) { +struct device *dev = ctx; +struct rkisp1_device *rkisp1 =dev_get_drvdata (dev);u32 val, status; status =rkisp1_read (rkisp1,RKISP1_CIF_MIPI_MIS );if (!status) -return ; +return IRQ_NONE ;rkisp1_write (rkisp1, status,RKISP1_CIF_MIPI_ICR );@@ -1131,6 +1133,8 @@ void rkisp1_mipi_isr(struct rkisp1_device *rkisp1) }else { rkisp1->debug.mipi_error++; } + +return IRQ_HANDLED ; }static void rkisp1_isp_queue_event_sof (struct rkisp1_isp *isp)@@ -1143,13 +1147,15 @@ static void rkisp1_isp_queue_event_sof(struct rkisp1_isp *isp)v4l2_event_queue (isp->sd.devnode, &event); } -void rkisp1_isp_isr (struct rkisp1_device *rkisp1) +irqreturn_t rkisp1_isp_isr (int irq,void *ctx) { +struct device *dev = ctx; +struct rkisp1_device *rkisp1 =dev_get_drvdata (dev);u32 status, isp_err; status =rkisp1_read (rkisp1,RKISP1_CIF_ISP_MIS );if (!status) -return ; +return IRQ_NONE ;rkisp1_write (rkisp1, status,RKISP1_CIF_ISP_ICR );@@ -1191,4 +1197,6 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)*/ rkisp1_params_isr (rkisp1); } + +return IRQ_HANDLED ; }
Heiko Stuebner
maintainerPATCH v5 5/10 media: rockchip: rkisp1: make some isp-param functions variable
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The isp block evolved in subsequent socs, so some functions will behave differently on newer variants.
Therefore make it possible to override the needed params functions.
--- .../platform/rockchip/rkisp1/rkisp1-common.h | 25 +++++++ .../platform/rockchip/rkisp1/rkisp1-params.c | 67 +++++++++++-------- 2 files changed, 65 insertions(+), 27 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +25 -0
@@ -254,11 +254,35 @@ struct rkisp1_stats {struct v4l2_format vdev_fmt; }; +struct rkisp1_params ; +struct rkisp1_params_ops { +void (*lsc_matrix_config)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_lsc_config *pconfig); +void (*goc_config)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_goc_config *arg); +void (*awb_meas_config)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_meas_config *arg); +void (*awb_meas_enable)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_meas_config *arg, +bool en); +void (*awb_gain_config)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_gain_config *arg); +void (*aec_config)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_aec_config *arg); +void (*hst_config)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_hst_config *arg); +void (*hst_enable)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_hst_config *arg,bool en); +void (*afm_config)(struct rkisp1_params *params, +const struct rkisp1_cif_isp_afc_config *arg); +}; +/* * struct rkisp1_params - ISP input parameters device * * @vnode: video node * @rkisp1: pointer to the rkisp1 device +* @ops: pointer to the variant-specific operations * @config_lock: locks the buffer list 'params' * @params: queue of rkisp1_buffer * @vdev_fmt: v4l2_format of the metadata format
@@ -268,6 +292,7 @@ struct rkisp1_stats {struct rkisp1_params {struct rkisp1_vdev_node vnode;struct rkisp1_device *rkisp1; +struct rkisp1_params_ops *ops;spinlock_t config_lock;/* locks the buffers list 'params' */ struct list_head params;
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +40 -27
151 lines not on this page · raw message
Signature · 1 line
2.29.2
Heiko Stuebner
maintainerPATCH v5 6/10 media: rockchip: rkisp1: make some isp-stats functions variable
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The isp block evolved in subsequent socs, so some functions will behave differently on newer variants.
Therefore make it possible to override the needed stats functions.
--- .../media/platform/rockchip/rkisp1/rkisp1-common.h | 11 +++++++++++ .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 14 +++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +11 -0
@@ -236,6 +236,16 @@ struct rkisp1_capture { } pix; }; +struct rkisp1_stats ; +struct rkisp1_stats_ops { +void (*get_awb_meas)(struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf); +void (*get_aec_meas)(struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf); +void (*get_hst_meas)(struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf); +}; +/* * struct rkisp1_stats - ISP Statistics device *
@@ -248,6 +258,7 @@ struct rkisp1_capture {struct rkisp1_stats {struct rkisp1_vdev_node vnode;struct rkisp1_device *rkisp1; +struct rkisp1_stats_ops *ops;spinlock_t lock;/* locks the buffers list 'stats' */ struct list_head stat;
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +11 -3
@@ -287,6 +287,12 @@ static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats, } } +static struct rkisp1_stats_ops rkisp1_stats_ops = { + .get_awb_meas = rkisp1_stats_get_awb_meas, + .get_aec_meas = rkisp1_stats_get_aec_meas, + .get_hst_meas = rkisp1_stats_get_hst_meas, +}; +static void rkisp1_stats_send_measurement (struct rkisp1_stats *stats,u32 isp_ris) {
@@ -309,18 +315,18 @@ rkisp1_stats_send_measurement(struct rkisp1_stats *stats, u32 isp_ris) (struct rkisp1_stat_buffer *)(cur_buf->vaddr);if (isp_ris &RKISP1_CIF_ISP_AWB_DONE ) -rkisp1_stats_get_awb_meas (stats, cur_stat_buf); + stats->ops->get_awb_meas (stats, cur_stat_buf);if (isp_ris &RKISP1_CIF_ISP_AFM_FIN )rkisp1_stats_get_afc_meas (stats, cur_stat_buf);if (isp_ris &RKISP1_CIF_ISP_EXP_END ) { -rkisp1_stats_get_aec_meas (stats, cur_stat_buf); + stats->ops->get_aec_meas (stats, cur_stat_buf);rkisp1_stats_get_bls_meas (stats, cur_stat_buf); }if (isp_ris &RKISP1_CIF_ISP_HIST_MEASURE_RDY ) -rkisp1_stats_get_hst_meas (stats, cur_stat_buf); + stats->ops->get_hst_meas (stats, cur_stat_buf);vb2_set_plane_payload (&cur_buf->vb.vb2_buf,0 ,sizeof (struct rkisp1_stat_buffer ));
@@ -354,6 +360,8 @@ static void rkisp1_init_stats(struct rkisp1_stats *stats)V4L2_META_FMT_RK_ISP1_STAT_3A ; stats->vdev_fmt.fmt.meta.buffersize =sizeof (struct rkisp1_stat_buffer ); + + stats->ops = &rkisp1_stats_ops; }int rkisp1_stats_register (struct rkisp1_device *rkisp1)
Signature · 1 line
2.29.2
Heiko Stuebner
maintainerPATCH v5 7/10 media: rockchip: rkisp1: add prefixes for v10 specific parts
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The rkisp1 evolved over soc generations and the rk3326/px30 introduced the so called v12 - probably meaning v1.2.
In a first step adapt the affected v10 parts to give them a matching suffix to enable us to add v12 variants later on.
--- .../platform/rockchip/rkisp1/rkisp1-params.c | 180 ++++++------ .../platform/rockchip/rkisp1/rkisp1-regs.h | 266 +++++++++--------- .../platform/rockchip/rkisp1/rkisp1-stats.c | 32 +-- 3 files changed, 240 insertions(+), 238 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +90 -90
@@ -185,8 +185,8 @@ static void rkisp1_bls_config(struct rkisp1_params *params,/* ISP LS correction interface function */ static void -rkisp1_lsc_matrix_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_lsc_config *pconfig) +rkisp1_lsc_matrix_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_lsc_config *pconfig) {unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
@@ -212,39 +212,39 @@ rkisp1_lsc_matrix_config(struct rkisp1_params *params,* DWORDs (2nd value of last DWORD unused) */ for (j =0 ; j <RKISP1_CIF_ISP_LSC_SAMPLES_MAX -1 ; j +=2 ) { - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->r_data_tbl[i][j], - pconfig->r_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->r_data_tbl[i][j], + pconfig->r_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_R_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gr_data_tbl[i][j], - pconfig->gr_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gr_data_tbl[i][j], + pconfig->gr_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GR_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gb_data_tbl[i][j], - pconfig->gb_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gb_data_tbl[i][j], + pconfig->gb_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GB_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->b_data_tbl[i][j], - pconfig->b_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->b_data_tbl[i][j], + pconfig->b_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_B_TABLE_DATA ); } - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->r_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->r_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_R_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gr_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gr_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GR_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gb_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gb_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GB_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->b_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->b_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_B_TABLE_DATA ); }
@@ -382,18 +382,18 @@ static void rkisp1_sdg_config(struct rkisp1_params *params, }/* ISP GAMMA correction interface function */ -static void rkisp1_goc_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_goc_config *arg) +static void rkisp1_goc_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_goc_config *arg) {unsigned int i;rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_CTRL ,RKISP1_CIF_ISP_CTRL_ISP_GAMMA_OUT_ENA ); -rkisp1_write (params->rkisp1, arg->mode,RKISP1_CIF_ISP_GAMMA_OUT_MODE ); +rkisp1_write (params->rkisp1, arg->mode,RKISP1_CIF_ISP_GAMMA_OUT_MODE_V10 );for (i =0 ; i <RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 ; i++)rkisp1_write (params->rkisp1, arg->gamma_y[i], -RKISP1_CIF_ISP_GAMMA_OUT_Y_0 + i *4 ); +RKISP1_CIF_ISP_GAMMA_OUT_Y_0_V10 + i *4 ); }/* ISP Cross Talk */
@@ -433,8 +433,8 @@ static void rkisp1_ctk_enable(struct rkisp1_params *params, bool en) }/* ISP White Balance Mode */ -static void rkisp1_awb_meas_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_awb_meas_config *arg) +static void rkisp1_awb_meas_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_meas_config *arg) {u32 reg_val =0 ;/* based on the mode,configure the awb module */
@@ -442,43 +442,43 @@ static void rkisp1_awb_meas_config(struct rkisp1_params *params,/* Reference Cb and Cr */ rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_REF_CR_SET (arg->awb_ref_cr) | - arg->awb_ref_cb,RKISP1_CIF_ISP_AWB_REF ); + arg->awb_ref_cb,RKISP1_CIF_ISP_AWB_REF_V10 );/* Yc Threshold */ rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_MAX_Y_SET (arg->max_y) |RKISP1_CIF_ISP_AWB_MIN_Y_SET (arg->min_y) |RKISP1_CIF_ISP_AWB_MAX_CS_SET (arg->max_csum) | - arg->min_c,RKISP1_CIF_ISP_AWB_THRESH ); + arg->min_c,RKISP1_CIF_ISP_AWB_THRESH_V10 ); } - reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP ); + reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP_V10 );if (arg->enable_ymax_cmp) reg_val |=RKISP1_CIF_ISP_AWB_YMAX_CMP_EN ;else reg_val &= ~RKISP1_CIF_ISP_AWB_YMAX_CMP_EN ; -rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP ); +rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP_V10 );/* window offset */ rkisp1_write (params->rkisp1, - arg->awb_wnd.v_offs,RKISP1_CIF_ISP_AWB_WND_V_OFFS ); + arg->awb_wnd.v_offs,RKISP1_CIF_ISP_AWB_WND_V_OFFS_V10 );rkisp1_write (params->rkisp1, - arg->awb_wnd.h_offs,RKISP1_CIF_ISP_AWB_WND_H_OFFS ); + arg->awb_wnd.h_offs,RKISP1_CIF_ISP_AWB_WND_H_OFFS_V10 );/* AWB window size */ rkisp1_write (params->rkisp1, - arg->awb_wnd.v_size,RKISP1_CIF_ISP_AWB_WND_V_SIZE ); + arg->awb_wnd.v_size,RKISP1_CIF_ISP_AWB_WND_V_SIZE_V10 );rkisp1_write (params->rkisp1, - arg->awb_wnd.h_size,RKISP1_CIF_ISP_AWB_WND_H_SIZE ); + arg->awb_wnd.h_size,RKISP1_CIF_ISP_AWB_WND_H_SIZE_V10 );/* Number of frames */ rkisp1_write (params->rkisp1, - arg->frames,RKISP1_CIF_ISP_AWB_FRAMES ); + arg->frames,RKISP1_CIF_ISP_AWB_FRAMES_V10 ); }static void -rkisp1_awb_meas_enable (struct rkisp1_params *params, -const struct rkisp1_cif_isp_awb_meas_config *arg, -bool en) +rkisp1_awb_meas_enable_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_meas_config *arg, +bool en) { -u32 reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP ); +u32 reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP_V10 );/* switch off */ reg_val &=RKISP1_CIF_ISP_AWB_MODE_MASK_NONE ;
@@ -489,34 +489,34 @@ rkisp1_awb_meas_enable(struct rkisp1_params *params,else reg_val |=RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ; -rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP ); +rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP_V10 );/* Measurements require AWB block be active. */ rkisp1_param_set_bits (params,RKISP1_CIF_ISP_CTRL ,RKISP1_CIF_ISP_CTRL_ISP_AWB_ENA ); }else {rkisp1_write (params->rkisp1, - reg_val,RKISP1_CIF_ISP_AWB_PROP ); + reg_val,RKISP1_CIF_ISP_AWB_PROP_V10 );rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_CTRL ,RKISP1_CIF_ISP_CTRL_ISP_AWB_ENA ); } }static void -rkisp1_awb_gain_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_awb_gain_config *arg) +rkisp1_awb_gain_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_gain_config *arg) {rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_GAIN_R_SET (arg->gain_green_r) | - arg->gain_green_b,RKISP1_CIF_ISP_AWB_GAIN_G ); + arg->gain_green_b,RKISP1_CIF_ISP_AWB_GAIN_G_V10 );rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_GAIN_R_SET (arg->gain_red) | - arg->gain_blue,RKISP1_CIF_ISP_AWB_GAIN_RB ); + arg->gain_blue,RKISP1_CIF_ISP_AWB_GAIN_RB_V10 ); } -static void rkisp1_aec_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_aec_config *arg) +static void rkisp1_aec_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_aec_config *arg) {unsigned int block_hsize, block_vsize;u32 exp_ctrl;
@@ -531,21 +531,21 @@ static void rkisp1_aec_config(struct rkisp1_params *params,rkisp1_write (params->rkisp1, exp_ctrl,RKISP1_CIF_ISP_EXP_CTRL );rkisp1_write (params->rkisp1, - arg->meas_window.h_offs,RKISP1_CIF_ISP_EXP_H_OFFSET ); + arg->meas_window.h_offs,RKISP1_CIF_ISP_EXP_H_OFFSET_V10 );rkisp1_write (params->rkisp1, - arg->meas_window.v_offs,RKISP1_CIF_ISP_EXP_V_OFFSET ); + arg->meas_window.v_offs,RKISP1_CIF_ISP_EXP_V_OFFSET_V10 ); block_hsize = arg->meas_window.h_size / -RKISP1_CIF_ISP_EXP_COLUMN_NUM -1 ; +RKISP1_CIF_ISP_EXP_COLUMN_NUM_V10 -1 ; block_vsize = arg->meas_window.v_size / -RKISP1_CIF_ISP_EXP_ROW_NUM -1 ; +RKISP1_CIF_ISP_EXP_ROW_NUM_V10 -1 ;rkisp1_write (params->rkisp1, -RKISP1_CIF_ISP_EXP_H_SIZE_SET (block_hsize), -RKISP1_CIF_ISP_EXP_H_SIZE ); +RKISP1_CIF_ISP_EXP_H_SIZE_SET_V10 (block_hsize), +RKISP1_CIF_ISP_EXP_H_SIZE_V10 );rkisp1_write (params->rkisp1, -RKISP1_CIF_ISP_EXP_V_SIZE_SET (block_vsize), -RKISP1_CIF_ISP_EXP_V_SIZE ); +RKISP1_CIF_ISP_EXP_V_SIZE_SET_V10 (block_vsize), +RKISP1_CIF_ISP_EXP_V_SIZE_V10 ); } static void rkisp1_cproc_config(struct rkisp1_params *params,
@@ -578,73 +578,73 @@ static void rkisp1_cproc_config(struct rkisp1_params *params, } } -static void rkisp1_hst_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_hst_config *arg) +static void rkisp1_hst_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_hst_config *arg) {unsigned int block_hsize, block_vsize;static const u32 hist_weight_regs[] = { -RKISP1_CIF_ISP_HIST_WEIGHT_00TO30 , -RKISP1_CIF_ISP_HIST_WEIGHT_40TO21 , -RKISP1_CIF_ISP_HIST_WEIGHT_31TO12 , -RKISP1_CIF_ISP_HIST_WEIGHT_22TO03 , -RKISP1_CIF_ISP_HIST_WEIGHT_13TO43 , -RKISP1_CIF_ISP_HIST_WEIGHT_04TO34 , +RKISP1_CIF_ISP_HIST_WEIGHT_00TO30_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_40TO21_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_31TO12_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_22TO03_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_13TO43_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_04TO34_V10 , };const u8 *weight;unsigned int i;u32 hist_prop;/* avoid to override the old enable value */ - hist_prop =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_HIST_PROP ); - hist_prop &=RKISP1_CIF_ISP_HIST_PROP_MODE_MASK ; - hist_prop |=RKISP1_CIF_ISP_HIST_PREDIV_SET (arg->histogram_predivider); -rkisp1_write (params->rkisp1, hist_prop,RKISP1_CIF_ISP_HIST_PROP ); + hist_prop =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_HIST_PROP_V10 ); + hist_prop &=RKISP1_CIF_ISP_HIST_PROP_MODE_MASK_V10 ; + hist_prop |=RKISP1_CIF_ISP_HIST_PREDIV_SET_V10 (arg->histogram_predivider); +rkisp1_write (params->rkisp1, hist_prop,RKISP1_CIF_ISP_HIST_PROP_V10 );rkisp1_write (params->rkisp1, arg->meas_window.h_offs, -RKISP1_CIF_ISP_HIST_H_OFFS ); +RKISP1_CIF_ISP_HIST_H_OFFS_V10 );rkisp1_write (params->rkisp1, arg->meas_window.v_offs, -RKISP1_CIF_ISP_HIST_V_OFFS ); +RKISP1_CIF_ISP_HIST_V_OFFS_V10 ); block_hsize = arg->meas_window.h_size / -RKISP1_CIF_ISP_HIST_COLUMN_NUM -1 ; - block_vsize = arg->meas_window.v_size /RKISP1_CIF_ISP_HIST_ROW_NUM -1 ; +RKISP1_CIF_ISP_HIST_COLUMN_NUM_V10 -1 ; + block_vsize = arg->meas_window.v_size /RKISP1_CIF_ISP_HIST_ROW_NUM_V10 -1 ; -rkisp1_write (params->rkisp1, block_hsize,RKISP1_CIF_ISP_HIST_H_SIZE ); -rkisp1_write (params->rkisp1, block_vsize,RKISP1_CIF_ISP_HIST_V_SIZE ); +rkisp1_write (params->rkisp1, block_hsize,RKISP1_CIF_ISP_HIST_H_SIZE_V10 ); +rkisp1_write (params->rkisp1, block_vsize,RKISP1_CIF_ISP_HIST_V_SIZE_V10 ); weight = arg->hist_weight;for (i =0 ; i <ARRAY_SIZE (hist_weight_regs); ++i, weight +=4 )rkisp1_write (params->rkisp1, -RKISP1_CIF_ISP_HIST_WEIGHT_SET (weight[0 ], +RKISP1_CIF_ISP_HIST_WEIGHT_SET_V10 (weight[0 ], weight[1 ], weight[2 ], weight[3 ]), hist_weight_regs[i]); -rkisp1_write (params->rkisp1, weight[0 ] &0x1F ,RKISP1_CIF_ISP_HIST_WEIGHT_44 ); +rkisp1_write (params->rkisp1, weight[0 ] &0x1F ,RKISP1_CIF_ISP_HIST_WEIGHT_44_V10 ); }static void -rkisp1_hst_enable (struct rkisp1_params *params, -const struct rkisp1_cif_isp_hst_config *arg,bool en) +rkisp1_hst_enable_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_hst_config *arg,bool en) {if (en) {u32 hist_prop =rkisp1_read (params->rkisp1, -RKISP1_CIF_ISP_HIST_PROP ); +RKISP1_CIF_ISP_HIST_PROP_V10 ); - hist_prop &= ~RKISP1_CIF_ISP_HIST_PROP_MODE_MASK ; + hist_prop &= ~RKISP1_CIF_ISP_HIST_PROP_MODE_MASK_V10 ; hist_prop |= arg->mode; -rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP , +rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP_V10 , hist_prop); }else { -rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_HIST_PROP , -RKISP1_CIF_ISP_HIST_PROP_MODE_MASK ); +rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_HIST_PROP_V10 , +RKISP1_CIF_ISP_HIST_PROP_MODE_MASK_V10 ); } } -static void rkisp1_afm_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_afc_config *arg) +static void rkisp1_afm_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_afc_config *arg) {size_t num_of_win =min_t (size_t,ARRAY_SIZE (arg->afm_win), arg->num_afm_win);
@@ -1231,7 +1231,7 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)memset (hst.hist_weight,0x01 ,sizeof (hst.hist_weight)); params->ops->hst_config (params, &hst); -rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP , +rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP_V10 , rkisp1_hst_params_default_config.mode);/* set the range */
@@ -1290,16 +1290,16 @@ void rkisp1_params_disable(struct rkisp1_params *params) RKISP1_CIF_ISP_DPF_MODE_EN); } -static struct rkisp1_params_ops rkisp1_params_ops = { - .lsc_matrix_config = rkisp1_lsc_matrix_config, - .goc_config = rkisp1_goc_config, - .awb_meas_config = rkisp1_awb_meas_config, - .awb_meas_enable = rkisp1_awb_meas_enable, - .awb_gain_config = rkisp1_awb_gain_config, - .aec_config = rkisp1_aec_config, - .hst_config = rkisp1_hst_config, - .hst_enable = rkisp1_hst_enable, - .afm_config = rkisp1_afm_config, +static struct rkisp1_params_ops rkisp1_v10_params_ops = { + .lsc_matrix_config = rkisp1_lsc_matrix_config_v10, + .goc_config = rkisp1_goc_config_v10, + .awb_meas_config = rkisp1_awb_meas_config_v10, + .awb_meas_enable = rkisp1_awb_meas_enable_v10, + .awb_gain_config = rkisp1_awb_gain_config_v10, + .aec_config = rkisp1_aec_config_v10, + .hst_config = rkisp1_hst_config_v10, + .hst_enable = rkisp1_hst_enable_v10, + .afm_config = rkisp1_afm_config_v10, }; static int rkisp1_params_enum_fmt_meta_out(struct file *file, void *priv,
@@ -1469,7 +1469,7 @@ static void rkisp1_init_params(struct rkisp1_params *params) params->vdev_fmt.fmt.meta.buffersize =sizeof (struct rkisp1_params_cfg ); - params->ops = &rkisp1_params_ops; + params->ops = &rkisp1_v10_params_ops; }int rkisp1_params_register (struct rkisp1_device *rkisp1)
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +134 -132
318 lines not on this page · raw message
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +16 -16
@@ -175,18 +175,18 @@ rkisp1_stats_init_vb2_queue(struct vb2_queue *q, struct rkisp1_stats *stats)return vb2_queue_init (q); } -static void rkisp1_stats_get_awb_meas (struct rkisp1_stats *stats, -struct rkisp1_stat_buffer *pbuf) +static void rkisp1_stats_get_awb_meas_v10 (struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf) {/* Protect against concurrent access from ISR? */ struct rkisp1_device *rkisp1 = stats->rkisp1;u32 reg_val; pbuf->meas_type |=RKISP1_CIF_ISP_STAT_AWB ; - reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_WHITE_CNT ); + reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_WHITE_CNT_V10 ); pbuf->params.awb.awb_mean[0 ].cnt =RKISP1_CIF_ISP_AWB_GET_PIXEL_CNT (reg_val); - reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_MEAN ); + reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_MEAN_V10 ); pbuf->params.awb.awb_mean[0 ].mean_cr_or_r =RKISP1_CIF_ISP_AWB_GET_MEAN_CR_R (reg_val);
@@ -196,8 +196,8 @@ static void rkisp1_stats_get_awb_meas(struct rkisp1_stats *stats,RKISP1_CIF_ISP_AWB_GET_MEAN_Y_G (reg_val); } -static void rkisp1_stats_get_aec_meas (struct rkisp1_stats *stats, -struct rkisp1_stat_buffer *pbuf) +static void rkisp1_stats_get_aec_meas_v10 (struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf) {struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i;
@@ -206,7 +206,7 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats,for (i =0 ; i <RKISP1_CIF_ISP_AE_MEAN_MAX_V10 ; i++) pbuf->params.ae.exp_mean[i] = (u8 )rkisp1_read (rkisp1, -RKISP1_CIF_ISP_EXP_MEAN_00 + i *4 ); +RKISP1_CIF_ISP_EXP_MEAN_00_V10 + i *4 ); } static void rkisp1_stats_get_afc_meas(struct rkisp1_stats *stats,
@@ -226,17 +226,17 @@ static void rkisp1_stats_get_afc_meas(struct rkisp1_stats *stats, af->window[2 ].lum =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AFM_LUM_C ); } -static void rkisp1_stats_get_hst_meas (struct rkisp1_stats *stats, -struct rkisp1_stat_buffer *pbuf) +static void rkisp1_stats_get_hst_meas_v10 (struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf) {struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i; pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ;for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 ; i++) { -u32 reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); +u32 reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0_V10 + i *4 ); - pbuf->params.hist.hist_bins[i] =RKISP1_CIF_ISP_HIST_GET_BIN (reg_val); + pbuf->params.hist.hist_bins[i] =RKISP1_CIF_ISP_HIST_GET_BIN_V10 (reg_val); } }
@@ -287,10 +287,10 @@ static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats, } } -static struct rkisp1_stats_ops rkisp1_stats_ops = { - .get_awb_meas = rkisp1_stats_get_awb_meas, - .get_aec_meas = rkisp1_stats_get_aec_meas, - .get_hst_meas = rkisp1_stats_get_hst_meas, +static struct rkisp1_stats_ops rkisp1_v10_stats_ops = { + .get_awb_meas = rkisp1_stats_get_awb_meas_v10, + .get_aec_meas = rkisp1_stats_get_aec_meas_v10, + .get_hst_meas = rkisp1_stats_get_hst_meas_v10, }; static void
@@ -361,7 +361,7 @@ static void rkisp1_init_stats(struct rkisp1_stats *stats) stats->vdev_fmt.fmt.meta.buffersize =sizeof (struct rkisp1_stat_buffer ); - stats->ops = &rkisp1_stats_ops; + stats->ops = &rkisp1_v10_stats_ops; }int rkisp1_stats_register (struct rkisp1_device *rkisp1)
Signature · 1 line
2.29.2
Re: [PATCH v5 07/10] media: rockchip: rkisp1: add prefixes for v10 specific parts
Quoted 716 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
The rkisp1 evolved over soc generations and the rk3326/px30 introduced the so called v12 - probably meaning v1.2.
In a first step adapt the affected v10 parts to give them a matching suffix to enable us to add v12 variants later on.
Signed-off-by Heiko Stuebner <[email protected]>--- .../platform/rockchip/rkisp1/rkisp1-params.c | 180 ++++++------ .../platform/rockchip/rkisp1/rkisp1-regs.h | 266 +++++++++--------- .../platform/rockchip/rkisp1/rkisp1-stats.c | 32 +-- 3 files changed, 240 insertions(+), 238 deletions(-)drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +90
-90@@ -185,8 +185,8 @@ static void rkisp1_bls_config(struct rkisp1_params *params,/* ISP LS correction interface function */ static void -rkisp1_lsc_matrix_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_lsc_config *pconfig) +rkisp1_lsc_matrix_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_lsc_config *pconfig) {unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;@@ -212,39 +212,39 @@ rkisp1_lsc_matrix_config(struct rkisp1_params *params,* DWORDs (2nd value of last DWORD unused) */ for (j =0 ; j <RKISP1_CIF_ISP_LSC_SAMPLES_MAX -1 ; j +=2 ) { - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->r_data_tbl[i][j], - pconfig->r_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->r_data_tbl[i][j], + pconfig->r_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_R_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gr_data_tbl[i][j], - pconfig->gr_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gr_data_tbl[i][j], + pconfig->gr_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GR_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gb_data_tbl[i][j], - pconfig->gb_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gb_data_tbl[i][j], + pconfig->gb_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GB_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->b_data_tbl[i][j], - pconfig->b_data_tbl[i][j +1 ]); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->b_data_tbl[i][j], + pconfig->b_data_tbl[i][j +1 ]);rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_B_TABLE_DATA ); } - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->r_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->r_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_R_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gr_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gr_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GR_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->gb_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->gb_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_GB_TABLE_DATA ); - data =RKISP1_CIF_ISP_LSC_TABLE_DATA (pconfig->b_data_tbl[i][j],0 ); + data =RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (pconfig->b_data_tbl[i][j],0 );rkisp1_write (params->rkisp1, data,RKISP1_CIF_ISP_LSC_B_TABLE_DATA ); }@@ -382,18 +382,18 @@ static void rkisp1_sdg_config(struct rkisp1_params *params, }/* ISP GAMMA correction interface function */ -static void rkisp1_goc_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_goc_config *arg) +static void rkisp1_goc_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_goc_config *arg) {unsigned int i;rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_CTRL ,RKISP1_CIF_ISP_CTRL_ISP_GAMMA_OUT_ENA ); -rkisp1_write (params->rkisp1, arg->mode,RKISP1_CIF_ISP_GAMMA_OUT_MODE ); +rkisp1_write (params->rkisp1, arg->mode,RKISP1_CIF_ISP_GAMMA_OUT_MODE_V10 );for (i =0 ; i <RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 ; i++)rkisp1_write (params->rkisp1, arg->gamma_y[i], -RKISP1_CIF_ISP_GAMMA_OUT_Y_0 + i *4 ); +RKISP1_CIF_ISP_GAMMA_OUT_Y_0_V10 + i *4 ); }/* ISP Cross Talk */ @@ -433,8 +433,8 @@ static void rkisp1_ctk_enable(struct rkisp1_params *params, bool en) }/* ISP White Balance Mode */ -static void rkisp1_awb_meas_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_awb_meas_config *arg) +static void rkisp1_awb_meas_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_meas_config *arg) {u32 reg_val =0 ;/* based on the mode,configure the awb module */ @@ -442,43 +442,43 @@ static void rkisp1_awb_meas_config(struct rkisp1_params *params,/* Reference Cb and Cr */ rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_REF_CR_SET (arg->awb_ref_cr) | - arg->awb_ref_cb,RKISP1_CIF_ISP_AWB_REF ); + arg->awb_ref_cb,RKISP1_CIF_ISP_AWB_REF_V10 );/* Yc Threshold */ rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_MAX_Y_SET (arg->max_y) |RKISP1_CIF_ISP_AWB_MIN_Y_SET (arg->min_y) |RKISP1_CIF_ISP_AWB_MAX_CS_SET (arg->max_csum) | - arg->min_c,RKISP1_CIF_ISP_AWB_THRESH ); + arg->min_c,RKISP1_CIF_ISP_AWB_THRESH_V10 ); } - reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP ); + reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP_V10 );if (arg->enable_ymax_cmp) reg_val |=RKISP1_CIF_ISP_AWB_YMAX_CMP_EN ;else reg_val &= ~RKISP1_CIF_ISP_AWB_YMAX_CMP_EN ; -rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP ); +rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP_V10 );/* window offset */ rkisp1_write (params->rkisp1, - arg->awb_wnd.v_offs,RKISP1_CIF_ISP_AWB_WND_V_OFFS ); + arg->awb_wnd.v_offs,RKISP1_CIF_ISP_AWB_WND_V_OFFS_V10 );rkisp1_write (params->rkisp1, - arg->awb_wnd.h_offs,RKISP1_CIF_ISP_AWB_WND_H_OFFS ); + arg->awb_wnd.h_offs,RKISP1_CIF_ISP_AWB_WND_H_OFFS_V10 );/* AWB window size */ rkisp1_write (params->rkisp1, - arg->awb_wnd.v_size,RKISP1_CIF_ISP_AWB_WND_V_SIZE ); + arg->awb_wnd.v_size,RKISP1_CIF_ISP_AWB_WND_V_SIZE_V10 );rkisp1_write (params->rkisp1, - arg->awb_wnd.h_size,RKISP1_CIF_ISP_AWB_WND_H_SIZE ); + arg->awb_wnd.h_size,RKISP1_CIF_ISP_AWB_WND_H_SIZE_V10 );/* Number of frames */ rkisp1_write (params->rkisp1, - arg->frames,RKISP1_CIF_ISP_AWB_FRAMES ); + arg->frames,RKISP1_CIF_ISP_AWB_FRAMES_V10 ); }static void -rkisp1_awb_meas_enable (struct rkisp1_params *params, -const struct rkisp1_cif_isp_awb_meas_config *arg, -bool en) +rkisp1_awb_meas_enable_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_meas_config *arg, +bool en) { -u32 reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP ); +u32 reg_val =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_AWB_PROP_V10 );/* switch off */ reg_val &=RKISP1_CIF_ISP_AWB_MODE_MASK_NONE ;@@ -489,34 +489,34 @@ rkisp1_awb_meas_enable(struct rkisp1_params *params,else reg_val |=RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ; -rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP ); +rkisp1_write (params->rkisp1, reg_val,RKISP1_CIF_ISP_AWB_PROP_V10 );/* Measurements require AWB block be active. */ rkisp1_param_set_bits (params,RKISP1_CIF_ISP_CTRL ,RKISP1_CIF_ISP_CTRL_ISP_AWB_ENA ); }else {rkisp1_write (params->rkisp1, - reg_val,RKISP1_CIF_ISP_AWB_PROP ); + reg_val,RKISP1_CIF_ISP_AWB_PROP_V10 );rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_CTRL ,RKISP1_CIF_ISP_CTRL_ISP_AWB_ENA ); } }static void -rkisp1_awb_gain_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_awb_gain_config *arg) +rkisp1_awb_gain_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_awb_gain_config *arg) {rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_GAIN_R_SET (arg->gain_green_r) | - arg->gain_green_b,RKISP1_CIF_ISP_AWB_GAIN_G ); + arg->gain_green_b,RKISP1_CIF_ISP_AWB_GAIN_G_V10 );rkisp1_write (params->rkisp1,RKISP1_CIF_ISP_AWB_GAIN_R_SET (arg->gain_red) | - arg->gain_blue,RKISP1_CIF_ISP_AWB_GAIN_RB ); + arg->gain_blue,RKISP1_CIF_ISP_AWB_GAIN_RB_V10 ); } -static void rkisp1_aec_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_aec_config *arg) +static void rkisp1_aec_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_aec_config *arg) {unsigned int block_hsize, block_vsize;u32 exp_ctrl;@@ -531,21 +531,21 @@ static void rkisp1_aec_config(struct rkisp1_params *params,rkisp1_write (params->rkisp1, exp_ctrl,RKISP1_CIF_ISP_EXP_CTRL );rkisp1_write (params->rkisp1, - arg->meas_window.h_offs,RKISP1_CIF_ISP_EXP_H_OFFSET ); + arg->meas_window.h_offs,RKISP1_CIF_ISP_EXP_H_OFFSET_V10 );rkisp1_write (params->rkisp1, - arg->meas_window.v_offs,RKISP1_CIF_ISP_EXP_V_OFFSET ); + arg->meas_window.v_offs,RKISP1_CIF_ISP_EXP_V_OFFSET_V10 ); block_hsize = arg->meas_window.h_size / -RKISP1_CIF_ISP_EXP_COLUMN_NUM -1 ; +RKISP1_CIF_ISP_EXP_COLUMN_NUM_V10 -1 ; block_vsize = arg->meas_window.v_size / -RKISP1_CIF_ISP_EXP_ROW_NUM -1 ; +RKISP1_CIF_ISP_EXP_ROW_NUM_V10 -1 ;rkisp1_write (params->rkisp1, -RKISP1_CIF_ISP_EXP_H_SIZE_SET (block_hsize), -RKISP1_CIF_ISP_EXP_H_SIZE ); +RKISP1_CIF_ISP_EXP_H_SIZE_SET_V10 (block_hsize), +RKISP1_CIF_ISP_EXP_H_SIZE_V10 );rkisp1_write (params->rkisp1, -RKISP1_CIF_ISP_EXP_V_SIZE_SET (block_vsize), -RKISP1_CIF_ISP_EXP_V_SIZE ); +RKISP1_CIF_ISP_EXP_V_SIZE_SET_V10 (block_vsize), +RKISP1_CIF_ISP_EXP_V_SIZE_V10 ); } static void rkisp1_cproc_config(struct rkisp1_params *params,@@ -578,73 +578,73 @@ static void rkisp1_cproc_config(struct rkisp1_params *params, } } -static void rkisp1_hst_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_hst_config *arg) +static void rkisp1_hst_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_hst_config *arg) {unsigned int block_hsize, block_vsize;static const u32 hist_weight_regs[] = { -RKISP1_CIF_ISP_HIST_WEIGHT_00TO30 , -RKISP1_CIF_ISP_HIST_WEIGHT_40TO21 , -RKISP1_CIF_ISP_HIST_WEIGHT_31TO12 , -RKISP1_CIF_ISP_HIST_WEIGHT_22TO03 , -RKISP1_CIF_ISP_HIST_WEIGHT_13TO43 , -RKISP1_CIF_ISP_HIST_WEIGHT_04TO34 , +RKISP1_CIF_ISP_HIST_WEIGHT_00TO30_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_40TO21_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_31TO12_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_22TO03_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_13TO43_V10 , +RKISP1_CIF_ISP_HIST_WEIGHT_04TO34_V10 , };const u8 *weight;unsigned int i;u32 hist_prop;/* avoid to override the old enable value */ - hist_prop =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_HIST_PROP ); - hist_prop &=RKISP1_CIF_ISP_HIST_PROP_MODE_MASK ; - hist_prop |=RKISP1_CIF_ISP_HIST_PREDIV_SET (arg->histogram_predivider); -rkisp1_write (params->rkisp1, hist_prop,RKISP1_CIF_ISP_HIST_PROP ); + hist_prop =rkisp1_read (params->rkisp1,RKISP1_CIF_ISP_HIST_PROP_V10 ); + hist_prop &=RKISP1_CIF_ISP_HIST_PROP_MODE_MASK_V10 ; + hist_prop |=RKISP1_CIF_ISP_HIST_PREDIV_SET_V10 (arg->histogram_predivider); +rkisp1_write (params->rkisp1, hist_prop,RKISP1_CIF_ISP_HIST_PROP_V10 );rkisp1_write (params->rkisp1, arg->meas_window.h_offs, -RKISP1_CIF_ISP_HIST_H_OFFS ); +RKISP1_CIF_ISP_HIST_H_OFFS_V10 );rkisp1_write (params->rkisp1, arg->meas_window.v_offs, -RKISP1_CIF_ISP_HIST_V_OFFS ); +RKISP1_CIF_ISP_HIST_V_OFFS_V10 ); block_hsize = arg->meas_window.h_size / -RKISP1_CIF_ISP_HIST_COLUMN_NUM -1 ; - block_vsize = arg->meas_window.v_size /RKISP1_CIF_ISP_HIST_ROW_NUM -1 ; +RKISP1_CIF_ISP_HIST_COLUMN_NUM_V10 -1 ; + block_vsize = arg->meas_window.v_size /RKISP1_CIF_ISP_HIST_ROW_NUM_V10 -1 ; -rkisp1_write (params->rkisp1, block_hsize,RKISP1_CIF_ISP_HIST_H_SIZE ); -rkisp1_write (params->rkisp1, block_vsize,RKISP1_CIF_ISP_HIST_V_SIZE ); +rkisp1_write (params->rkisp1, block_hsize,RKISP1_CIF_ISP_HIST_H_SIZE_V10 ); +rkisp1_write (params->rkisp1, block_vsize,RKISP1_CIF_ISP_HIST_V_SIZE_V10 ); weight = arg->hist_weight;for (i =0 ; i <ARRAY_SIZE (hist_weight_regs); ++i, weight +=4 )rkisp1_write (params->rkisp1, -RKISP1_CIF_ISP_HIST_WEIGHT_SET (weight[0 ], +RKISP1_CIF_ISP_HIST_WEIGHT_SET_V10 (weight[0 ], weight[1 ], weight[2 ], weight[3 ]), hist_weight_regs[i]); -rkisp1_write (params->rkisp1, weight[0 ] &0x1F ,RKISP1_CIF_ISP_HIST_WEIGHT_44 ); +rkisp1_write (params->rkisp1, weight[0 ] &0x1F ,RKISP1_CIF_ISP_HIST_WEIGHT_44_V10 ); }static void -rkisp1_hst_enable (struct rkisp1_params *params, -const struct rkisp1_cif_isp_hst_config *arg,bool en) +rkisp1_hst_enable_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_hst_config *arg,bool en) {if (en) {u32 hist_prop =rkisp1_read (params->rkisp1, -RKISP1_CIF_ISP_HIST_PROP ); +RKISP1_CIF_ISP_HIST_PROP_V10 ); - hist_prop &= ~RKISP1_CIF_ISP_HIST_PROP_MODE_MASK ; + hist_prop &= ~RKISP1_CIF_ISP_HIST_PROP_MODE_MASK_V10 ; hist_prop |= arg->mode; -rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP , +rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP_V10 , hist_prop); }else { -rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_HIST_PROP , -RKISP1_CIF_ISP_HIST_PROP_MODE_MASK ); +rkisp1_param_clear_bits (params,RKISP1_CIF_ISP_HIST_PROP_V10 , +RKISP1_CIF_ISP_HIST_PROP_MODE_MASK_V10 ); } } -static void rkisp1_afm_config (struct rkisp1_params *params, -const struct rkisp1_cif_isp_afc_config *arg) +static void rkisp1_afm_config_v10 (struct rkisp1_params *params, +const struct rkisp1_cif_isp_afc_config *arg) {size_t num_of_win =min_t (size_t,ARRAY_SIZE (arg->afm_win), arg->num_afm_win);@@ -1231,7 +1231,7 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)memset (hst.hist_weight,0x01 ,sizeof (hst.hist_weight)); params->ops->hst_config (params, &hst); -rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP , +rkisp1_param_set_bits (params,RKISP1_CIF_ISP_HIST_PROP_V10 , rkisp1_hst_params_default_config.mode);/* set the range */ @@ -1290,16 +1290,16 @@ void rkisp1_params_disable(struct rkisp1_params *params) RKISP1_CIF_ISP_DPF_MODE_EN); } -static struct rkisp1_params_ops rkisp1_params_ops = { - .lsc_matrix_config = rkisp1_lsc_matrix_config, - .goc_config = rkisp1_goc_config, - .awb_meas_config = rkisp1_awb_meas_config, - .awb_meas_enable = rkisp1_awb_meas_enable, - .awb_gain_config = rkisp1_awb_gain_config, - .aec_config = rkisp1_aec_config, - .hst_config = rkisp1_hst_config, - .hst_enable = rkisp1_hst_enable, - .afm_config = rkisp1_afm_config, +static struct rkisp1_params_ops rkisp1_v10_params_ops = { + .lsc_matrix_config = rkisp1_lsc_matrix_config_v10, + .goc_config = rkisp1_goc_config_v10, + .awb_meas_config = rkisp1_awb_meas_config_v10, + .awb_meas_enable = rkisp1_awb_meas_enable_v10, + .awb_gain_config = rkisp1_awb_gain_config_v10, + .aec_config = rkisp1_aec_config_v10, + .hst_config = rkisp1_hst_config_v10, + .hst_enable = rkisp1_hst_enable_v10, + .afm_config = rkisp1_afm_config_v10, }; static int rkisp1_params_enum_fmt_meta_out(struct file *file, void *priv,@@ -1469,7 +1469,7 @@ static void rkisp1_init_params(struct rkisp1_params *params) params->vdev_fmt.fmt.meta.buffersize =sizeof (struct rkisp1_params_cfg ); - params->ops = &rkisp1_params_ops; + params->ops = &rkisp1_v10_params_ops; }int rkisp1_params_register (struct rkisp1_device *rkisp1)drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +131
-132@@ -346,26 +346,26 @@#define RKISP1_CIF_SUPER_IMP_CTRL_TRANSP_DIS BIT(2)/* ISP HISTOGRAM CALCULATION : ISP_HIST_PROP */ -#define RKISP1_CIF_ISP_HIST_PROP_MODE_DIS (0 << 0) -#define RKISP1_CIF_ISP_HIST_PROP_MODE_RGB BIT(0) -#define RKISP1_CIF_ISP_HIST_PROP_MODE_RED (2 << 0) -#define RKISP1_CIF_ISP_HIST_PROP_MODE_GREEN (3 << 0) -#define RKISP1_CIF_ISP_HIST_PROP_MODE_BLUE (4 << 0) -#define RKISP1_CIF_ISP_HIST_PROP_MODE_LUM (5 << 0) -#define RKISP1_CIF_ISP_HIST_PROP_MODE_MASK 0x7 -#define RKISP1_CIF_ISP_HIST_PREDIV_SET (x) (((x) & 0x7F) << 3) -#define RKISP1_CIF_ISP_HIST_WEIGHT_SET (v0, v1, v2, v3) \ +#define RKISP1_CIF_ISP_HIST_PROP_MODE_DIS_V10 (0 << 0) +#define RKISP1_CIF_ISP_HIST_PROP_MODE_RGB_V10 BIT(0) +#define RKISP1_CIF_ISP_HIST_PROP_MODE_RED_V10 (2 << 0) +#define RKISP1_CIF_ISP_HIST_PROP_MODE_GREEN_V10 (3 << 0) +#define RKISP1_CIF_ISP_HIST_PROP_MODE_BLUE_V10 (4 << 0) +#define RKISP1_CIF_ISP_HIST_PROP_MODE_LUM_V10 (5 << 0) +#define RKISP1_CIF_ISP_HIST_PROP_MODE_MASK_V10 0x7 +#define RKISP1_CIF_ISP_HIST_PREDIV_SET_V10 (x) (((x) & 0x7F) << 3) +#define RKISP1_CIF_ISP_HIST_WEIGHT_SET_V10 (v0, v1, v2, v3) \ (((v0) & 0x1F) | (((v1) & 0x1F) << 8) |\ (((v2) & 0x1F) << 16) | \ (((v3) & 0x1F) << 24)) -#define RKISP1_CIF_ISP_HIST_WINDOW_OFFSET_RESERVED 0xFFFFF000 -#define RKISP1_CIF_ISP_HIST_WINDOW_SIZE_RESERVED 0xFFFFF800 -#define RKISP1_CIF_ISP_HIST_WEIGHT_RESERVED 0xE0E0E0E0 -#define RKISP1_CIF_ISP_MAX_HIST_PREDIVIDER 0x0000007F -#define RKISP1_CIF_ISP_HIST_ROW_NUM 5 -#define RKISP1_CIF_ISP_HIST_COLUMN_NUM 5 -#define RKISP1_CIF_ISP_HIST_GET_BIN (x) ((x) & 0x000FFFFF) +#define RKISP1_CIF_ISP_HIST_WINDOW_OFFSET_RESERVED_V10 0xFFFFF000 +#define RKISP1_CIF_ISP_HIST_WINDOW_SIZE_RESERVED_V10 0xFFFFF800 +#define RKISP1_CIF_ISP_HIST_WEIGHT_RESERVED_V10 0xE0E0E0E0 +#define RKISP1_CIF_ISP_MAX_HIST_PREDIVIDER_V10 0x0000007F +#define RKISP1_CIF_ISP_HIST_ROW_NUM_V10 5 +#define RKISP1_CIF_ISP_HIST_COLUMN_NUM_V10 5 +#define RKISP1_CIF_ISP_HIST_GET_BIN_V10 (x) ((x) & 0x000FFFFF)/* AUTO FOCUS MEASUREMENT: ISP_AFM_CTRL */ #define RKISP1_ISP_AFM_CTRL_ENABLE BIT(0)@@ -442,41 +442,41 @@#define RKISP1_CIF_ISP_EXP_CTRL_MEASMODE_1 BIT(31)/* ISP_EXP_H_SIZE */ -#define RKISP1_CIF_ISP_EXP_H_SIZE_SET (x) ((x) & 0x7FF) -#define RKISP1_CIF_ISP_EXP_HEIGHT_MASK 0x000007FF +#define RKISP1_CIF_ISP_EXP_H_SIZE_SET_V10 (x) ((x) & 0x7FF) +#define RKISP1_CIF_ISP_EXP_HEIGHT_MASK_V10 0x000007FF/* ISP_EXP_V_SIZE : vertical size must be a multiple of 2). */ -#define RKISP1_CIF_ISP_EXP_V_SIZE_SET (x) ((x) & 0x7FE) +#define RKISP1_CIF_ISP_EXP_V_SIZE_SET_V10 (x) ((x) & 0x7FE)/* ISP_EXP_H_OFFSET */ -#define RKISP1_CIF_ISP_EXP_H_OFFSET_SET (x) ((x) & 0x1FFF) -#define RKISP1_CIF_ISP_EXP_MAX_HOFFS 2424 +#define RKISP1_CIF_ISP_EXP_H_OFFSET_SET_V10 (x) ((x) & 0x1FFF) +#define RKISP1_CIF_ISP_EXP_MAX_HOFFS_V10 2424/* ISP_EXP_V_OFFSET */ -#define RKISP1_CIF_ISP_EXP_V_OFFSET_SET (x) ((x) & 0x1FFF) -#define RKISP1_CIF_ISP_EXP_MAX_VOFFS 1806 - -#define RKISP1_CIF_ISP_EXP_ROW_NUM 5 -#define RKISP1_CIF_ISP_EXP_COLUMN_NUM 5 -#define RKISP1_CIF_ISP_EXP_NUM_LUMA_REGS \ - (RKISP1_CIF_ISP_EXP_ROW_NUM * RKISP1_CIF_ISP_EXP_COLUMN_NUM) -#define RKISP1_CIF_ISP_EXP_BLOCK_MAX_HSIZE 516 -#define RKISP1_CIF_ISP_EXP_BLOCK_MIN_HSIZE 35 -#define RKISP1_CIF_ISP_EXP_BLOCK_MAX_VSIZE 390 -#define RKISP1_CIF_ISP_EXP_BLOCK_MIN_VSIZE 28 -#define RKISP1_CIF_ISP_EXP_MAX_HSIZE \ - (RKISP1_CIF_ISP_EXP_BLOCK_MAX_HSIZE * RKISP1_CIF_ISP_EXP_COLUMN_NUM + 1) -#define RKISP1_CIF_ISP_EXP_MIN_HSIZE \ - (RKISP1_CIF_ISP_EXP_BLOCK_MIN_HSIZE * RKISP1_CIF_ISP_EXP_COLUMN_NUM + 1) -#define RKISP1_CIF_ISP_EXP_MAX_VSIZE \ - (RKISP1_CIF_ISP_EXP_BLOCK_MAX_VSIZE * RKISP1_CIF_ISP_EXP_ROW_NUM + 1) -#define RKISP1_CIF_ISP_EXP_MIN_VSIZE \ - (RKISP1_CIF_ISP_EXP_BLOCK_MIN_VSIZE * RKISP1_CIF_ISP_EXP_ROW_NUM + 1) +#define RKISP1_CIF_ISP_EXP_V_OFFSET_SET_V10 (x) ((x) & 0x1FFF) +#define RKISP1_CIF_ISP_EXP_MAX_VOFFS_V10 1806 + +#define RKISP1_CIF_ISP_EXP_ROW_NUM_V10 5 +#define RKISP1_CIF_ISP_EXP_COLUMN_NUM_V10 5 +#define RKISP1_CIF_ISP_EXP_NUM_LUMA_REGS_V10 \ + (RKISP1_CIF_ISP_EXP_ROW_NUM_V10 * RKISP1_CIF_ISP_EXP_COLUMN_NUM_V10) +#define RKISP1_CIF_ISP_EXP_BLOCK_MAX_HSIZE_V10 516 +#define RKISP1_CIF_ISP_EXP_BLOCK_MIN_HSIZE_V10 35 +#define RKISP1_CIF_ISP_EXP_BLOCK_MAX_VSIZE_V10 390 +#define RKISP1_CIF_ISP_EXP_BLOCK_MIN_VSIZE_V10 28 +#define RKISP1_CIF_ISP_EXP_MAX_HSIZE_V10 \ + (RKISP1_CIF_ISP_EXP_BLOCK_MAX_HSIZE_V10 * RKISP1_CIF_ISP_EXP_COLUMN_NUM_V10 + 1) +#define RKISP1_CIF_ISP_EXP_MIN_HSIZE_V10 \ + (RKISP1_CIF_ISP_EXP_BLOCK_MIN_HSIZE_V10 * RKISP1_CIF_ISP_EXP_COLUMN_NUM_V10 + 1) +#define RKISP1_CIF_ISP_EXP_MAX_VSIZE_V10 \ + (RKISP1_CIF_ISP_EXP_BLOCK_MAX_VSIZE_V10 * RKISP1_CIF_ISP_EXP_ROW_NUM_V10 + 1) +#define RKISP1_CIF_ISP_EXP_MIN_VSIZE_V10 \ + (RKISP1_CIF_ISP_EXP_BLOCK_MIN_VSIZE_V10 * RKISP1_CIF_ISP_EXP_ROW_NUM_V10 + 1)/* LSC: ISP_LSC_CTRL */ #define RKISP1_CIF_ISP_LSC_CTRL_ENA BIT(0)#define RKISP1_CIF_ISP_LSC_SECT_SIZE_RESERVED 0xFC00FC00 -#define RKISP1_CIF_ISP_LSC_GRAD_RESERVED 0xF000F000 -#define RKISP1_CIF_ISP_LSC_SAMPLE_RESERVED 0xF000F000 -#define RKISP1_CIF_ISP_LSC_TABLE_DATA (v0, v1) \ +#define RKISP1_CIF_ISP_LSC_GRAD_RESERVED_V10 0xF000F000 +#define RKISP1_CIF_ISP_LSC_SAMPLE_RESERVED_V10 0xF000F000 +#define RKISP1_CIF_ISP_LSC_TABLE_DATA_V10 (v0, v1) \ (((v0) & 0xFFF) | (((v1) & 0xFFF) << 12))#define RKISP1_CIF_ISP_LSC_SECT_SIZE (v0, v1) \ (((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))@@ -667,18 +667,18 @@#define RKISP1_CIF_ISP_GAMMA_B_Y14 (RKISP1_CIF_ISP_BASE + 0x000000E4)#define RKISP1_CIF_ISP_GAMMA_B_Y15 (RKISP1_CIF_ISP_BASE + 0x000000E8)#define RKISP1_CIF_ISP_GAMMA_B_Y16 (RKISP1_CIF_ISP_BASE + 0x000000EC) -#define RKISP1_CIF_ISP_AWB_PROP (RKISP1_CIF_ISP_BASE + 0x00000110) -#define RKISP1_CIF_ISP_AWB_WND_H_OFFS (RKISP1_CIF_ISP_BASE + 0x00000114) -#define RKISP1_CIF_ISP_AWB_WND_V_OFFS (RKISP1_CIF_ISP_BASE + 0x00000118) -#define RKISP1_CIF_ISP_AWB_WND_H_SIZE (RKISP1_CIF_ISP_BASE + 0x0000011C) -#define RKISP1_CIF_ISP_AWB_WND_V_SIZE (RKISP1_CIF_ISP_BASE + 0x00000120) -#define RKISP1_CIF_ISP_AWB_FRAMES (RKISP1_CIF_ISP_BASE + 0x00000124) -#define RKISP1_CIF_ISP_AWB_REF (RKISP1_CIF_ISP_BASE + 0x00000128) -#define RKISP1_CIF_ISP_AWB_THRESH (RKISP1_CIF_ISP_BASE + 0x0000012C) -#define RKISP1_CIF_ISP_AWB_GAIN_G (RKISP1_CIF_ISP_BASE + 0x00000138) -#define RKISP1_CIF_ISP_AWB_GAIN_RB (RKISP1_CIF_ISP_BASE + 0x0000013C) -#define RKISP1_CIF_ISP_AWB_WHITE_CNT (RKISP1_CIF_ISP_BASE + 0x00000140) -#define RKISP1_CIF_ISP_AWB_MEAN (RKISP1_CIF_ISP_BASE + 0x00000144) +#define RKISP1_CIF_ISP_AWB_PROP_V10 (RKISP1_CIF_ISP_BASE + 0x00000110) +#define RKISP1_CIF_ISP_AWB_WND_H_OFFS_V10 (RKISP1_CIF_ISP_BASE + 0x00000114) +#define RKISP1_CIF_ISP_AWB_WND_V_OFFS_V10 (RKISP1_CIF_ISP_BASE + 0x00000118) +#define RKISP1_CIF_ISP_AWB_WND_H_SIZE_V10 (RKISP1_CIF_ISP_BASE + 0x0000011C) +#define RKISP1_CIF_ISP_AWB_WND_V_SIZE_V10 (RKISP1_CIF_ISP_BASE + 0x00000120) +#define RKISP1_CIF_ISP_AWB_FRAMES_V10 (RKISP1_CIF_ISP_BASE + 0x00000124) +#define RKISP1_CIF_ISP_AWB_REF_V10 (RKISP1_CIF_ISP_BASE + 0x00000128) +#define RKISP1_CIF_ISP_AWB_THRESH_V10 (RKISP1_CIF_ISP_BASE + 0x0000012C) +#define RKISP1_CIF_ISP_AWB_GAIN_G_V10 (RKISP1_CIF_ISP_BASE + 0x00000138) +#define RKISP1_CIF_ISP_AWB_GAIN_RB_V10 (RKISP1_CIF_ISP_BASE + 0x0000013C) +#define RKISP1_CIF_ISP_AWB_WHITE_CNT_V10 (RKISP1_CIF_ISP_BASE + 0x00000140) +#define RKISP1_CIF_ISP_AWB_MEAN_V10 (RKISP1_CIF_ISP_BASE + 0x00000144)#define RKISP1_CIF_ISP_CC_COEFF_0 (RKISP1_CIF_ISP_BASE + 0x00000170)#define RKISP1_CIF_ISP_CC_COEFF_1 (RKISP1_CIF_ISP_BASE + 0x00000174)#define RKISP1_CIF_ISP_CC_COEFF_2 (RKISP1_CIF_ISP_BASE + 0x00000178)@@ -712,24 +712,24 @@#define RKISP1_CIF_ISP_CT_COEFF_6 (RKISP1_CIF_ISP_BASE + 0x000001E8)#define RKISP1_CIF_ISP_CT_COEFF_7 (RKISP1_CIF_ISP_BASE + 0x000001EC)#define RKISP1_CIF_ISP_CT_COEFF_8 (RKISP1_CIF_ISP_BASE + 0x000001F0) -#define RKISP1_CIF_ISP_GAMMA_OUT_MODE (RKISP1_CIF_ISP_BASE + 0x000001F4) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_0 (RKISP1_CIF_ISP_BASE + 0x000001F8) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_1 (RKISP1_CIF_ISP_BASE + 0x000001FC) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_2 (RKISP1_CIF_ISP_BASE + 0x00000200) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_3 (RKISP1_CIF_ISP_BASE + 0x00000204) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_4 (RKISP1_CIF_ISP_BASE + 0x00000208) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_5 (RKISP1_CIF_ISP_BASE + 0x0000020C) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_6 (RKISP1_CIF_ISP_BASE + 0x00000210) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_7 (RKISP1_CIF_ISP_BASE + 0x00000214) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_8 (RKISP1_CIF_ISP_BASE + 0x00000218) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_9 (RKISP1_CIF_ISP_BASE + 0x0000021C) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_10 (RKISP1_CIF_ISP_BASE + 0x00000220) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_11 (RKISP1_CIF_ISP_BASE + 0x00000224) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_12 (RKISP1_CIF_ISP_BASE + 0x00000228) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_13 (RKISP1_CIF_ISP_BASE + 0x0000022C) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_14 (RKISP1_CIF_ISP_BASE + 0x00000230) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_15 (RKISP1_CIF_ISP_BASE + 0x00000234) -#define RKISP1_CIF_ISP_GAMMA_OUT_Y_16 (RKISP1_CIF_ISP_BASE + 0x00000238) +#define RKISP1_CIF_ISP_GAMMA_OUT_MODE_V10 (RKISP1_CIF_ISP_BASE + 0x000001F4) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_0_V10 (RKISP1_CIF_ISP_BASE + 0x000001F8) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_1_V10 (RKISP1_CIF_ISP_BASE + 0x000001FC) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_2_V10 (RKISP1_CIF_ISP_BASE + 0x00000200) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_3_V10 (RKISP1_CIF_ISP_BASE + 0x00000204) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_4_V10 (RKISP1_CIF_ISP_BASE + 0x00000208) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_5_V10 (RKISP1_CIF_ISP_BASE + 0x0000020C) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_6_V10 (RKISP1_CIF_ISP_BASE + 0x00000210) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_7_V10 (RKISP1_CIF_ISP_BASE + 0x00000214) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_8_V10 (RKISP1_CIF_ISP_BASE + 0x00000218) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_9_V10 (RKISP1_CIF_ISP_BASE + 0x0000021C) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_10_V10 (RKISP1_CIF_ISP_BASE + 0x00000220) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_11_V10 (RKISP1_CIF_ISP_BASE + 0x00000224) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_12_V10 (RKISP1_CIF_ISP_BASE + 0x00000228) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_13_V10 (RKISP1_CIF_ISP_BASE + 0x0000022C) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_14_V10 (RKISP1_CIF_ISP_BASE + 0x00000230) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_15_V10 (RKISP1_CIF_ISP_BASE + 0x00000234) +#define RKISP1_CIF_ISP_GAMMA_OUT_Y_16_V10 (RKISP1_CIF_ISP_BASE + 0x00000238)#define RKISP1_CIF_ISP_ERR (RKISP1_CIF_ISP_BASE + 0x0000023C)#define RKISP1_CIF_ISP_ERR_CLR (RKISP1_CIF_ISP_BASE + 0x00000240)#define RKISP1_CIF_ISP_FRAME_COUNT (RKISP1_CIF_ISP_BASE + 0x00000244)@@ -1005,36 +1005,35 @@#define RKISP1_CIF_ISP_IS_H_SIZE_SHD (RKISP1_CIF_ISP_IS_BASE + 0x0000002C)#define RKISP1_CIF_ISP_IS_V_SIZE_SHD (RKISP1_CIF_ISP_IS_BASE + 0x00000030) -#define RKISP1_CIF_ISP_HIST_BASE 0x00002400 - -#define RKISP1_CIF_ISP_HIST_PROP (RKISP1_CIF_ISP_HIST_BASE + 0x00000000) -#define RKISP1_CIF_ISP_HIST_H_OFFS (RKISP1_CIF_ISP_HIST_BASE + 0x00000004) -#define RKISP1_CIF_ISP_HIST_V_OFFS (RKISP1_CIF_ISP_HIST_BASE + 0x00000008) -#define RKISP1_CIF_ISP_HIST_H_SIZE (RKISP1_CIF_ISP_HIST_BASE + 0x0000000C) -#define RKISP1_CIF_ISP_HIST_V_SIZE (RKISP1_CIF_ISP_HIST_BASE + 0x00000010) -#define RKISP1_CIF_ISP_HIST_BIN_0 (RKISP1_CIF_ISP_HIST_BASE + 0x00000014) -#define RKISP1_CIF_ISP_HIST_BIN_1 (RKISP1_CIF_ISP_HIST_BASE + 0x00000018) -#define RKISP1_CIF_ISP_HIST_BIN_2 (RKISP1_CIF_ISP_HIST_BASE + 0x0000001C) -#define RKISP1_CIF_ISP_HIST_BIN_3 (RKISP1_CIF_ISP_HIST_BASE + 0x00000020) -#define RKISP1_CIF_ISP_HIST_BIN_4 (RKISP1_CIF_ISP_HIST_BASE + 0x00000024) -#define RKISP1_CIF_ISP_HIST_BIN_5 (RKISP1_CIF_ISP_HIST_BASE + 0x00000028) -#define RKISP1_CIF_ISP_HIST_BIN_6 (RKISP1_CIF_ISP_HIST_BASE + 0x0000002C) -#define RKISP1_CIF_ISP_HIST_BIN_7 (RKISP1_CIF_ISP_HIST_BASE + 0x00000030) -#define RKISP1_CIF_ISP_HIST_BIN_8 (RKISP1_CIF_ISP_HIST_BASE + 0x00000034) -#define RKISP1_CIF_ISP_HIST_BIN_9 (RKISP1_CIF_ISP_HIST_BASE + 0x00000038) -#define RKISP1_CIF_ISP_HIST_BIN_10 (RKISP1_CIF_ISP_HIST_BASE + 0x0000003C) -#define RKISP1_CIF_ISP_HIST_BIN_11 (RKISP1_CIF_ISP_HIST_BASE + 0x00000040) -#define RKISP1_CIF_ISP_HIST_BIN_12 (RKISP1_CIF_ISP_HIST_BASE + 0x00000044) -#define RKISP1_CIF_ISP_HIST_BIN_13 (RKISP1_CIF_ISP_HIST_BASE + 0x00000048) -#define RKISP1_CIF_ISP_HIST_BIN_14 (RKISP1_CIF_ISP_HIST_BASE + 0x0000004C) -#define RKISP1_CIF_ISP_HIST_BIN_15 (RKISP1_CIF_ISP_HIST_BASE + 0x00000050) -#define RKISP1_CIF_ISP_HIST_WEIGHT_00TO30 (RKISP1_CIF_ISP_HIST_BASE + 0x00000054) -#define RKISP1_CIF_ISP_HIST_WEIGHT_40TO21 (RKISP1_CIF_ISP_HIST_BASE + 0x00000058) -#define RKISP1_CIF_ISP_HIST_WEIGHT_31TO12 (RKISP1_CIF_ISP_HIST_BASE + 0x0000005C) -#define RKISP1_CIF_ISP_HIST_WEIGHT_22TO03 (RKISP1_CIF_ISP_HIST_BASE + 0x00000060) -#define RKISP1_CIF_ISP_HIST_WEIGHT_13TO43 (RKISP1_CIF_ISP_HIST_BASE + 0x00000064) -#define RKISP1_CIF_ISP_HIST_WEIGHT_04TO34 (RKISP1_CIF_ISP_HIST_BASE + 0x00000068) -#define RKISP1_CIF_ISP_HIST_WEIGHT_44 (RKISP1_CIF_ISP_HIST_BASE + 0x0000006C) +#define RKISP1_CIF_ISP_HIST_BASE_V10 0x00002400 +#define RKISP1_CIF_ISP_HIST_PROP_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000000) +#define RKISP1_CIF_ISP_HIST_H_OFFS_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000004) +#define RKISP1_CIF_ISP_HIST_V_OFFS_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000008) +#define RKISP1_CIF_ISP_HIST_H_SIZE_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x0000000C) +#define RKISP1_CIF_ISP_HIST_V_SIZE_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000010) +#define RKISP1_CIF_ISP_HIST_BIN_0_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000014) +#define RKISP1_CIF_ISP_HIST_BIN_1_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000018) +#define RKISP1_CIF_ISP_HIST_BIN_2_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x0000001C) +#define RKISP1_CIF_ISP_HIST_BIN_3_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000020) +#define RKISP1_CIF_ISP_HIST_BIN_4_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000024) +#define RKISP1_CIF_ISP_HIST_BIN_5_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000028) +#define RKISP1_CIF_ISP_HIST_BIN_6_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x0000002C) +#define RKISP1_CIF_ISP_HIST_BIN_7_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000030) +#define RKISP1_CIF_ISP_HIST_BIN_8_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000034) +#define RKISP1_CIF_ISP_HIST_BIN_9_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000038) +#define RKISP1_CIF_ISP_HIST_BIN_10_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x0000003C) +#define RKISP1_CIF_ISP_HIST_BIN_11_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000040) +#define RKISP1_CIF_ISP_HIST_BIN_12_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000044) +#define RKISP1_CIF_ISP_HIST_BIN_13_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000048) +#define RKISP1_CIF_ISP_HIST_BIN_14_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x0000004C) +#define RKISP1_CIF_ISP_HIST_BIN_15_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000050) +#define RKISP1_CIF_ISP_HIST_WEIGHT_00TO30_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000054) +#define RKISP1_CIF_ISP_HIST_WEIGHT_40TO21_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000058) +#define RKISP1_CIF_ISP_HIST_WEIGHT_31TO12_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x0000005C) +#define RKISP1_CIF_ISP_HIST_WEIGHT_22TO03_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000060) +#define RKISP1_CIF_ISP_HIST_WEIGHT_13TO43_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000064) +#define RKISP1_CIF_ISP_HIST_WEIGHT_04TO34_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x00000068) +#define RKISP1_CIF_ISP_HIST_WEIGHT_44_V10 (RKISP1_CIF_ISP_HIST_BASE_V10 + 0x0000006C)#define RKISP1_CIF_ISP_FILT_BASE 0x00002500#define RKISP1_CIF_ISP_FILT_MODE (RKISP1_CIF_ISP_FILT_BASE + 0x00000000)@@ -1060,35 +1059,35 @@#define RKISP1_CIF_ISP_EXP_BASE 0x00002600#define RKISP1_CIF_ISP_EXP_CTRL (RKISP1_CIF_ISP_EXP_BASE + 0x00000000) -#define RKISP1_CIF_ISP_EXP_H_OFFSET (RKISP1_CIF_ISP_EXP_BASE + 0x00000004) -#define RKISP1_CIF_ISP_EXP_V_OFFSET (RKISP1_CIF_ISP_EXP_BASE + 0x00000008) -#define RKISP1_CIF_ISP_EXP_H_SIZE (RKISP1_CIF_ISP_EXP_BASE + 0x0000000C) -#define RKISP1_CIF_ISP_EXP_V_SIZE (RKISP1_CIF_ISP_EXP_BASE + 0x00000010) -#define RKISP1_CIF_ISP_EXP_MEAN_00 (RKISP1_CIF_ISP_EXP_BASE + 0x00000014) -#define RKISP1_CIF_ISP_EXP_MEAN_10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000018) -#define RKISP1_CIF_ISP_EXP_MEAN_20 (RKISP1_CIF_ISP_EXP_BASE + 0x0000001c) -#define RKISP1_CIF_ISP_EXP_MEAN_30 (RKISP1_CIF_ISP_EXP_BASE + 0x00000020) -#define RKISP1_CIF_ISP_EXP_MEAN_40 (RKISP1_CIF_ISP_EXP_BASE + 0x00000024) -#define RKISP1_CIF_ISP_EXP_MEAN_01 (RKISP1_CIF_ISP_EXP_BASE + 0x00000028) -#define RKISP1_CIF_ISP_EXP_MEAN_11 (RKISP1_CIF_ISP_EXP_BASE + 0x0000002c) -#define RKISP1_CIF_ISP_EXP_MEAN_21 (RKISP1_CIF_ISP_EXP_BASE + 0x00000030) -#define RKISP1_CIF_ISP_EXP_MEAN_31 (RKISP1_CIF_ISP_EXP_BASE + 0x00000034) -#define RKISP1_CIF_ISP_EXP_MEAN_41 (RKISP1_CIF_ISP_EXP_BASE + 0x00000038) -#define RKISP1_CIF_ISP_EXP_MEAN_02 (RKISP1_CIF_ISP_EXP_BASE + 0x0000003c) -#define RKISP1_CIF_ISP_EXP_MEAN_12 (RKISP1_CIF_ISP_EXP_BASE + 0x00000040) -#define RKISP1_CIF_ISP_EXP_MEAN_22 (RKISP1_CIF_ISP_EXP_BASE + 0x00000044) -#define RKISP1_CIF_ISP_EXP_MEAN_32 (RKISP1_CIF_ISP_EXP_BASE + 0x00000048) -#define RKISP1_CIF_ISP_EXP_MEAN_42 (RKISP1_CIF_ISP_EXP_BASE + 0x0000004c) -#define RKISP1_CIF_ISP_EXP_MEAN_03 (RKISP1_CIF_ISP_EXP_BASE + 0x00000050) -#define RKISP1_CIF_ISP_EXP_MEAN_13 (RKISP1_CIF_ISP_EXP_BASE + 0x00000054) -#define RKISP1_CIF_ISP_EXP_MEAN_23 (RKISP1_CIF_ISP_EXP_BASE + 0x00000058) -#define RKISP1_CIF_ISP_EXP_MEAN_33 (RKISP1_CIF_ISP_EXP_BASE + 0x0000005c) -#define RKISP1_CIF_ISP_EXP_MEAN_43 (RKISP1_CIF_ISP_EXP_BASE + 0x00000060) -#define RKISP1_CIF_ISP_EXP_MEAN_04 (RKISP1_CIF_ISP_EXP_BASE + 0x00000064) -#define RKISP1_CIF_ISP_EXP_MEAN_14 (RKISP1_CIF_ISP_EXP_BASE + 0x00000068) -#define RKISP1_CIF_ISP_EXP_MEAN_24 (RKISP1_CIF_ISP_EXP_BASE + 0x0000006c) -#define RKISP1_CIF_ISP_EXP_MEAN_34 (RKISP1_CIF_ISP_EXP_BASE + 0x00000070) -#define RKISP1_CIF_ISP_EXP_MEAN_44 (RKISP1_CIF_ISP_EXP_BASE + 0x00000074) +#define RKISP1_CIF_ISP_EXP_H_OFFSET_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000004) +#define RKISP1_CIF_ISP_EXP_V_OFFSET_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000008) +#define RKISP1_CIF_ISP_EXP_H_SIZE_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x0000000C) +#define RKISP1_CIF_ISP_EXP_V_SIZE_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000010) +#define RKISP1_CIF_ISP_EXP_MEAN_00_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000014) +#define RKISP1_CIF_ISP_EXP_MEAN_10_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000018) +#define RKISP1_CIF_ISP_EXP_MEAN_20_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x0000001c) +#define RKISP1_CIF_ISP_EXP_MEAN_30_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000020) +#define RKISP1_CIF_ISP_EXP_MEAN_40_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000024) +#define RKISP1_CIF_ISP_EXP_MEAN_01_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000028) +#define RKISP1_CIF_ISP_EXP_MEAN_11_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x0000002c) +#define RKISP1_CIF_ISP_EXP_MEAN_21_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000030) +#define RKISP1_CIF_ISP_EXP_MEAN_31_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000034) +#define RKISP1_CIF_ISP_EXP_MEAN_41_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000038) +#define RKISP1_CIF_ISP_EXP_MEAN_02_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x0000003c) +#define RKISP1_CIF_ISP_EXP_MEAN_12_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000040) +#define RKISP1_CIF_ISP_EXP_MEAN_22_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000044) +#define RKISP1_CIF_ISP_EXP_MEAN_32_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000048) +#define RKISP1_CIF_ISP_EXP_MEAN_42_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x0000004c) +#define RKISP1_CIF_ISP_EXP_MEAN_03_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000050) +#define RKISP1_CIF_ISP_EXP_MEAN_13_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000054) +#define RKISP1_CIF_ISP_EXP_MEAN_23_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000058) +#define RKISP1_CIF_ISP_EXP_MEAN_33_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x0000005c) +#define RKISP1_CIF_ISP_EXP_MEAN_43_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000060) +#define RKISP1_CIF_ISP_EXP_MEAN_04_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000064) +#define RKISP1_CIF_ISP_EXP_MEAN_14_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000068) +#define RKISP1_CIF_ISP_EXP_MEAN_24_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x0000006c) +#define RKISP1_CIF_ISP_EXP_MEAN_34_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000070) +#define RKISP1_CIF_ISP_EXP_MEAN_44_V10 (RKISP1_CIF_ISP_EXP_BASE + 0x00000074)#define RKISP1_CIF_ISP_BLS_BASE 0x00002700#define RKISP1_CIF_ISP_BLS_CTRL (RKISP1_CIF_ISP_BLS_BASE + 0x00000000)
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h line 1263
Quoted 5 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +2
-0@@ -1260,4 +1259,7 @@#define RKISP1_CIF_ISP_VSM_DELTA_H (RKISP1_CIF_ISP_VSM_BASE + 0x0000001C)#define RKISP1_CIF_ISP_VSM_DELTA_V (RKISP1_CIF_ISP_VSM_BASE + 0x00000020) +#define RKISP1_CIF_ISP_CSI0_BASE 0x00007000 +#define RKISP1_CIF_ISP_CSI0_CTRL0 (RKISP1_CIF_ISP_CSI0_BASE + 0x00000000)
Those two defines belong to the next patch, with that change
Quoted 96 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +1
-0+#endif /* _RKISP1_REGS_H */ drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +16
-16@@ -175,18 +175,18 @@ rkisp1_stats_init_vb2_queue(struct vb2_queue *q, struct rkisp1_stats *stats)return vb2_queue_init (q); } -static void rkisp1_stats_get_awb_meas (struct rkisp1_stats *stats, -struct rkisp1_stat_buffer *pbuf) +static void rkisp1_stats_get_awb_meas_v10 (struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf) {/* Protect against concurrent access from ISR? */ struct rkisp1_device *rkisp1 = stats->rkisp1;u32 reg_val; pbuf->meas_type |=RKISP1_CIF_ISP_STAT_AWB ; - reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_WHITE_CNT ); + reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_WHITE_CNT_V10 ); pbuf->params.awb.awb_mean[0 ].cnt =RKISP1_CIF_ISP_AWB_GET_PIXEL_CNT (reg_val); - reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_MEAN ); + reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AWB_MEAN_V10 ); pbuf->params.awb.awb_mean[0 ].mean_cr_or_r =RKISP1_CIF_ISP_AWB_GET_MEAN_CR_R (reg_val);@@ -196,8 +196,8 @@ static void rkisp1_stats_get_awb_meas(struct rkisp1_stats *stats,RKISP1_CIF_ISP_AWB_GET_MEAN_Y_G (reg_val); } -static void rkisp1_stats_get_aec_meas (struct rkisp1_stats *stats, -struct rkisp1_stat_buffer *pbuf) +static void rkisp1_stats_get_aec_meas_v10 (struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf) {struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i;@@ -206,7 +206,7 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats,for (i =0 ; i <RKISP1_CIF_ISP_AE_MEAN_MAX_V10 ; i++) pbuf->params.ae.exp_mean[i] = (u8 )rkisp1_read (rkisp1, -RKISP1_CIF_ISP_EXP_MEAN_00 + i *4 ); +RKISP1_CIF_ISP_EXP_MEAN_00_V10 + i *4 ); } static void rkisp1_stats_get_afc_meas(struct rkisp1_stats *stats,@@ -226,17 +226,17 @@ static void rkisp1_stats_get_afc_meas(struct rkisp1_stats *stats, af->window[2 ].lum =rkisp1_read (rkisp1,RKISP1_CIF_ISP_AFM_LUM_C ); } -static void rkisp1_stats_get_hst_meas (struct rkisp1_stats *stats, -struct rkisp1_stat_buffer *pbuf) +static void rkisp1_stats_get_hst_meas_v10 (struct rkisp1_stats *stats, +struct rkisp1_stat_buffer *pbuf) {struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i; pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ;for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 ; i++) { -u32 reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); +u32 reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0_V10 + i *4 ); - pbuf->params.hist.hist_bins[i] =RKISP1_CIF_ISP_HIST_GET_BIN (reg_val); + pbuf->params.hist.hist_bins[i] =RKISP1_CIF_ISP_HIST_GET_BIN_V10 (reg_val); } }@@ -287,10 +287,10 @@ static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats, } } -static struct rkisp1_stats_ops rkisp1_stats_ops = { - .get_awb_meas = rkisp1_stats_get_awb_meas, - .get_aec_meas = rkisp1_stats_get_aec_meas, - .get_hst_meas = rkisp1_stats_get_hst_meas, +static struct rkisp1_stats_ops rkisp1_v10_stats_ops = { + .get_awb_meas = rkisp1_stats_get_awb_meas_v10, + .get_aec_meas = rkisp1_stats_get_aec_meas_v10, + .get_hst_meas = rkisp1_stats_get_hst_meas_v10, }; static void@@ -361,7 +361,7 @@ static void rkisp1_init_stats(struct rkisp1_stats *stats) stats->vdev_fmt.fmt.meta.buffersize =sizeof (struct rkisp1_stat_buffer ); - stats->ops = &rkisp1_stats_ops; + stats->ops = &rkisp1_v10_stats_ops; }int rkisp1_stats_register (struct rkisp1_device *rkisp1)
Heiko Stuebner
maintainerPATCH v5 8/10 media: rockchip: rkisp1: add support for v12 isp variants
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The rkisp1 evolved over soc generations and the rk3326/px30 introduced the so called v12 - probably meaning v1.2.
Add the new register definitions.
--- .../platform/rockchip/rkisp1/rkisp1-isp.c | 13 + .../platform/rockchip/rkisp1/rkisp1-params.c | 338 +++++++++++++++++- .../platform/rockchip/rkisp1/rkisp1-regs.h | 140 ++++++++ .../platform/rockchip/rkisp1/rkisp1-stats.c | 73 +++- 4 files changed, 562 insertions(+), 2 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +13 -0
@@ -408,6 +408,10 @@ static int rkisp1_config_mipi(struct rkisp1_device *rkisp1)rkisp1_write (rkisp1, mipi_ctrl,RKISP1_CIF_MIPI_CTRL ); +/* V12 could also use a newer csi2-host, but we don't want that yet */ +if (rkisp1->media_dev.hw_revision ==RKISP1_V12 ) +rkisp1_write (rkisp1,0 ,RKISP1_CIF_ISP_CSI0_CTRL0 ); +/* Configure Data Type and Virtual Channel */ rkisp1_write(rkisp1, RKISP1_CIF_MIPI_DATA_SEL_DT(sink_fmt->mipi_dt) |
@@ -527,6 +531,15 @@ static void rkisp1_config_clk(struct rkisp1_device *rkisp1)RKISP1_CIF_ICCL_DCROP_CLK ;rkisp1_write (rkisp1, val,RKISP1_CIF_ICCL ); + +/* ensure sp and mp can run at the same time in V12 */ +if (rkisp1->media_dev.hw_revision ==RKISP1_V12 ) { + val =RKISP1_CIF_CLK_CTRL_MI_Y12 |RKISP1_CIF_CLK_CTRL_MI_SP | +RKISP1_CIF_CLK_CTRL_MI_RAW0 |RKISP1_CIF_CLK_CTRL_MI_RAW1 | +RKISP1_CIF_CLK_CTRL_MI_READ |RKISP1_CIF_CLK_CTRL_MI_RAWRD | +RKISP1_CIF_CLK_CTRL_CP |RKISP1_CIF_CLK_CTRL_IE ; +rkisp1_write (rkisp1, val,RKISP1_CIF_VI_ISP_CLK_CTRL_V12 ); + } }static void rkisp1_isp_start (struct rkisp1_device *rkisp1)
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +337 -1
404 lines not on this page · raw message
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +140 -0
234 lines not on this page · raw message
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +72 -1
103 lines not on this page · raw message
Signature · 1 line
2.29.2
Heiko Stuebner
maintainerPATCH v5 9/10 dt-bindings: media: rkisp1: document px30 isp compatible
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Add the compatible for the px30-variant of the rkisp
--- .../bindings/media/rockchip-isp1.yaml | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/media/rockchip-isp1.yaml +65 -1
@@ -15,7 +15,9 @@ description: | properties: compatible: - const: rockchip,rk3399-cif-isp + enum: + - rockchip,px30-cif-isp + - rockchip,rk3399-cif-isp reg: maxItems: 1
@@ -200,3 +202,65 @@ examples: }; }; }; + + - | + + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/power/px30-power.h> + + parent1: parent { + #address-cells = <2>; + #size-cells = <2>; + + isp: isp@ff4a0000 { + compatible = "rockchip,px30-cif-isp"; + reg = <0x0 0xff4a0000 0x0 0x8000>; + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "isp", "mi", "mipi"; + clocks = <&cru SCLK_ISP0>, + <&cru ACLK_ISP0_WRAPPER>, + <&cru HCLK_ISP0_WRAPPER>, + <&cru PCLK_ISP1_WRAPPER>; + clock-names = "isp", "aclk", "hclk", "pclk"; + iommus = <&isp_mmu>; + phys = <&csi_dphy>; + phy-names = "dphy"; + power-domains = <&power PX30_PD_VI>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_in_ucam1: endpoint@0 { + reg = <0>; + remote-endpoint = <&ucam1_out>; + data-lanes = <1 2>; + }; + }; + }; + }; + + i2c2: i2c { + #address-cells = <1>; + #size-cells = <0>; + + ov5695: camera@36 { + compatible = "ovti,ov5695"; + reg = <0x36>; + + port { + ucam1_out: endpoint { + remote-endpoint = <&mipi_in_ucam1>; + data-lanes = <1 2>; + }; + }; + }; + }; + };
Signature · 1 line
2.29.2
Rob Herring
maintainerRe: [PATCH v5 09/10] dt-bindings: media: rkisp1: document px30 isp compatible
Quoted 9 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
Add the compatible for the px30-variant of the rkisp
Signed-off-by Heiko Stuebner <[email protected]>--- .../bindings/media/rockchip-isp1.yaml | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:Documentation/devicetree/bindings/media/rockchip-isp1.example.dt.yaml:0:0: /example-1/parent/i2c/camera@36: failed to match any schema with compatible: ['ovti,ov5695'] \ndoc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1493733
This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit.
Heiko Stuebner
maintainerPATCH v5 10/10 media: rockchip: rkisp1: add support for px30 isp version
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The px30 uses a V12 isp block so add compatible and matchdata for it.
--- .../platform/rockchip/rkisp1/rkisp1-dev.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +25 -0
@@ -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,
Signature · 1 line
2.29.2
Re: [PATCH v5 10/10] media: rockchip: rkisp1: add support for px30 isp version
Hi,
Quoted 6 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
The px30 uses a V12 isp block so add compatible and matchdata for it.
Signed-off-by Heiko Stuebner <[email protected]>
Quoted 48 lines
--- .../platform/rockchip/rkisp1/rkisp1-dev.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+)drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +25
-0@@ -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,