From 4f4b86c75bd53fe523ab6561a2010bcb48d71cfb Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Wed, 18 Mar 2020 14:05:46 +0800 Subject: [PATCH] media: rockchip: isp: change ae/hst name to match datasheet Signed-off-by: Hu Kejun Change-Id: Ie8e3944977f47903e72b36c4c793ecb537ff283d --- .../platform/rockchip/isp/isp_params_v2x.c | 264 +++++++++--------- .../platform/rockchip/isp/isp_params_v2x.h | 64 ++--- .../platform/rockchip/isp/isp_stats_v2x.c | 218 +++++++-------- .../platform/rockchip/isp/isp_stats_v2x.h | 32 +-- include/uapi/linux/rkisp2-config.h | 64 ++--- 5 files changed, 321 insertions(+), 321 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.c b/drivers/media/platform/rockchip/isp/isp_params_v2x.c index eb7a2af1520c..b0fdec89e184 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v2x.c +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -1804,47 +1804,47 @@ isp_rawaebig_enable(struct rkisp_isp_params_vdev *params_vdev, } static void -isp_rawaebig1_config(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawaebig_meas_cfg *arg) -{ - isp_rawaebig_config(params_vdev, arg, 0); -} - -static void -isp_rawaebig1_enable(struct rkisp_isp_params_vdev *params_vdev, - bool en) -{ - isp_rawaebig_enable(params_vdev, en, 0); -} - -static void -isp_rawaebig2_config(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawaebig_meas_cfg *arg) +isp_rawae1_config(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawaebig_meas_cfg *arg) { isp_rawaebig_config(params_vdev, arg, 1); } static void -isp_rawaebig2_enable(struct rkisp_isp_params_vdev *params_vdev, - bool en) +isp_rawae1_enable(struct rkisp_isp_params_vdev *params_vdev, + bool en) { isp_rawaebig_enable(params_vdev, en, 1); } static void -isp_rawaebig3_config(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawaebig_meas_cfg *arg) +isp_rawae2_config(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawaebig_meas_cfg *arg) { isp_rawaebig_config(params_vdev, arg, 2); } static void -isp_rawaebig3_enable(struct rkisp_isp_params_vdev *params_vdev, - bool en) +isp_rawae2_enable(struct rkisp_isp_params_vdev *params_vdev, + bool en) { isp_rawaebig_enable(params_vdev, en, 2); } +static void +isp_rawae3_config(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawaebig_meas_cfg *arg) +{ + isp_rawaebig_config(params_vdev, arg, 0); +} + +static void +isp_rawae3_enable(struct rkisp_isp_params_vdev *params_vdev, + bool en) +{ + isp_rawaebig_enable(params_vdev, en, 0); +} + static void isp_rawawb_config(struct rkisp_isp_params_vdev *params_vdev, const struct isp2x_rawawb_meas_cfg *arg) @@ -2862,47 +2862,47 @@ isp_rawhstbig_enable(struct rkisp_isp_params_vdev *params_vdev, } static void -isp_rawhstbig1_config(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawhistbig_cfg *arg) -{ - isp_rawhstbig_config(params_vdev, arg, 0); -} - -static void -isp_rawhstbig1_enable(struct rkisp_isp_params_vdev *params_vdev, - bool en) -{ - isp_rawhstbig_enable(params_vdev, en, 0); -} - -static void -isp_rawhstbig2_config(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawhistbig_cfg *arg) +isp_rawhst1_config(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawhistbig_cfg *arg) { isp_rawhstbig_config(params_vdev, arg, 1); } static void -isp_rawhstbig2_enable(struct rkisp_isp_params_vdev *params_vdev, - bool en) +isp_rawhst1_enable(struct rkisp_isp_params_vdev *params_vdev, + bool en) { isp_rawhstbig_enable(params_vdev, en, 1); } static void -isp_rawhstbig3_config(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawhistbig_cfg *arg) +isp_rawhst2_config(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawhistbig_cfg *arg) { isp_rawhstbig_config(params_vdev, arg, 2); } static void -isp_rawhstbig3_enable(struct rkisp_isp_params_vdev *params_vdev, - bool en) +isp_rawhst2_enable(struct rkisp_isp_params_vdev *params_vdev, + bool en) { isp_rawhstbig_enable(params_vdev, en, 2); } +static void +isp_rawhst3_config(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawhistbig_cfg *arg) +{ + isp_rawhstbig_config(params_vdev, arg, 0); +} + +static void +isp_rawhst3_enable(struct rkisp_isp_params_vdev *params_vdev, + bool en) +{ + isp_rawhstbig_enable(params_vdev, en, 0); +} + static void isp_hdrmge_config(struct rkisp_isp_params_vdev *params_vdev, const struct isp2x_hdrmge_cfg *arg) @@ -3470,24 +3470,24 @@ struct rkisp_isp_params_v2x_ops rkisp_v2x_isp_params_ops = { .iesharp_enable = isp_iesharp_enable, .rawaf_config = isp_rawaf_config, .rawaf_enable = isp_rawaf_enable, - .rawaelite_config = isp_rawaelite_config, - .rawaelite_enable = isp_rawaelite_enable, - .rawaebig1_config = isp_rawaebig1_config, - .rawaebig1_enable = isp_rawaebig1_enable, - .rawaebig2_config = isp_rawaebig2_config, - .rawaebig2_enable = isp_rawaebig2_enable, - .rawaebig3_config = isp_rawaebig3_config, - .rawaebig3_enable = isp_rawaebig3_enable, + .rawae0_config = isp_rawaelite_config, + .rawae0_enable = isp_rawaelite_enable, + .rawae1_config = isp_rawae1_config, + .rawae1_enable = isp_rawae1_enable, + .rawae2_config = isp_rawae2_config, + .rawae2_enable = isp_rawae2_enable, + .rawae3_config = isp_rawae3_config, + .rawae3_enable = isp_rawae3_enable, .rawawb_config = isp_rawawb_config, .rawawb_enable = isp_rawawb_enable, - .rawhstlite_config = isp_rawhstlite_config, - .rawhstlite_enable = isp_rawhstlite_enable, - .rawhstbig1_config = isp_rawhstbig1_config, - .rawhstbig1_enable = isp_rawhstbig1_enable, - .rawhstbig2_config = isp_rawhstbig2_config, - .rawhstbig2_enable = isp_rawhstbig2_enable, - .rawhstbig3_config = isp_rawhstbig3_config, - .rawhstbig3_enable = isp_rawhstbig3_enable, + .rawhst0_config = isp_rawhstlite_config, + .rawhst0_enable = isp_rawhstlite_enable, + .rawhst1_config = isp_rawhst1_config, + .rawhst1_enable = isp_rawhst1_enable, + .rawhst2_config = isp_rawhst2_config, + .rawhst2_enable = isp_rawhst2_enable, + .rawhst3_config = isp_rawhst3_config, + .rawhst3_enable = isp_rawhst3_enable, .hdrmge_config = isp_hdrmge_config, .hdrmge_enable = isp_hdrmge_enable, .rawnr_config = isp_rawnr_config, @@ -3763,48 +3763,48 @@ void __isp_isr_meas_config(struct rkisp_isp_params_vdev *params_vdev, !!(module_ens & ISP2X_MODULE_YUVAE)); } - if ((module_en_update & ISP2X_MODULE_RAWAE_LITE) || - (module_cfg_update & ISP2X_MODULE_RAWAE_LITE)) { - if ((module_cfg_update & ISP2X_MODULE_RAWAE_LITE)) - ops->rawaelite_config(params_vdev, - &new_params->meas.rawaelite); + if ((module_en_update & ISP2X_MODULE_RAWAE0) || + (module_cfg_update & ISP2X_MODULE_RAWAE0)) { + if ((module_cfg_update & ISP2X_MODULE_RAWAE0)) + ops->rawae0_config(params_vdev, + &new_params->meas.rawae0); - if (module_en_update & ISP2X_MODULE_RAWAE_LITE) - ops->rawaelite_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWAE_LITE)); + if (module_en_update & ISP2X_MODULE_RAWAE0) + ops->rawae0_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWAE0)); } - if ((module_en_update & ISP2X_MODULE_RAWAE_BIG1) || - (module_cfg_update & ISP2X_MODULE_RAWAE_BIG1)) { - if ((module_cfg_update & ISP2X_MODULE_RAWAE_BIG1)) - ops->rawaebig1_config(params_vdev, - &new_params->meas.rawaebig1); + if ((module_en_update & ISP2X_MODULE_RAWAE1) || + (module_cfg_update & ISP2X_MODULE_RAWAE1)) { + if ((module_cfg_update & ISP2X_MODULE_RAWAE1)) + ops->rawae1_config(params_vdev, + &new_params->meas.rawae1); - if (module_en_update & ISP2X_MODULE_RAWAE_BIG1) - ops->rawaebig1_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWAE_BIG1)); + if (module_en_update & ISP2X_MODULE_RAWAE1) + ops->rawae1_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWAE1)); } - if ((module_en_update & ISP2X_MODULE_RAWAE_BIG2) || - (module_cfg_update & ISP2X_MODULE_RAWAE_BIG2)) { - if ((module_cfg_update & ISP2X_MODULE_RAWAE_BIG2)) - ops->rawaebig2_config(params_vdev, - &new_params->meas.rawaebig2); + if ((module_en_update & ISP2X_MODULE_RAWAE2) || + (module_cfg_update & ISP2X_MODULE_RAWAE2)) { + if ((module_cfg_update & ISP2X_MODULE_RAWAE2)) + ops->rawae2_config(params_vdev, + &new_params->meas.rawae2); - if (module_en_update & ISP2X_MODULE_RAWAE_BIG2) - ops->rawaebig2_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWAE_BIG2)); + if (module_en_update & ISP2X_MODULE_RAWAE2) + ops->rawae2_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWAE2)); } - if ((module_en_update & ISP2X_MODULE_RAWAE_BIG3) || - (module_cfg_update & ISP2X_MODULE_RAWAE_BIG3)) { - if ((module_cfg_update & ISP2X_MODULE_RAWAE_BIG3)) - ops->rawaebig3_config(params_vdev, - &new_params->meas.rawaebig3); + if ((module_en_update & ISP2X_MODULE_RAWAE3) || + (module_cfg_update & ISP2X_MODULE_RAWAE3)) { + if ((module_cfg_update & ISP2X_MODULE_RAWAE3)) + ops->rawae3_config(params_vdev, + &new_params->meas.rawae3); - if (module_en_update & ISP2X_MODULE_RAWAE_BIG3) - ops->rawaebig3_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWAE_BIG3)); + if (module_en_update & ISP2X_MODULE_RAWAE3) + ops->rawae3_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWAE3)); } if ((module_en_update & ISP2X_MODULE_SIHST) || @@ -3818,48 +3818,48 @@ void __isp_isr_meas_config(struct rkisp_isp_params_vdev *params_vdev, !!(module_ens & ISP2X_MODULE_SIHST)); } - if ((module_en_update & ISP2X_MODULE_RAWHIST_LITE) || - (module_cfg_update & ISP2X_MODULE_RAWHIST_LITE)) { - if ((module_cfg_update & ISP2X_MODULE_RAWHIST_LITE)) - ops->rawhstlite_config(params_vdev, - &new_params->meas.rawhstlite); + if ((module_en_update & ISP2X_MODULE_RAWHIST0) || + (module_cfg_update & ISP2X_MODULE_RAWHIST0)) { + if ((module_cfg_update & ISP2X_MODULE_RAWHIST0)) + ops->rawhst0_config(params_vdev, + &new_params->meas.rawhist0); - if (module_en_update & ISP2X_MODULE_RAWHIST_LITE) - ops->rawhstlite_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWHIST_LITE)); + if (module_en_update & ISP2X_MODULE_RAWHIST0) + ops->rawhst0_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWHIST0)); } - if ((module_en_update & ISP2X_MODULE_RAWHIST_BIG1) || - (module_cfg_update & ISP2X_MODULE_RAWHIST_BIG1)) { - if ((module_cfg_update & ISP2X_MODULE_RAWHIST_BIG1)) - ops->rawhstbig1_config(params_vdev, - &new_params->meas.rawhstbig1); + if ((module_en_update & ISP2X_MODULE_RAWHIST1) || + (module_cfg_update & ISP2X_MODULE_RAWHIST1)) { + if ((module_cfg_update & ISP2X_MODULE_RAWHIST1)) + ops->rawhst1_config(params_vdev, + &new_params->meas.rawhist1); - if (module_en_update & ISP2X_MODULE_RAWHIST_BIG1) - ops->rawhstbig1_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWHIST_BIG1)); + if (module_en_update & ISP2X_MODULE_RAWHIST1) + ops->rawhst1_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWHIST1)); } - if ((module_en_update & ISP2X_MODULE_RAWHIST_BIG2) || - (module_cfg_update & ISP2X_MODULE_RAWHIST_BIG2)) { - if ((module_cfg_update & ISP2X_MODULE_RAWHIST_BIG2)) - ops->rawhstbig2_config(params_vdev, - &new_params->meas.rawhstbig2); + if ((module_en_update & ISP2X_MODULE_RAWHIST2) || + (module_cfg_update & ISP2X_MODULE_RAWHIST2)) { + if ((module_cfg_update & ISP2X_MODULE_RAWHIST2)) + ops->rawhst2_config(params_vdev, + &new_params->meas.rawhist2); - if (module_en_update & ISP2X_MODULE_RAWHIST_BIG2) - ops->rawhstbig2_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWHIST_BIG2)); + if (module_en_update & ISP2X_MODULE_RAWHIST2) + ops->rawhst2_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWHIST2)); } - if ((module_en_update & ISP2X_MODULE_RAWHIST_BIG3) || - (module_cfg_update & ISP2X_MODULE_RAWHIST_BIG3)) { - if ((module_cfg_update & ISP2X_MODULE_RAWHIST_BIG3)) - ops->rawhstbig3_config(params_vdev, - &new_params->meas.rawhstbig3); + if ((module_en_update & ISP2X_MODULE_RAWHIST3) || + (module_cfg_update & ISP2X_MODULE_RAWHIST3)) { + if ((module_cfg_update & ISP2X_MODULE_RAWHIST3)) + ops->rawhst3_config(params_vdev, + &new_params->meas.rawhist3); - if (module_en_update & ISP2X_MODULE_RAWHIST_BIG3) - ops->rawhstbig3_enable(params_vdev, - !!(module_ens & ISP2X_MODULE_RAWHIST_BIG3)); + if (module_en_update & ISP2X_MODULE_RAWHIST3) + ops->rawhst3_enable(params_vdev, + !!(module_ens & ISP2X_MODULE_RAWHIST3)); } if ((module_en_update & ISP2X_MODULE_SIAWB) || @@ -4024,15 +4024,15 @@ rkisp_params_disable_isp_v2x(struct rkisp_isp_params_vdev *params_vdev) ops->wdr_enable(params_vdev, false); ops->iesharp_enable(params_vdev, false); ops->rawaf_enable(params_vdev, false); - ops->rawaelite_enable(params_vdev, false); - ops->rawaebig1_enable(params_vdev, false); - ops->rawaebig2_enable(params_vdev, false); - ops->rawaebig3_enable(params_vdev, false); + ops->rawae0_enable(params_vdev, false); + ops->rawae1_enable(params_vdev, false); + ops->rawae2_enable(params_vdev, false); + ops->rawae3_enable(params_vdev, false); ops->rawawb_enable(params_vdev, false); - ops->rawhstlite_enable(params_vdev, false); - ops->rawhstbig1_enable(params_vdev, false); - ops->rawhstbig2_enable(params_vdev, false); - ops->rawhstbig3_enable(params_vdev, false); + ops->rawhst0_enable(params_vdev, false); + ops->rawhst1_enable(params_vdev, false); + ops->rawhst2_enable(params_vdev, false); + ops->rawhst3_enable(params_vdev, false); ops->hdrmge_enable(params_vdev, false); ops->rawnr_enable(params_vdev, false); ops->hdrtmo_enable(params_vdev, false); diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.h b/drivers/media/platform/rockchip/isp/isp_params_v2x.h index 534028c99cbd..549657b6d699 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v2x.h +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h @@ -248,42 +248,42 @@ struct rkisp_isp_params_v2x_ops { const struct isp2x_rawaf_meas_cfg *arg); void (*rawaf_enable)(struct rkisp_isp_params_vdev *params_vdev, bool en); - void (*rawaelite_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawaelite_meas_cfg *arg); - void (*rawaelite_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); - void (*rawaebig1_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawaebig_meas_cfg *arg); - void (*rawaebig1_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); - void (*rawaebig2_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawaebig_meas_cfg *arg); - void (*rawaebig2_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); - void (*rawaebig3_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawaebig_meas_cfg *arg); - void (*rawaebig3_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); + void (*rawae0_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawaelite_meas_cfg *arg); + void (*rawae0_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); + void (*rawae1_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawaebig_meas_cfg *arg); + void (*rawae1_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); + void (*rawae2_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawaebig_meas_cfg *arg); + void (*rawae2_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); + void (*rawae3_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawaebig_meas_cfg *arg); + void (*rawae3_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); void (*rawawb_config)(struct rkisp_isp_params_vdev *params_vdev, const struct isp2x_rawawb_meas_cfg *arg); void (*rawawb_enable)(struct rkisp_isp_params_vdev *params_vdev, bool en); - void (*rawhstlite_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawhistlite_cfg *arg); - void (*rawhstlite_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); - void (*rawhstbig1_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawhistbig_cfg *arg); - void (*rawhstbig1_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); - void (*rawhstbig2_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawhistbig_cfg *arg); - void (*rawhstbig2_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); - void (*rawhstbig3_config)(struct rkisp_isp_params_vdev *params_vdev, - const struct isp2x_rawhistbig_cfg *arg); - void (*rawhstbig3_enable)(struct rkisp_isp_params_vdev *params_vdev, - bool en); + void (*rawhst0_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawhistlite_cfg *arg); + void (*rawhst0_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); + void (*rawhst1_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawhistbig_cfg *arg); + void (*rawhst1_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); + void (*rawhst2_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawhistbig_cfg *arg); + void (*rawhst2_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); + void (*rawhst3_config)(struct rkisp_isp_params_vdev *params_vdev, + const struct isp2x_rawhistbig_cfg *arg); + void (*rawhst3_enable)(struct rkisp_isp_params_vdev *params_vdev, + bool en); void (*hdrmge_config)(struct rkisp_isp_params_vdev *params_vdev, const struct isp2x_hdrmge_cfg *arg); void (*hdrmge_enable)(struct rkisp_isp_params_vdev *params_vdev, diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.c b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c index 5f6de8530456..ab06c8513852 100644 --- a/drivers/media/platform/rockchip/isp/isp_stats_v2x.c +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c @@ -367,63 +367,63 @@ out: } static void -rkisp_stats_get_rawaebig1_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) -{ - if (!pbuf) - rkisp_stats_get_rawaebig_meas_reg(stats_vdev, NULL, 0); - else - rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawaebig1, 0); -} - -static void -rkisp_stats_get_rawhstbig1_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) -{ - if (!pbuf) - rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, NULL, 0); - else - rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhistbig1, 0); -} - -static void -rkisp_stats_get_rawaebig2_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawae1_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawaebig_meas_reg(stats_vdev, NULL, 1); else - rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawaebig2, 1); + rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae1, 1); } static void -rkisp_stats_get_rawhstbig2_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawhst1_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, NULL, 1); else - rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhistbig2, 1); + rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist1, 1); } static void -rkisp_stats_get_rawaebig3_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawae2_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawaebig_meas_reg(stats_vdev, NULL, 2); else - rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawaebig3, 2); + rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae2, 2); } static void -rkisp_stats_get_rawhstbig3_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawhst2_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, NULL, 2); else - rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhistbig3, 2); + rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist2, 2); +} + +static void +rkisp_stats_get_rawae3_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) +{ + if (!pbuf) + rkisp_stats_get_rawaebig_meas_reg(stats_vdev, NULL, 0); + else + rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae3, 0); +} + +static void +rkisp_stats_get_rawhst3_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) +{ + if (!pbuf) + rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, NULL, 0); + else + rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist3, 0); } static void @@ -438,7 +438,7 @@ rkisp_stats_get_rawaelite_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, if (!pbuf) goto out; - ae = &pbuf->params.rawaelite; + ae = &pbuf->params.rawae0; value = readl(addr + ISP_RAWAE_LITE_CTRL); if ((value & ISP2X_3A_MEAS_DONE) == 0) @@ -469,7 +469,7 @@ rkisp_stats_get_rawhstlite_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev, if (!pbuf) goto out; - hst = &pbuf->params.rawhistlite; + hst = &pbuf->params.rawhist0; for (i = 0; i < ISP2X_HIST_BIN_N_MAX; i++) hst->hist_bin[i] = readl(addr + ISP_RAWHIST_LITE_RO_BASE_BIN); @@ -481,7 +481,7 @@ out: static void rkisp_stats_get_bls_stats(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) + struct rkisp_isp2x_stat_buffer *pbuf) { void __iomem *addr = stats_vdev->dev->base_addr; struct ispsd_in_fmt in_fmt = stats_vdev->dev->isp_sdev.in_fmt; @@ -625,14 +625,14 @@ static struct rkisp_stats_v2x_ops __maybe_unused rkisp_stats_reg_ops_v2x = { .get_rawaf_meas = rkisp_stats_get_rawaf_meas_reg, .get_yuvae_meas = rkisp_stats_get_yuvae_meas_reg, .get_sihst_meas = rkisp_stats_get_sihst_meas_reg, - .get_rawaebig1_meas = rkisp_stats_get_rawaebig1_meas_reg, - .get_rawhstbig1_meas = rkisp_stats_get_rawhstbig1_meas_reg, - .get_rawaebig2_meas = rkisp_stats_get_rawaebig2_meas_reg, - .get_rawhstbig2_meas = rkisp_stats_get_rawhstbig2_meas_reg, - .get_rawaebig3_meas = rkisp_stats_get_rawaebig3_meas_reg, - .get_rawhstbig3_meas = rkisp_stats_get_rawhstbig3_meas_reg, - .get_rawaelite_meas = rkisp_stats_get_rawaelite_meas_reg, - .get_rawhstlite_meas = rkisp_stats_get_rawhstlite_meas_reg, + .get_rawae0_meas = rkisp_stats_get_rawaelite_meas_reg, + .get_rawhst0_meas = rkisp_stats_get_rawhstlite_meas_reg, + .get_rawae1_meas = rkisp_stats_get_rawae1_meas_reg, + .get_rawhst1_meas = rkisp_stats_get_rawhst1_meas_reg, + .get_rawae2_meas = rkisp_stats_get_rawae2_meas_reg, + .get_rawhst2_meas = rkisp_stats_get_rawhst2_meas_reg, + .get_rawae3_meas = rkisp_stats_get_rawae3_meas_reg, + .get_rawhst3_meas = rkisp_stats_get_rawhst3_meas_reg, .get_bls_stats = rkisp_stats_get_bls_stats, .get_tmo_stats = rkisp_stats_get_tmo_stats, .get_dhaz_stats = rkisp_stats_get_dhaz_stats, @@ -983,63 +983,63 @@ OUT: } static void -rkisp_stats_get_rawaebig1_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) -{ - if (!pbuf) - rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, NULL, 0); - else - rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawaebig1, 0); -} - -static void -rkisp_stats_get_rawhstbig1_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) -{ - if (!pbuf) - rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, NULL, 0); - else - rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhistbig1, 0); -} - -static void -rkisp_stats_get_rawaebig2_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawae1_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, NULL, 1); else - rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawaebig2, 1); + rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae1, 1); } static void -rkisp_stats_get_rawhstbig2_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawhst1_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, NULL, 1); else - rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhistbig2, 1); + rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist1, 1); } static void -rkisp_stats_get_rawaebig3_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawae2_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, NULL, 2); else - rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawaebig3, 2); + rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae2, 2); } static void -rkisp_stats_get_rawhstbig3_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf) +rkisp_stats_get_rawhst2_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) { if (!pbuf) rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, NULL, 2); else - rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhistbig3, 2); + rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist2, 2); +} + +static void +rkisp_stats_get_rawae3_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) +{ + if (!pbuf) + rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, NULL, 0); + else + rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae3, 0); +} + +static void +rkisp_stats_get_rawhst3_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf) +{ + if (!pbuf) + rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, NULL, 0); + else + rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist3, 0); } static void @@ -1055,7 +1055,7 @@ rkisp_stats_get_rawaelite_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, if (!pbuf) goto OUT; - ae = &pbuf->params.rawaelite; + ae = &pbuf->params.rawae0; value = readl(addr + ISP_RAWAE_LITE_CTRL); if ((value & ISP2X_3A_MEAS_DONE) == 0) return; @@ -1088,7 +1088,7 @@ rkisp_stats_get_rawhstlite_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev, if (!pbuf) goto OUT; - hst = &pbuf->params.rawhistlite; + hst = &pbuf->params.rawhist0; rd_buf_idx = stats_vdev->rd_buf_idx; ddr_addr = stats_vdev->stats_buf[rd_buf_idx].vaddr + 0x0C00 + 0x0400; @@ -1109,14 +1109,14 @@ static struct rkisp_stats_v2x_ops __maybe_unused rkisp_stats_ddr_ops_v2x = { .get_rawaf_meas = rkisp_stats_get_rawaf_meas_ddr, .get_yuvae_meas = rkisp_stats_get_yuvae_meas_ddr, .get_sihst_meas = rkisp_stats_get_sihst_meas_ddr, - .get_rawaebig1_meas = rkisp_stats_get_rawaebig1_meas_ddr, - .get_rawhstbig1_meas = rkisp_stats_get_rawhstbig1_meas_ddr, - .get_rawaebig2_meas = rkisp_stats_get_rawaebig2_meas_ddr, - .get_rawhstbig2_meas = rkisp_stats_get_rawhstbig2_meas_ddr, - .get_rawaebig3_meas = rkisp_stats_get_rawaebig3_meas_ddr, - .get_rawhstbig3_meas = rkisp_stats_get_rawhstbig3_meas_ddr, - .get_rawaelite_meas = rkisp_stats_get_rawaelite_meas_ddr, - .get_rawhstlite_meas = rkisp_stats_get_rawhstlite_meas_ddr, + .get_rawae0_meas = rkisp_stats_get_rawaelite_meas_ddr, + .get_rawhst0_meas = rkisp_stats_get_rawhstlite_meas_ddr, + .get_rawae1_meas = rkisp_stats_get_rawae1_meas_ddr, + .get_rawhst1_meas = rkisp_stats_get_rawhst1_meas_ddr, + .get_rawae2_meas = rkisp_stats_get_rawae2_meas_ddr, + .get_rawhst2_meas = rkisp_stats_get_rawhst2_meas_ddr, + .get_rawae3_meas = rkisp_stats_get_rawae3_meas_ddr, + .get_rawhst3_meas = rkisp_stats_get_rawhst3_meas_ddr, .get_bls_stats = rkisp_stats_get_bls_stats, .get_tmo_stats = rkisp_stats_get_tmo_stats, .get_dhaz_stats = rkisp_stats_get_dhaz_stats, @@ -1209,51 +1209,51 @@ rkisp_stats_send_meas_v2x(struct rkisp_isp_stats_vdev *stats_vdev, "ISP2X_3A_RAWAF_LUM\n"); if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_BIG) { - ops->get_rawaebig1_meas(stats_vdev, cur_stat_buf); + ops->get_rawae3_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWAEBIG; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE3; } if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_BIG) { - ops->get_rawhstbig1_meas(stats_vdev, cur_stat_buf); + ops->get_rawhst3_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWHSTBIG; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST3; } if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH0) { - ops->get_rawaelite_meas(stats_vdev, cur_stat_buf); + ops->get_rawae0_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWAECH0; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE0; } if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH1) { - ops->get_rawaebig2_meas(stats_vdev, cur_stat_buf); + ops->get_rawae1_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWAECH1; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE1; } if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH2) { - ops->get_rawaebig3_meas(stats_vdev, cur_stat_buf); + ops->get_rawae2_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWAECH2; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE2; } if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH0) { - ops->get_rawhstlite_meas(stats_vdev, cur_stat_buf); + ops->get_rawhst0_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWHSTCH0; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST0; } if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH1) { - ops->get_rawhstbig2_meas(stats_vdev, cur_stat_buf); + ops->get_rawhst1_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWHSTCH1; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST1; } if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH2) { - ops->get_rawhstbig3_meas(stats_vdev, cur_stat_buf); + ops->get_rawhst2_meas(stats_vdev, cur_stat_buf); if (cur_stat_buf) - cur_stat_buf->meas_type |= ISP2X_STAT_RAWHSTCH2; + cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST2; } if (meas_work->isp_ris & ISP2X_FRAME) { @@ -1297,28 +1297,28 @@ rkisp_stats_clr_3a_isr(struct rkisp_isp_stats_vdev *stats_vdev, ops->get_rawaf_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWAE_BIG) - ops->get_rawaebig1_meas(stats_vdev, NULL); + ops->get_rawae3_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWHIST_BIG) - ops->get_rawhstbig1_meas(stats_vdev, NULL); + ops->get_rawhst3_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWAE_CH0) - ops->get_rawaelite_meas(stats_vdev, NULL); + ops->get_rawae0_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWAE_CH1) - ops->get_rawaebig2_meas(stats_vdev, NULL); + ops->get_rawae1_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWAE_CH2) - ops->get_rawaebig3_meas(stats_vdev, NULL); + ops->get_rawae2_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWHIST_CH0) - ops->get_rawhstlite_meas(stats_vdev, NULL); + ops->get_rawhst0_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWHIST_CH1) - ops->get_rawhstbig2_meas(stats_vdev, NULL); + ops->get_rawhst1_meas(stats_vdev, NULL); if (isp3a_ris & ISP2X_3A_RAWHIST_CH2) - ops->get_rawhstbig3_meas(stats_vdev, NULL); + ops->get_rawhst2_meas(stats_vdev, NULL); } static void diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h index 06c826846cd1..7efe9d15fc0a 100644 --- a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h @@ -29,25 +29,25 @@ struct rkisp_stats_v2x_ops { void (*get_sihst_meas)(struct rkisp_isp_stats_vdev *stats_vdev, struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawaebig1_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawhstbig1_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawae0_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawhst0_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawaebig2_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawhstbig2_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawae1_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawhst1_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawaebig3_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawhstbig3_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawae2_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawhst2_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawaelite_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); - void (*get_rawhstlite_meas)(struct rkisp_isp_stats_vdev *stats_vdev, - struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawae3_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); + void (*get_rawhst3_meas)(struct rkisp_isp_stats_vdev *stats_vdev, + struct rkisp_isp2x_stat_buffer *pbuf); void (*get_bls_stats)(struct rkisp_isp_stats_vdev *stats_vdev, struct rkisp_isp2x_stat_buffer *pbuf); diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index bcdbbd05b9f7..2c254c622aa2 100644 --- a/include/uapi/linux/rkisp2-config.h +++ b/include/uapi/linux/rkisp2-config.h @@ -33,15 +33,15 @@ #define ISP2X_MODULE_WDR BIT_ULL(15) #define ISP2X_MODULE_RK_IESHARP BIT_ULL(16) #define ISP2X_MODULE_RAWAF BIT_ULL(17) -#define ISP2X_MODULE_RAWAE_LITE BIT_ULL(18) -#define ISP2X_MODULE_RAWAE_BIG1 BIT_ULL(19) -#define ISP2X_MODULE_RAWAE_BIG2 BIT_ULL(20) -#define ISP2X_MODULE_RAWAE_BIG3 BIT_ULL(21) +#define ISP2X_MODULE_RAWAE0 BIT_ULL(18) +#define ISP2X_MODULE_RAWAE1 BIT_ULL(19) +#define ISP2X_MODULE_RAWAE2 BIT_ULL(20) +#define ISP2X_MODULE_RAWAE3 BIT_ULL(21) #define ISP2X_MODULE_RAWAWB BIT_ULL(22) -#define ISP2X_MODULE_RAWHIST_LITE BIT_ULL(23) -#define ISP2X_MODULE_RAWHIST_BIG1 BIT_ULL(24) -#define ISP2X_MODULE_RAWHIST_BIG2 BIT_ULL(25) -#define ISP2X_MODULE_RAWHIST_BIG3 BIT_ULL(26) +#define ISP2X_MODULE_RAWHIST0 BIT_ULL(23) +#define ISP2X_MODULE_RAWHIST1 BIT_ULL(24) +#define ISP2X_MODULE_RAWHIST2 BIT_ULL(25) +#define ISP2X_MODULE_RAWHIST3 BIT_ULL(26) #define ISP2X_MODULE_HDRMGE BIT_ULL(27) #define ISP2X_MODULE_RAWNR BIT_ULL(28) #define ISP2X_MODULE_HDRTMO BIT_ULL(29) @@ -62,14 +62,14 @@ #define ISP2X_STAT_EMB_DATA BIT(4) #define ISP2X_STAT_RAWAWB BIT(5) #define ISP2X_STAT_RAWAF BIT(6) -#define ISP2X_STAT_RAWAEBIG BIT(7) -#define ISP2X_STAT_RAWHSTBIG BIT(8) -#define ISP2X_STAT_RAWAECH0 BIT(9) -#define ISP2X_STAT_RAWAECH1 BIT(10) -#define ISP2X_STAT_RAWAECH2 BIT(11) -#define ISP2X_STAT_RAWHSTCH0 BIT(12) -#define ISP2X_STAT_RAWHSTCH1 BIT(13) -#define ISP2X_STAT_RAWHSTCH2 BIT(14) +#define ISP2X_STAT_RAWAE0 BIT(7) +#define ISP2X_STAT_RAWAE1 BIT(8) +#define ISP2X_STAT_RAWAE2 BIT(9) +#define ISP2X_STAT_RAWAE3 BIT(10) +#define ISP2X_STAT_RAWHST0 BIT(11) +#define ISP2X_STAT_RAWHST1 BIT(12) +#define ISP2X_STAT_RAWHST2 BIT(13) +#define ISP2X_STAT_RAWHST3 BIT(14) #define ISP2X_STAT_BLS BIT(15) #define ISP2X_STAT_HDRTMO BIT(16) #define ISP2X_STAT_DHAZ BIT(17) @@ -1359,17 +1359,17 @@ struct isp2x_isp_other_cfg { struct isp2x_isp_meas_cfg { struct isp2x_siawb_meas_cfg siawb; struct isp2x_rawawb_meas_cfg rawawb; - struct isp2x_rawaebig_meas_cfg rawaebig1; - struct isp2x_rawaebig_meas_cfg rawaebig2; - struct isp2x_rawaebig_meas_cfg rawaebig3; - struct isp2x_rawaelite_meas_cfg rawaelite; + struct isp2x_rawaelite_meas_cfg rawae0; + struct isp2x_rawaebig_meas_cfg rawae1; + struct isp2x_rawaebig_meas_cfg rawae2; + struct isp2x_rawaebig_meas_cfg rawae3; struct isp2x_yuvae_meas_cfg yuvae; struct isp2x_rawaf_meas_cfg rawaf; struct isp2x_siaf_cfg siaf; - struct isp2x_rawhistbig_cfg rawhstbig1; - struct isp2x_rawhistbig_cfg rawhstbig2; - struct isp2x_rawhistbig_cfg rawhstbig3; - struct isp2x_rawhistlite_cfg rawhstlite; + struct isp2x_rawhistlite_cfg rawhist0; + struct isp2x_rawhistbig_cfg rawhist1; + struct isp2x_rawhistbig_cfg rawhist2; + struct isp2x_rawhistbig_cfg rawhist3; struct isp2x_sihst_cfg sihst; } __attribute__ ((packed)); @@ -1489,17 +1489,17 @@ struct isp2x_sihst_stat { struct isp2x_stat { struct isp2x_siawb_stat siawb; struct isp2x_rawawb_meas_stat rawawb; - struct isp2x_rawaebig_stat rawaebig1; - struct isp2x_rawaebig_stat rawaebig2; - struct isp2x_rawaebig_stat rawaebig3; - struct isp2x_rawaelite_stat rawaelite; + struct isp2x_rawaelite_stat rawae0; + struct isp2x_rawaebig_stat rawae1; + struct isp2x_rawaebig_stat rawae2; + struct isp2x_rawaebig_stat rawae3; struct isp2x_yuvae_stat yuvae; struct isp2x_rawaf_stat rawaf; struct isp2x_siaf_stat siaf; - struct isp2x_rawhistbig_stat rawhistbig1; - struct isp2x_rawhistbig_stat rawhistbig2; - struct isp2x_rawhistbig_stat rawhistbig3; - struct isp2x_rawhistlite_stat rawhistlite; + struct isp2x_rawhistlite_stat rawhist0; + struct isp2x_rawhistbig_stat rawhist1; + struct isp2x_rawhistbig_stat rawhist2; + struct isp2x_rawhistbig_stat rawhist3; struct isp2x_sihst_stat sihst; struct isp2x_bls_stat bls;