1. Patchew
  2. linux
  3. View series

[PATCH] media: atomisp: i2c: Remove unused macro definitions

WangYuli posted 1 patch 1 year ago 
drivers/staging/media/atomisp/i2c/mt9m114.h | 105 +-------------------
1 file changed, 3 insertions(+), 102 deletions(-)
[PATCH] media: atomisp: i2c: Remove unused macro definitions
Posted by WangYuli 1 year ago 
Delete obsolete macro definitions that are no longer in use in
mt9m114.h to improve code readability and maintainability.

Signed-off-by: WangYuli <wangyuli@uniontech.com>
---
 drivers/staging/media/atomisp/i2c/mt9m114.h | 105 +-------------------
 1 file changed, 3 insertions(+), 102 deletions(-)

diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.h b/drivers/staging/media/atomisp/i2c/mt9m114.h
index 97820db90827..9c4b85bea765 100644
--- a/drivers/staging/media/atomisp/i2c/mt9m114.h
+++ b/drivers/staging/media/atomisp/i2c/mt9m114.h
@@ -22,29 +22,15 @@
 #include "../include/linux/atomisp_platform.h"
 #include "../include/linux/atomisp.h"
 
-#define V4L2_IDENT_MT9M114 8245
-
-#define MT9P111_REV3
-#define FULLINISUPPORT
-
 /* #defines for register writes and register array processing */
 #define MISENSOR_8BIT		1
 #define MISENSOR_16BIT		2
 #define MISENSOR_32BIT		4
 
-#define MISENSOR_FWBURST0	0x80
-#define MISENSOR_FWBURST1	0x81
-#define MISENSOR_FWBURST4	0x84
-#define MISENSOR_FWBURST	0x88
-
 #define MISENSOR_TOK_TERM	0xf000	/* terminating token for reg list */
 #define MISENSOR_TOK_DELAY	0xfe00	/* delay token for reg list */
-#define MISENSOR_TOK_FWLOAD	0xfd00	/* token indicating load FW */
-#define MISENSOR_TOK_POLL	0xfc00	/* token indicating poll instruction */
 #define MISENSOR_TOK_RMW	0x0010  /* RMW operation */
 #define MISENSOR_TOK_MASK	0xfff0
-#define MISENSOR_AWB_STEADY	BIT(0)	/* awb steady */
-#define MISENSOR_AE_READY	BIT(3)	/* ae status ready */
 
 /* mask to set sensor read_mode via misensor_rmw_reg */
 #define MISENSOR_R_MODE_MASK	0x0330
@@ -55,99 +41,32 @@
 #define MISENSOR_FLIP_DIS	0
 
 /* bits set to set sensor read_mode via misensor_rmw_reg */
-#define MISENSOR_SKIPPING_SET	0x0011
-#define MISENSOR_SUMMING_SET	0x0033
 #define MISENSOR_NORMAL_SET	0x0000
 
 /* sensor register that control sensor read-mode and mirror */
 #define MISENSOR_READ_MODE	0xC834
-/* sensor ae-track status register */
-#define MISENSOR_AE_TRACK_STATUS	0xA800
-/* sensor awb status register */
-#define MISENSOR_AWB_STATUS	0xAC00
-/* sensor coarse integration time register */
-#define MISENSOR_COARSE_INTEGRATION_TIME 0xC83C
 
 /* registers */
-#define REG_SW_RESET                    0x301A
-#define REG_SW_STREAM                   0xDC00
-#define REG_SCCB_CTRL                   0x3100
-#define REG_SC_CMMN_CHIP_ID             0x0000
-#define REG_V_START                     0xc800 /* 16bits */
-#define REG_H_START                     0xc802 /* 16bits */
-#define REG_V_END                       0xc804 /* 16bits */
-#define REG_H_END                       0xc806 /* 16bits */
-#define REG_PIXEL_CLK                   0xc808 /* 32bits */
-#define REG_TIMING_VTS                  0xc812 /* 16bits */
 #define REG_TIMING_HTS                  0xc814 /* 16bits */
 #define REG_WIDTH                       0xC868 /* 16bits */
-#define REG_HEIGHT                      0xC86A /* 16bits */
 #define REG_EXPO_COARSE                 0x3012 /* 16bits */
-#define REG_EXPO_FINE                   0x3014 /* 16bits */
 #define REG_GAIN                        0x305E
-#define REG_ANALOGGAIN                  0x305F
-#define REG_ADDR_ACESSS                 0x098E /* logical_address_access */
-#define REG_COMM_Register               0x0080 /* command_register */
-
-#define SENSOR_DETECTED		1
-#define SENSOR_NOT_DETECTED	0
 
 #define I2C_RETRY_COUNT		5
 #define MSG_LEN_OFFSET		2
 
