media: mali-c55: Fix Iridix bypass macros

The Mali C55 Iridix block has a digital gain function and tone mapping
function, whose enablement is controlled by two different bits
in the BYPASS_3 register.

Unfortunately, the "Gain" and "Tonemap" bypass bit definitions are the
wrong way around. Swap them.

Cc: stable@vger.kernel.org
Fixes: d5f281f3dd29 ("media: mali-c55: Add Mali-C55 ISP driver")
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-registers.h b/drivers/media/platform/arm/mali-c55/mali-c55-registers.h
index f5a148add1c811f8dc49170db67d151bd54a4307..f098effde7b49727922982426f7a8413b139422f 100644 (file)
--- a/drivers/media/platform/arm/mali-c55/mali-c55-registers.h
+++ b/drivers/media/platform/arm/mali-c55/mali-c55-registers.h
@@ -128,8 +128,8 @@ enum mali_c55_interrupts {
 #define MALI_C55_REG_BYPASS_3_SENSOR_OFFSET_PRE_SH     BIT(1)
 #define MALI_C55_REG_BYPASS_3_MESH_SHADING             BIT(3)
 #define MALI_C55_REG_BYPASS_3_WHITE_BALANCE            BIT(4)
-#define MALI_C55_REG_BYPASS_3_IRIDIX                   BIT(5)
-#define MALI_C55_REG_BYPASS_3_IRIDIX_GAIN              BIT(6)
+#define MALI_C55_REG_BYPASS_3_IRIDIX_GAIN              BIT(5)
+#define MALI_C55_REG_BYPASS_3_IRIDIX                   BIT(6)
 #define MALI_C55_REG_BYPASS_4                          0x18ec0
 #define MALI_C55_REG_BYPASS_4_DEMOSAIC_RGB             BIT(1)
 #define MALI_C55_REG_BYPASS_4_PF_CORRECTION            BIT(3)