Hi Alexander,
On 11/1/23 12:17, Alexander Stein wrote:
> Some sensors, e.g. Sony, are using little-endian registers. Add support for
> those by encoding the endianess into Bit 20 of the register address.
>
> Signed-off-by: Alexander Stein <alexander.stein@xxxxxxxxxxxxxxx>
Thank you very much for working on this.
However it looks like you forgot to add support for the LE flag
to cci_read().
Regards,
Hans
> ---
> drivers/media/v4l2-core/v4l2-cci.c | 22 ++++++++++++++++++----
> include/media/v4l2-cci.h | 5 +++++
> 2 files changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-cci.c b/drivers/media/v4l2-core/v4l2-cci.c
> index bc2dbec019b04..ea33cfd77d895 100644
> --- a/drivers/media/v4l2-core/v4l2-cci.c
> +++ b/drivers/media/v4l2-core/v4l2-cci.c
> @@ -68,6 +68,7 @@ EXPORT_SYMBOL_GPL(cci_read);
>
> int cci_write(struct regmap *map, u32 reg, u64 val, int *err)
> {
> + bool little_endian;
> unsigned int len;
> u8 buf[8];
> int ret;
> @@ -75,6 +76,7 @@ int cci_write(struct regmap *map, u32 reg, u64 val, int *err)
> if (err && *err)
> return *err;
>
> + little_endian = reg & CCI_REG_LE;
> len = FIELD_GET(CCI_REG_WIDTH_MASK, reg);
> reg = FIELD_GET(CCI_REG_ADDR_MASK, reg);
>
> @@ -83,16 +85,28 @@ int cci_write(struct regmap *map, u32 reg, u64 val, int *err)
> buf[0] = val;
> break;
> case 2:
> - put_unaligned_be16(val, buf);
> + if (little_endian)
> + put_unaligned_le16(val, buf);
> + else
> + put_unaligned_be16(val, buf);
> break;
> case 3:
> - put_unaligned_be24(val, buf);
> + if (little_endian)
> + put_unaligned_le24(val, buf);
> + else
> + put_unaligned_be24(val, buf);
> break;
> case 4:
> - put_unaligned_be32(val, buf);
> + if (little_endian)
> + put_unaligned_le32(val, buf);
> + else
> + put_unaligned_be32(val, buf);
> break;
> case 8:
> - put_unaligned_be64(val, buf);
> + if (little_endian)
> + put_unaligned_le64(val, buf);
> + else
> + put_unaligned_be64(val, buf);
> break;
> default:
> dev_err(regmap_get_device(map), "Error invalid reg-width %u for reg 0x%04x\n",
> diff --git a/include/media/v4l2-cci.h b/include/media/v4l2-cci.h
> index 0f6803e4b17e9..ef3faf0c9d44d 100644
> --- a/include/media/v4l2-cci.h
> +++ b/include/media/v4l2-cci.h
> @@ -32,12 +32,17 @@ struct cci_reg_sequence {
> #define CCI_REG_ADDR_MASK GENMASK(15, 0)
> #define CCI_REG_WIDTH_SHIFT 16
> #define CCI_REG_WIDTH_MASK GENMASK(19, 16)
> +#define CCI_REG_LE BIT(20)
>
> #define CCI_REG8(x) ((1 << CCI_REG_WIDTH_SHIFT) | (x))
> #define CCI_REG16(x) ((2 << CCI_REG_WIDTH_SHIFT) | (x))
> #define CCI_REG24(x) ((3 << CCI_REG_WIDTH_SHIFT) | (x))
> #define CCI_REG32(x) ((4 << CCI_REG_WIDTH_SHIFT) | (x))
> #define CCI_REG64(x) ((8 << CCI_REG_WIDTH_SHIFT) | (x))
> +#define CCI_REG16_LE(x) ((2 << CCI_REG_WIDTH_SHIFT) | (x) | CCI_REG_LE)
> +#define CCI_REG24_LE(x) ((3 << CCI_REG_WIDTH_SHIFT) | (x) | CCI_REG_LE)
> +#define CCI_REG32_LE(x) ((4 << CCI_REG_WIDTH_SHIFT) | (x) | CCI_REG_LE)
> +#define CCI_REG64_LE(x) ((8 << CCI_REG_WIDTH_SHIFT) | (x) | CCI_REG_LE)
>
> /**
> * cci_read() - Read a value from a single CCI register