-#ifndef MIPI_CONTROL
-#define MIPI_CONTROL		0x3400	/* MIPI_Control */
-#endif
-
-/* GPIO pin on Moorestown */
-#define GPIO_SCLK_25		44
-#define GPIO_STB_PIN		47
-
-#define GPIO_STDBY_PIN		49   /* ab:new */
-#define GPIO_RESET_PIN		50
-
 /* System control register for Aptina A-1040SOC*/
 #define MT9M114_PID		0x0
 
 /* MT9P111_DEVICE_ID */
 #define MT9M114_MOD_ID		0x2481
 
-#define MT9M114_FINE_INTG_TIME_MIN 0
-#define MT9M114_FINE_INTG_TIME_MAX_MARGIN 0
-#define MT9M114_COARSE_INTG_TIME_MIN 1
-#define MT9M114_COARSE_INTG_TIME_MAX_MARGIN 6
-
 /* ulBPat; */
 
-#define MT9M114_BPAT_RGRGGBGB	BIT(0)
-#define MT9M114_BPAT_GRGRBGBG	BIT(1)
-#define MT9M114_BPAT_GBGBRGRG	BIT(2)
-#define MT9M114_BPAT_BGBGGRGR	BIT(3)
+#define MT9M114_BPAT_GRGRBGBG	BIT(0)
+#define MT9M114_BPAT_BGBGGRGR	BIT(1)
 
-#define MT9M114_FOCAL_LENGTH_NUM	208	/*2.08mm*/
 #define MT9M114_WAIT_STAT_TIMEOUT	100
