On Thu, Jul 21, 2022 at 01:28:34PM +0200, Alexander Stein wrote: > Am Donnerstag, 21. Juli 2022, 13:08:05 CEST schrieb Laurent Pinchart: > > On Thu, Jul 21, 2022 at 12:00:55PM +0200, Alexander Stein wrote: > > > Am Donnerstag, 21. Juli 2022, 10:35:31 CEST schrieb Laurent Pinchart: > > > > Define macros for all registers programmed by the driver for which > > > > documentation is available to increase readability. This starts making > > > > use of 16-bit registers in the register arrays, so the value field has > > > > to be increased to 32 bits. > > > > > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > > > --- > > > > > > > > drivers/media/i2c/imx290.c | 219 +++++++++++++++++++++---------------- > > > > 1 file changed, 124 insertions(+), 95 deletions(-) > > > > > > > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > > > > index 5b7f9027b50f..bec326a83952 100644 > > > > --- a/drivers/media/i2c/imx290.c > > > > +++ b/drivers/media/i2c/imx290.c > > > > @@ -31,14 +31,73 @@ > > > > #define IMX290_STANDBY IMX290_REG_8BIT(0x3000) > > > > #define IMX290_REGHOLD IMX290_REG_8BIT(0x3001) > > > > #define IMX290_XMSTA IMX290_REG_8BIT(0x3002) > > > > +#define IMX290_ADBIT IMX290_REG_8BIT(0x3005) > > > > +#define IMX290_ADBIT_10BIT (0 << 0) > > > > +#define IMX290_ADBIT_12BIT (1 << 0) > > > > +#define IMX290_CTRL_07 IMX290_REG_8BIT(0x3007) > > > > +#define IMX290_VREVERSE BIT(0) > > > > +#define IMX290_HREVERSE BIT(1) > > > > +#define IMX290_WINMODE_1080P (0 << 4) > > > > +#define IMX290_WINMODE_720P (1 << 4) > > > > +#define IMX290_WINMODE_CROP (4 << 4) > > > > #define IMX290_FR_FDG_SEL IMX290_REG_8BIT(0x3009) > > > > #define IMX290_BLKLEVEL IMX290_REG_16BIT(0x300a) > > > > #define IMX290_GAIN IMX290_REG_8BIT(0x3014) > > > > +#define IMX290_VMAX IMX290_REG_24BIT(0x3018) > > > > #define IMX290_HMAX IMX290_REG_16BIT(0x301c) > > > > +#define IMX290_SHS1 IMX290_REG_24BIT(0x3020) > > > > +#define IMX290_WINWV_OB IMX290_REG_8BIT(0x303a) > > > > +#define IMX290_WINPV IMX290_REG_16BIT(0x303c) > > > > +#define IMX290_WINWV IMX290_REG_16BIT(0x303e) > > > > +#define IMX290_WINPH IMX290_REG_16BIT(0x3040) > > > > +#define IMX290_WINWH IMX290_REG_16BIT(0x3042) > > > > +#define IMX290_OUT_CTRL IMX290_REG_8BIT(0x3046) > > > > +#define IMX290_ODBIT_10BIT (0 << 0) > > > > +#define IMX290_ODBIT_12BIT (1 << 0) > > > > > > ODBIT is fixed 1h for MIPI-CSI-2 output. > > > > > > > +#define IMX290_OPORTSEL_PARALLEL (0x0 << 4) > > > > +#define IMX290_OPORTSEL_LVDS_2CH (0xd << 4) > > > > +#define IMX290_OPORTSEL_LVDS_4CH (0xe << 4) > > > > +#define IMX290_OPORTSEL_LVDS_8CH (0xf << 4) > > > > > > This driver only supports MIPI-CSI-2 output, but these bits are don't care, > > > you still want to list them here for completeness? > > > > Yes, it could be useful later. > > Ok, fine with me. > > > > > +#define IMX290_XSOUTSEL IMX290_REG_8BIT(0x304b) > > > > +#define IMX290_XSOUTSEL_XVSOUTSEL_HIGH (0 << 0) > > > > +#define IMX290_XSOUTSEL_XVSOUTSEL_VSYNC (2 << 0) > > > > +#define IMX290_XSOUTSEL_XHSOUTSEL_HIGH (0 << 2) > > > > +#define IMX290_XSOUTSEL_XHSOUTSEL_HSYNC (2 << 2) > > > > +#define IMX290_INCKSEL1 IMX290_REG_8BIT(0x305c) > > > > +#define IMX290_INCKSEL2 IMX290_REG_8BIT(0x305d) > > > > +#define IMX290_INCKSEL3 IMX290_REG_8BIT(0x305e) > > > > +#define IMX290_INCKSEL4 IMX290_REG_8BIT(0x305f) > > > > #define IMX290_PGCTRL IMX290_REG_8BIT(0x308c) > > > > +#define IMX290_ADBIT1 IMX290_REG_8BIT(0x3129) > > > > +#define IMX290_ADBIT1_10BIT 0x1d > > > > +#define IMX290_ADBIT1_12BIT 0x00 > > > > +#define IMX290_INCKSEL5 IMX290_REG_8BIT(0x315e) > > > > +#define IMX290_INCKSEL6 IMX290_REG_8BIT(0x3164) > > > > > > Any reason to skip the bit defines for both supported input clocks? > > > > I don't have access to information that describes the bits in those two > > registers, just magic values for the 37.125 MHz and 74.25 MHz input > > clocks. Would you happen to know more ? > > See [1] and line 354 as well. This register is depending on the external > clock. > > [1] https://github.com/tq-systems/linux-tqmaxx/blob/TQMa8-fslc-5.10-2.1.x-imx/drivers/media/i2c/imx290.c#L344 Right, but I don't know what those values mean. I'm defining in this patch macros for register addresses and bits that have a known name. Magic values are left as hex constants in the register arrays or code. A subsequent patch could address that if desired. > > > > +#define IMX290_ADBIT2 IMX290_REG_8BIT(0x317c) > > > > +#define IMX290_ADBIT2_10BIT 0x12 > > > > +#define IMX290_ADBIT2_12BIT 0x00 > > > > #define IMX290_CHIP_ID IMX290_REG_16BIT(0x319a) > > > > +#define IMX290_ADBIT3 IMX290_REG_16BIT(0x31ec) > > > > +#define IMX290_ADBIT3_10BIT 0x37 > > > > +#define IMX290_ADBIT3_12BIT 0x0e > > > > +#define IMX290_REPETITION IMX290_REG_8BIT(0x3405) > > > > #define IMX290_PHY_LANE_NUM IMX290_REG_8BIT(0x3407) > > > > +#define IMX290_OPB_SIZE_V IMX290_REG_8BIT(0x3414) > > > > +#define IMX290_Y_OUT_SIZE IMX290_REG_16BIT(0x3418) > > > > +#define IMX290_CSI_DT_FMT IMX290_REG_16BIT(0x3441) > > > > +#define IMX290_CSI_DT_FMT_RAW10 0x0a0a > > > > +#define IMX290_CSI_DT_FMT_RAW12 0x0c0c > > > > #define IMX290_CSI_LANE_MODE IMX290_REG_8BIT(0x3443) > > > > +#define IMX290_EXTCK_FREQ IMX290_REG_16BIT(0x3444) > > > > > > Same here. > > > > Same explanation as above :-) > > This register also depends on external clock, see [2] and line 228 as well. > > [2] https://github.com/tq-systems/linux-tqmaxx/blob/TQMa8-fslc-5.10-2.1.x-imx/drivers/media/i2c/imx290.c#L218 > > > > > +#define IMX290_TCLKPOST IMX290_REG_16BIT(0x3446) > > > > +#define IMX290_THSZERO IMX290_REG_16BIT(0x3448) > > > > +#define IMX290_THSPREPARE IMX290_REG_16BIT(0x344a) > > > > +#define IMX290_TCLKTRAIL IMX290_REG_16BIT(0x344c) > > > > +#define IMX290_THSTRAIL IMX290_REG_16BIT(0x344e) > > > > +#define IMX290_TCLKZERO IMX290_REG_16BIT(0x3450) > > > > +#define IMX290_TCLKPREPARE IMX290_REG_16BIT(0x3452) > > > > +#define IMX290_TLPX IMX290_REG_16BIT(0x3454) > > > > +#define IMX290_X_OUT_SIZE IMX290_REG_16BIT(0x3472) > > > > > > > > #define IMX290_PGCTRL_REGEN BIT(0) > > > > #define IMX290_PGCTRL_THRU BIT(1) > > > > > > > > @@ -54,7 +113,7 @@ static const char * const imx290_supply_name[] = { > > > > > > > > struct imx290_regval { > > > > u32 reg; > > > > - u8 val; > > > > + u32 val; > > > > }; > > > > > > > > struct imx290_mode { > > > > @@ -116,22 +175,16 @@ static const char * const imx290_test_pattern_menu[] = { }; > > > > > > > > static const struct imx290_regval imx290_global_init_settings[] = { > > > > > > > > - { IMX290_REG_8BIT(0x3007), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3018), 0x65 }, > > > > - { IMX290_REG_8BIT(0x3019), 0x04 }, > > > > - { IMX290_REG_8BIT(0x301a), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3444), 0x20 }, > > > > - { IMX290_REG_8BIT(0x3445), 0x25 }, > > > > - { IMX290_REG_8BIT(0x303a), 0x0c }, > > > > - { IMX290_REG_8BIT(0x3040), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3041), 0x00 }, > > > > - { IMX290_REG_8BIT(0x303c), 0x00 }, > > > > - { IMX290_REG_8BIT(0x303d), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3042), 0x9c }, > > > > - { IMX290_REG_8BIT(0x3043), 0x07 }, > > > > - { IMX290_REG_8BIT(0x303e), 0x49 }, > > > > - { IMX290_REG_8BIT(0x303f), 0x04 }, > > > > - { IMX290_REG_8BIT(0x304b), 0x0a }, > > > > + { IMX290_CTRL_07, IMX290_WINMODE_1080P }, > > > > + { IMX290_VMAX, 1125 }, > > > > + { IMX290_EXTCK_FREQ, 0x2520 }, > > > > + { IMX290_WINWV_OB, 12 }, > > > > + { IMX290_WINPH, 0 }, > > > > + { IMX290_WINPV, 0 }, > > > > + { IMX290_WINWH, 1948 }, > > > > + { IMX290_WINWV, 1097 }, > > > > + { IMX290_XSOUTSEL, IMX290_XSOUTSEL_XVSOUTSEL_VSYNC | > > > > + IMX290_XSOUTSEL_XHSOUTSEL_HSYNC }, > > > > { IMX290_REG_8BIT(0x300f), 0x00 }, > > > > { IMX290_REG_8BIT(0x3010), 0x21 }, > > > > { IMX290_REG_8BIT(0x3012), 0x64 }, > > > > @@ -177,102 +230,78 @@ static const struct imx290_regval imx290_global_init_settings[] = { > > > > > > > > static const struct imx290_regval imx290_1080p_settings[] = { > > > > /* mode settings */ > > > > - { IMX290_REG_8BIT(0x3007), 0x00 }, > > > > - { IMX290_REG_8BIT(0x303a), 0x0c }, > > > > - { IMX290_REG_8BIT(0x3414), 0x0a }, > > > > - { IMX290_REG_8BIT(0x3472), 0x80 }, > > > > - { IMX290_REG_8BIT(0x3473), 0x07 }, > > > > - { IMX290_REG_8BIT(0x3418), 0x38 }, > > > > - { IMX290_REG_8BIT(0x3419), 0x04 }, > > > > + { IMX290_CTRL_07, IMX290_WINMODE_1080P }, > > > > + { IMX290_WINWV_OB, 12 }, > > > > + { IMX290_OPB_SIZE_V, 10 }, > > > > + { IMX290_X_OUT_SIZE, 1920 }, > > > > + { IMX290_Y_OUT_SIZE, 1080 }, > > > > { IMX290_REG_8BIT(0x3012), 0x64 }, > > > > { IMX290_REG_8BIT(0x3013), 0x00 }, > > > > - { IMX290_REG_8BIT(0x305c), 0x18 }, > > > > - { IMX290_REG_8BIT(0x305d), 0x03 }, > > > > - { IMX290_REG_8BIT(0x305e), 0x20 }, > > > > - { IMX290_REG_8BIT(0x305f), 0x01 }, > > > > - { IMX290_REG_8BIT(0x315e), 0x1a }, > > > > - { IMX290_REG_8BIT(0x3164), 0x1a }, > > > > + { IMX290_INCKSEL1, 0x18 }, > > > > + { IMX290_INCKSEL2, 0x03 }, > > > > + { IMX290_INCKSEL3, 0x20 }, > > > > + { IMX290_INCKSEL4, 0x01 }, > > > > + { IMX290_INCKSEL5, 0x1a }, > > > > + { IMX290_INCKSEL6, 0x1a }, > > > > { IMX290_REG_8BIT(0x3480), 0x49 }, > > > > /* data rate settings */ > > > > - { IMX290_REG_8BIT(0x3405), 0x10 }, > > > > - { IMX290_REG_8BIT(0x3446), 0x57 }, > > > > - { IMX290_REG_8BIT(0x3447), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3448), 0x37 }, > > > > - { IMX290_REG_8BIT(0x3449), 0x00 }, > > > > - { IMX290_REG_8BIT(0x344a), 0x1f }, > > > > - { IMX290_REG_8BIT(0x344b), 0x00 }, > > > > - { IMX290_REG_8BIT(0x344c), 0x1f }, > > > > - { IMX290_REG_8BIT(0x344d), 0x00 }, > > > > - { IMX290_REG_8BIT(0x344e), 0x1f }, > > > > - { IMX290_REG_8BIT(0x344f), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3450), 0x77 }, > > > > - { IMX290_REG_8BIT(0x3451), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3452), 0x1f }, > > > > - { IMX290_REG_8BIT(0x3453), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3454), 0x17 }, > > > > - { IMX290_REG_8BIT(0x3455), 0x00 }, > > > > + { IMX290_REPETITION, 0x10 }, > > > > + { IMX290_TCLKPOST, 87 }, > > > > + { IMX290_THSZERO, 55 }, > > > > + { IMX290_THSPREPARE, 31 }, > > > > + { IMX290_TCLKTRAIL, 31 }, > > > > + { IMX290_THSTRAIL, 31 }, > > > > + { IMX290_TCLKZERO, 119 }, > > > > + { IMX290_TCLKPREPARE, 31 }, > > > > + { IMX290_TLPX, 23 }, > > > > }; > > > > > > > > static const struct imx290_regval imx290_720p_settings[] = { > > > > /* mode settings */ > > > > - { IMX290_REG_8BIT(0x3007), 0x10 }, > > > > - { IMX290_REG_8BIT(0x303a), 0x06 }, > > > > - { IMX290_REG_8BIT(0x3414), 0x04 }, > > > > - { IMX290_REG_8BIT(0x3472), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3473), 0x05 }, > > > > - { IMX290_REG_8BIT(0x3418), 0xd0 }, > > > > - { IMX290_REG_8BIT(0x3419), 0x02 }, > > > > + { IMX290_CTRL_07, IMX290_WINMODE_720P }, > > > > + { IMX290_WINWV_OB, 6 }, > > > > + { IMX290_OPB_SIZE_V, 4 }, > > > > + { IMX290_X_OUT_SIZE, 1280 }, > > > > + { IMX290_Y_OUT_SIZE, 720 }, > > > > { IMX290_REG_8BIT(0x3012), 0x64 }, > > > > { IMX290_REG_8BIT(0x3013), 0x00 }, > > > > - { IMX290_REG_8BIT(0x305c), 0x20 }, > > > > - { IMX290_REG_8BIT(0x305d), 0x00 }, > > > > - { IMX290_REG_8BIT(0x305e), 0x20 }, > > > > - { IMX290_REG_8BIT(0x305f), 0x01 }, > > > > - { IMX290_REG_8BIT(0x315e), 0x1a }, > > > > - { IMX290_REG_8BIT(0x3164), 0x1a }, > > > > + { IMX290_INCKSEL1, 0x20 }, > > > > + { IMX290_INCKSEL2, 0x00 }, > > > > + { IMX290_INCKSEL3, 0x20 }, > > > > + { IMX290_INCKSEL4, 0x01 }, > > > > + { IMX290_INCKSEL5, 0x1a }, > > > > + { IMX290_INCKSEL6, 0x1a }, > > > > { IMX290_REG_8BIT(0x3480), 0x49 }, > > > > /* data rate settings */ > > > > - { IMX290_REG_8BIT(0x3405), 0x10 }, > > > > - { IMX290_REG_8BIT(0x3446), 0x4f }, > > > > - { IMX290_REG_8BIT(0x3447), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3448), 0x2f }, > > > > - { IMX290_REG_8BIT(0x3449), 0x00 }, > > > > - { IMX290_REG_8BIT(0x344a), 0x17 }, > > > > - { IMX290_REG_8BIT(0x344b), 0x00 }, > > > > - { IMX290_REG_8BIT(0x344c), 0x17 }, > > > > - { IMX290_REG_8BIT(0x344d), 0x00 }, > > > > - { IMX290_REG_8BIT(0x344e), 0x17 }, > > > > - { IMX290_REG_8BIT(0x344f), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3450), 0x57 }, > > > > - { IMX290_REG_8BIT(0x3451), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3452), 0x17 }, > > > > - { IMX290_REG_8BIT(0x3453), 0x00 }, > > > > - { IMX290_REG_8BIT(0x3454), 0x17 }, > > > > - { IMX290_REG_8BIT(0x3455), 0x00 }, > > > > + { IMX290_REPETITION, 0x10 }, > > > > + { IMX290_TCLKPOST, 79 }, > > > > + { IMX290_THSZERO, 47 }, > > > > + { IMX290_THSPREPARE, 23 }, > > > > + { IMX290_TCLKTRAIL, 23 }, > > > > + { IMX290_THSTRAIL, 23 }, > > > > + { IMX290_TCLKZERO, 87 }, > > > > + { IMX290_TCLKPREPARE, 23 }, > > > > + { IMX290_TLPX, 23 }, > > > > }; > > > > > > > > static const struct imx290_regval imx290_10bit_settings[] = { > > > > - { IMX290_REG_8BIT(0x3005), 0x00}, > > > > - { IMX290_REG_8BIT(0x3046), 0x00}, > > > > - { IMX290_REG_8BIT(0x3129), 0x1d}, > > > > - { IMX290_REG_8BIT(0x317c), 0x12}, > > > > - { IMX290_REG_8BIT(0x31ec), 0x37}, > > > > - { IMX290_REG_8BIT(0x3441), 0x0a}, > > > > - { IMX290_REG_8BIT(0x3442), 0x0a}, > > > > - { IMX290_REG_8BIT(0x300a), 0x3c}, > > > > - { IMX290_REG_8BIT(0x300b), 0x00}, > > > > + { IMX290_ADBIT, IMX290_ADBIT_10BIT }, > > > > + { IMX290_OUT_CTRL, IMX290_ODBIT_10BIT }, > > > > + { IMX290_ADBIT1, IMX290_ADBIT1_10BIT }, > > > > + { IMX290_ADBIT2, IMX290_ADBIT2_10BIT }, > > > > + { IMX290_ADBIT3, IMX290_ADBIT3_10BIT }, > > > > + { IMX290_CSI_DT_FMT, IMX290_CSI_DT_FMT_RAW10 }, > > > > + { IMX290_BLKLEVEL, 60 }, > > > > }; > > > > > > > > static const struct imx290_regval imx290_12bit_settings[] = { > > > > - { IMX290_REG_8BIT(0x3005), 0x01 }, > > > > - { IMX290_REG_8BIT(0x3046), 0x01 }, > > > > - { IMX290_REG_8BIT(0x3129), 0x00 }, > > > > - { IMX290_REG_8BIT(0x317c), 0x00 }, > > > > - { IMX290_REG_8BIT(0x31ec), 0x0e }, > > > > - { IMX290_REG_8BIT(0x3441), 0x0c }, > > > > - { IMX290_REG_8BIT(0x3442), 0x0c }, > > > > - { IMX290_REG_8BIT(0x300a), 0xf0 }, > > > > - { IMX290_REG_8BIT(0x300b), 0x00 }, > > > > + { IMX290_ADBIT, IMX290_ADBIT_12BIT }, > > > > + { IMX290_OUT_CTRL, IMX290_ODBIT_12BIT }, > > > > + { IMX290_ADBIT1, IMX290_ADBIT1_12BIT }, > > > > + { IMX290_ADBIT2, IMX290_ADBIT2_12BIT }, > > > > + { IMX290_ADBIT3, IMX290_ADBIT3_12BIT }, > > > > + { IMX290_CSI_DT_FMT, IMX290_CSI_DT_FMT_RAW12 }, > > > > + { IMX290_BLKLEVEL, 240 }, > > > > }; > > > > > > > > /* supported link frequencies */ -- Regards, Laurent Pinchart
