staging: bcm2835-camera: Activate V4L2_EXPOSURE_METERING_MATRIX handling

I don't see any reason to keep this TODO, so activate the
V4L2_EXPOSURE_METERING_MATRIX handling.

Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1585485901-10172-3-git-send-email-stefan.wahren@i2se.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
index 5137fcf203d655c626e90dd65ae682d3c105bb5d..1d0caf4181fdb36cbf92960c60036075e07e165d 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
@@ -377,11 +377,9 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
                dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_SPOT;
                break;
 
-       /* todo matrix weighting not added to Linux API till 3.9
-        * case V4L2_EXPOSURE_METERING_MATRIX:
-        *      dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;
-        *      break;
-        */
+       case V4L2_EXPOSURE_METERING_MATRIX:
+               dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;
+               break;
        }
 
        if (dev->scene_mode == V4L2_SCENE_MODE_NONE) {
@@ -1045,8 +1043,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        {
                .id = V4L2_CID_EXPOSURE_METERING,
                .type = MMAL_CONTROL_TYPE_STD_MENU,
-               .min = ~0x7,
-               .max = V4L2_EXPOSURE_METERING_SPOT,
+               .min = ~0xf,
+               .max = V4L2_EXPOSURE_METERING_MATRIX,
                .def = V4L2_EXPOSURE_METERING_AVERAGE,
                .step = 0,
                .imenu = NULL,