further cleanup

Author: fiepfiep

drivers/media/i2c/mira220.c

@@ -66,48 +66,29 @@
 
 // Exposure time is indicated in number of rows
 #define MIRA220_EXP_TIME_REG CCI_REG16_LE(0x100C)
-
 // VBLANK is indicated in number of rows
 #define MIRA220_VBLANK_REG CCI_REG16_LE(0x1012)
 
 #define MIRA220_HFLIP_REG CCI_REG8(0x209C)
 #define MIRA220_HFLIP_ENABLE_MIRROR 1
 #define MIRA220_HFLIP_DISABLE_MIRROR 0
-
 #define MIRA220_VFLIP_REG CCI_REG8(0x1095)
 #define MIRA220_VFLIP_ENABLE_FLIP 1
 #define MIRA220_VFLIP_DISABLE_FLIP 0
 
 #define MIRA220_OTP_CMD_REG CCI_REG8(0x0080)
 #define MIRA220_OTP_CMD_UP 0x4
 #define MIRA220_OTP_CMD_DOWN 0x8
-
 #define MIRA220_GLOB_NUM_CLK_CYCLES 1928
-
 #define MIRA220_SUPPORTED_XCLK_FREQ 38400000
-
-// Default exposure is adjusted to mode with smallest height
-#define MIRA220_DEFAULT_EXPOSURE \
-	100 //(MIRA220_MIN_V_SIZE + MIRA220_MIN_VBLANK - MIRA220_GLOB_NUM_CLK_CYCLES / MIRA220_MIN_ROW_LENGTH) //TODO
+#define MIRA220_DEFAULT_EXPOSURE 1000 
 #define MIRA220_EXPOSURE_MIN 1
 
 // Power on function timing
 #define MIRA220_XCLR_MIN_DELAY_US 100000
-#define MIRA220_XCLR_DELAY_RANGE_US 30
-
-// Mira220 PIXEL_RATE is derived from ROW_LENGTH. See datasheet Section 9.2.
-// ROW_LENGTH is set by registers: 0x102B, 0x102C. Unit is number of CLK_IN cycles.
-// PIXEL_RATE = 1000000000 * WIDTH / (ROW_LENGTH * CLK_IN_PERIOD_NS)
-// ROW_LENGTH_1600x1400_1000GBS=300
-// ROW_LENGTH_640x480_1000GBS=450
-// CLK_IN_PERIOD_NS = 1.0 s / 38.4 Mhz = 26.04 ns
-// MIRA220_PIXEL_RATE = 1000000000 * 1600 / (300 * 26.04) = 204813108
-// MIRA220_PIXEL_RATE = 1000000000 * 640 / (450 * 26.04) = 54616828
-#define MIRA220_PIXEL_RATE 384000000 //384M (x10)
-// Row time in microseconds. Not used in driver, but used in libcamera cam_helper.
-// ROW_TIME_US = ROW_LENGTH * CLK_IN_PERIOD_NS / 1000
-// MIRA220_ROW_TIME_1600x1400_1000GBS_US=(300*26.04/1000)=7.8us
-// MIRA220_ROW_TIME_640x480_1000GBS_US=(450*26.04/1000)=11.7us
+#define MIRA220_XCLR_DELAY_RANGE_US 300
+
+#define MIRA220_PIXEL_RATE 10 *  MIRA220_SUPPORTED_XCLK_FREQ  //384M (x10)
 
 /* Should match device tree link freq */
 #define MIRA220_DEFAULT_LINK_FREQ 750000000
@@ -129,22 +110,12 @@
   * HBLANK=1/((1/204813108)*30*(1400+13))-1600=3232
   */
 
-#define MIRA220_HBLANK_640x480_120FPS 3860
-#define MIRA220_HBLANK_1600x1400_30FPS 2900
-#define MIRA220_HBLANK_1600x1400_1500 1400
-
-#define MIRA220_HBLANK_400x400_304 2640
-#define MIRA220_HBLANK_640x480_304 2400
 #define MIRA220_HBLANK_1600x1400_304 1440
 
 #define MIRA220_REG_TEST_PATTERN CCI_REG8(0x2091)
 #define MIRA220_TEST_PATTERN_DISABLE 0x00
 #define MIRA220_TEST_PATTERN_VERTICAL_GRADIENT 0x01
 