-#define MT9M114_FLICKER_MODE_50HZ	1
-#define MT9M114_FLICKER_MODE_60HZ	2
-/*
- * focal length bits definition:
- * bits 31-16: numerator, bits 15-0: denominator
- */
-#define MT9M114_FOCAL_LENGTH_DEFAULT 0xD00064
-
-/*
- * current f-number bits definition:
- * bits 31-16: numerator, bits 15-0: denominator
- */
-#define MT9M114_F_NUMBER_DEFAULT 0x18000a
-
-/*
- * f-number range bits definition:
- * bits 31-24: max f-number numerator
- * bits 23-16: max f-number denominator
- * bits 15-8: min f-number numerator
- * bits 7-0: min f-number denominator
- */
-#define MT9M114_F_NUMBER_RANGE 0x180a180a
 
 /* Supported resolutions */
 enum {
@@ -158,29 +77,11 @@ enum {
 
 #define MT9M114_RES_960P_SIZE_H		1296
 #define MT9M114_RES_960P_SIZE_V		976
-#define MT9M114_RES_720P_SIZE_H		1280
-#define MT9M114_RES_720P_SIZE_V		720
-#define MT9M114_RES_576P_SIZE_H		1024
-#define MT9M114_RES_576P_SIZE_V		576
-#define MT9M114_RES_480P_SIZE_H		768
-#define MT9M114_RES_480P_SIZE_V		480
-#define MT9M114_RES_VGA_SIZE_H		640
-#define MT9M114_RES_VGA_SIZE_V		480
-#define MT9M114_RES_QVGA_SIZE_H		320
-#define MT9M114_RES_QVGA_SIZE_V		240
-#define MT9M114_RES_QCIF_SIZE_H		176
-#define MT9M114_RES_QCIF_SIZE_V		144
-
-#define MT9M114_RES_720_480p_768_SIZE_H 736
-#define MT9M114_RES_720_480p_768_SIZE_V 496
+
 #define MT9M114_RES_736P_SIZE_H 1296
 #define MT9M114_RES_736P_SIZE_V 736
 #define MT9M114_RES_864P_SIZE_H 1296
 #define MT9M114_RES_864P_SIZE_V 864
-#define MT9M114_RES_976P_SIZE_H 1296
-#define MT9M114_RES_976P_SIZE_V 976
-
-#define MT9M114_BIN_FACTOR_MAX			3
 
 #define MT9M114_DEFAULT_FIRST_EXP 0x10
 #define MT9M114_MAX_FIRST_EXP 0x302
-- 
2.45.2
Re: [PATCH] media: atomisp: i2c: Remove unused macro definitions
Posted by Hans de Goede 9 months, 1 week ago 
Hi WangYuli,

On 24-Jan-25 4:44 AM, WangYuli wrote:
> Delete obsolete macro definitions that are no longer in use in
> mt9m114.h to improve code readability and maintainability.
> 
> Signed-off-by: WangYuli <wangyuli@uniontech.com>

Thank you for your patch, but this entire driver is being
removed, so I'm not going to apply this patch. See:

https://lore.kernel.org/linux-media/20250501134312.104711-5-hdegoede@redhat.com/

Regards,

Hans


> ---
>  drivers/staging/media/atomisp/i2c/mt9m114.h | 105 +-------------------
>  1 file changed, 3 insertions(+), 102 deletions(-)
> 
> diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.h b/drivers/staging/media/atomisp/i2c/mt9m114.h
> index 97820db90827..9c4b85bea765 100644
> --- a/drivers/staging/media/atomisp/i2c/mt9m114.h
> +++ b/drivers/staging/media/atomisp/i2c/mt9m114.h
> @@ -22,29 +22,15 @@
>  #include "../include/linux/atomisp_platform.h"
>  #include "../include/linux/atomisp.h"
>  
> -#define V4L2_IDENT_MT9M114 8245
> -
> -#define MT9P111_REV3
> -#define FULLINISUPPORT
> -
>  /* #defines for register writes and register array processing */
>  #define MISENSOR_8BIT		1
>  #define MISENSOR_16BIT		2
>  #define MISENSOR_32BIT		4
>  
> -#define MISENSOR_FWBURST0	0x80
> -#define MISENSOR_FWBURST1	0x81
> -#define MISENSOR_FWBURST4	0x84
> -#define MISENSOR_FWBURST	0x88
> -
>  #define MISENSOR_TOK_TERM	0xf000	/* terminating token for reg list */
>  #define MISENSOR_TOK_DELAY	0xfe00	/* delay token for reg list */
> -#define MISENSOR_TOK_FWLOAD	0xfd00	/* token indicating load FW */
> -#define MISENSOR_TOK_POLL	0xfc00	/* token indicating poll instruction */
>  #define MISENSOR_TOK_RMW	0x0010  /* RMW operation */
>  #define MISENSOR_TOK_MASK	0xfff0
> -#define MISENSOR_AWB_STEADY	BIT(0)	/* awb steady */
> -#define MISENSOR_AE_READY	BIT(3)	/* ae status ready */
>  
>  /* mask to set sensor read_mode via misensor_rmw_reg */
>  #define MISENSOR_R_MODE_MASK	0x0330
> @@ -55,99 +41,32 @@
>  #define MISENSOR_FLIP_DIS	0
>  
>  /* bits set to set sensor read_mode via misensor_rmw_reg */
> -#define MISENSOR_SKIPPING_SET	0x0011
> -#define MISENSOR_SUMMING_SET	0x0033
>  #define MISENSOR_NORMAL_SET	0x0000
>  
>  /* sensor register that control sensor read-mode and mirror */
>  #define MISENSOR_READ_MODE	0xC834
> -/* sensor ae-track status register */
> -#define MISENSOR_AE_TRACK_STATUS	0xA800
> -/* sensor awb status register */
> -#define MISENSOR_AWB_STATUS	0xAC00
> -/* sensor coarse integration time register */
> -#define MISENSOR_COARSE_INTEGRATION_TIME 0xC83C
>  
>  /* registers */
> -#define REG_SW_RESET                    0x301A
> -#define REG_SW_STREAM                   0xDC00
> -#define REG_SCCB_CTRL                   0x3100
> -#define REG_SC_CMMN_CHIP_ID             0x0000
> -#define REG_V_START                     0xc800 /* 16bits */
> -#define REG_H_START                     0xc802 /* 16bits */
> -#define REG_V_END                       0xc804 /* 16bits */
> -#define REG_H_END                       0xc806 /* 16bits */
> -#define REG_PIXEL_CLK                   0xc808 /* 32bits */
> -#define REG_TIMING_VTS                  0xc812 /* 16bits */
>  #define REG_TIMING_HTS                  0xc814 /* 16bits */
>  #define REG_WIDTH                       0xC868 /* 16bits */
> -#define REG_HEIGHT                      0xC86A /* 16bits */
>  #define REG_EXPO_COARSE                 0x3012 /* 16bits */
> -#define REG_EXPO_FINE                   0x3014 /* 16bits */
>  #define REG_GAIN                        0x305E
> -#define REG_ANALOGGAIN                  0x305F
> -#define REG_ADDR_ACESSS                 0x098E /* logical_address_access */
> -#define REG_COMM_Register               0x0080 /* command_register */
> -
> -#define SENSOR_DETECTED		1
> -#define SENSOR_NOT_DETECTED	0
>  
>  #define I2C_RETRY_COUNT		5
>  #define MSG_LEN_OFFSET		2
>  
> -#ifndef MIPI_CONTROL
> -#define MIPI_CONTROL		0x3400	/* MIPI_Control */
> -#endif
> -
> -/* GPIO pin on Moorestown */
> -#define GPIO_SCLK_25		44
> -#define GPIO_STB_PIN		47
> -
> -#define GPIO_STDBY_PIN		49   /* ab:new */
> -#define GPIO_RESET_PIN		50
> -
>  /* System control register for Aptina A-1040SOC*/
>  #define MT9M114_PID		0x0
>  
>  /* MT9P111_DEVICE_ID */
>  #define MT9M114_MOD_ID		0x2481
>  
> -#define MT9M114_FINE_INTG_TIME_MIN 0
> -#define MT9M114_FINE_INTG_TIME_MAX_MARGIN 0
> -#define MT9M114_COARSE_INTG_TIME_MIN 1
> -#define MT9M114_COARSE_INTG_TIME_MAX_MARGIN 6
> -
>  /* ulBPat; */
>  
> -#define MT9M114_BPAT_RGRGGBGB	BIT(0)
> -#define MT9M114_BPAT_GRGRBGBG	BIT(1)
> -#define MT9M114_BPAT_GBGBRGRG	BIT(2)
> -#define MT9M114_BPAT_BGBGGRGR	BIT(3)
> +#define MT9M114_BPAT_GRGRBGBG	BIT(0)
> +#define MT9M114_BPAT_BGBGGRGR	BIT(1)
>  
> -#define MT9M114_FOCAL_LENGTH_NUM	208	/*2.08mm*/
>  #define MT9M114_WAIT_STAT_TIMEOUT	100
> -#define MT9M114_FLICKER_MODE_50HZ	1
> -#define MT9M114_FLICKER_MODE_60HZ	2
> -/*
> - * focal length bits definition:
> - * bits 31-16: numerator, bits 15-0: denominator
> - */
> -#define MT9M114_FOCAL_LENGTH_DEFAULT 0xD00064
> -
> -/*
> - * current f-number bits definition:
> - * bits 31-16: numerator, bits 15-0: denominator
> - */
> -#define MT9M114_F_NUMBER_DEFAULT 0x18000a
> -
> -/*
> - * f-number range bits definition:
> - * bits 31-24: max f-number numerator
> - * bits 23-16: max f-number denominator
> - * bits 15-8: min f-number numerator
> - * bits 7-0: min f-number denominator
> - */
> -#define MT9M114_F_NUMBER_RANGE 0x180a180a
>  
>  /* Supported resolutions */
>  enum {
> @@ -158,29 +77,11 @@ enum {
>  
>  #define MT9M114_RES_960P_SIZE_H		1296
>  #define MT9M114_RES_960P_SIZE_V		976
> -#define MT9M114_RES_720P_SIZE_H		1280
> -#define MT9M114_RES_720P_SIZE_V		720
> -#define MT9M114_RES_576P_SIZE_H		1024
> -#define MT9M114_RES_576P_SIZE_V		576
> -#define MT9M114_RES_480P_SIZE_H		768
> -#define MT9M114_RES_480P_SIZE_V		480
> -#define MT9M114_RES_VGA_SIZE_H		640
> -#define MT9M114_RES_VGA_SIZE_V		480
> -#define MT9M114_RES_QVGA_SIZE_H		320
> -#define MT9M114_RES_QVGA_SIZE_V		240
> -#define MT9M114_RES_QCIF_SIZE_H		176
> -#define MT9M114_RES_QCIF_SIZE_V		144
> -
> -#define MT9M114_RES_720_480p_768_SIZE_H 736
> -#define MT9M114_RES_720_480p_768_SIZE_V 496
> +
>  #define MT9M114_RES_736P_SIZE_H 1296
>  #define MT9M114_RES_736P_SIZE_V 736
>  #define MT9M114_RES_864P_SIZE_H 1296
>  #define MT9M114_RES_864P_SIZE_V 864
> -#define MT9M114_RES_976P_SIZE_H 1296
> -#define MT9M114_RES_976P_SIZE_V 976
> -
> -#define MT9M114_BIN_FACTOR_MAX			3
>  
>  #define MT9M114_DEFAULT_FIRST_EXP 0x10
>  #define MT9M114_MAX_FIRST_EXP 0x302
Re: [PATCH] media: atomisp: i2c: Remove unused macro definitions
Posted by Andy Shevchenko 1 year ago 
On Fri, Jan 24, 2025 at 5:45 AM WangYuli <wangyuli@uniontech.com> wrote:
>
> Delete obsolete macro definitions that are no longer in use in
> mt9m114.h to improve code readability and maintainability.

It looks okay, but as far as I know this driver needs a lot of work
and some of those macros actually may be needed. Do you have a full
roadmap of making this driver to be in shape?

-- 
With Best Regards,
Andy Shevchenko

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.