-/* From Jetson driver */
-#define MIRA220_DEFAULT_LINE_LENGTH (0xA80)
-#define MIRA220_DEFAULT_PIXEL_CLOCK (160)
-#define MIRA220_DEFAULT_FRAME_LENGTH (0x07C0) //TODO REMOVE THESE
 
 enum pad_types { IMAGE_PAD, NUM_PADS };
 
@@ -164,18 +135,11 @@ struct mira220_v4l2_reg {
 
 /* Mode : resolution and related config&values */
 struct mira220_mode {
-	/* Frame width */
 	unsigned int width;
-	/* Frame height */
 	unsigned int height;
-
-	/* Analog crop rectangle. */
 	struct v4l2_rect crop;
-
-	/* Default register values */
 	struct mira220_reg_list reg_list;
 	u32 row_length;
-
 	u32 pixel_rate;
 	u32 min_vblank;
 	u32 max_vblank;
@@ -1042,7 +1006,6 @@ static const int mira220_test_pattern_val[] = {
 
 /* regulator supplies */
 static const char *const mira220_supply_name[] = {
-	// TODO(jalv): Check supply names
 	/* Supplies can be enabled in any order */
 	"vana", /* Analog (2.8V) supply */
 	"vdig", /* Digital Core (1.8V) supply */
@@ -1086,9 +1049,9 @@ static const struct mira220_mode supported_modes[] = {
 		 // ROW_LENGTH is configured by register 0x102B, 0x102C.
 		 .row_length = 304,
 		 .pixel_rate = MIRA220_PIXEL_RATE,
-		 .min_vblank = 20, // ceil(1928 / 300) + 11
-		 .max_vblank = 50000, // ceil(1928 / 300) + 11
-		 .hblank = MIRA220_HBLANK_1600x1400_304, // TODO
+		 .min_vblank = 20, // at least ceil(1928 / 300) + 11
+		 .max_vblank = 50000, 
+		 .hblank = MIRA220_HBLANK_1600x1400_304, 
 		 .code = MEDIA_BUS_FMT_SGRBG12_1X12,
 	 },
 
@@ -1233,7 +1196,6 @@ static int mira220_write_stop_streaming_regs(struct mira220 *mira220)
 {
 	struct i2c_client *const client = v4l2_get_subdevdata(&mira220->sd);
 	int ret = 0;
-	u32 frame_time;
 	int try_cnt;
 
 	for (try_cnt = 0; try_cnt < 5; try_cnt++) {
@@ -1268,10 +1230,8 @@ static int mira220_write_stop_streaming_regs(struct mira220 *mira220)
 		  * frame_time = frame length rows * Tline
 		  * Tline = line length / pixel clock (in MHz)
 		  */
-	frame_time = MIRA220_DEFAULT_FRAME_LENGTH *
-		     MIRA220_DEFAULT_LINE_LENGTH / MIRA220_DEFAULT_PIXEL_CLOCK;
 
-	usleep_range(frame_time, frame_time + 1000); //TODO, set to 1 frametime
+	usleep_range(40000, 40000+ 10000); 
 
 	return ret;
 }
@@ -1292,8 +1252,7 @@ static int mira220_write_exposure_reg(struct mira220 *mira220, u32 exposure)
 		mira220->mode->height, mira220->vblank->val,
 		mira220->mode->row_length);
 	u32 ret = 0;
-	u64 readval = 0;
-	int otherval = 0;
+
 	u32 capped_exposure = exposure;
 
 	if (exposure > max_exposure) {
@@ -1454,7 +1413,6 @@ static int mira220_set_ctrl(struct v4l2_ctrl *ctrl)
 
 	pm_runtime_put(&client->dev);
 
-	// TODO: FIXIT
 	return ret;
 }
 
@@ -2214,14 +2172,18 @@ static void mira220_remove(struct i2c_client *client)
 	pm_runtime_set_suspended(&client->dev);
 }
 
+
+
 static const struct dev_pm_ops mira220_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(mira220_suspend, mira220_resume)
 		SET_RUNTIME_PM_OPS(mira220_power_off, mira220_power_on, NULL)
 };
 
-static const struct of_device_id mira220_dt_ids[] = { { .compatible =
-								"ams,mira220" },
-						      { /* sentinel */ } };
+
+static const struct of_device_id mira220_dt_ids[] = {
+	{ .compatible = "ams,mira220" },
+	{ /* sentinel */ }
+};
+
 MODULE_DEVICE_TABLE(of, mira220_dt_ids);
 
 static const struct i2c_device_id mira220_ids[] = { { "mira220", 0 }, {} };