[PATCH 48/55] media: rkisp1: Add match data for i.MX8MP ISP

[Dafna Hirschfeld]

On 18.06.2022 02:26, Laurent Pinchart wrote:
>Hi Paul,
>
>Thank you for the patch.
>
>On Wed, Jun 15, 2022 at 04:11:20AM +0900, Paul Elder wrote:
>> Add match data to the rkisp1 driver to match the i.MX8MP ISP.
>>
>> Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>
>> ---
>>  .../platform/rockchip/rkisp1/rkisp1-dev.c     | 22 +++++++++++++++++++
>>  include/uapi/linux/rkisp1-config.h            |  3 +++
>>  2 files changed, 25 insertions(+)
>>
>> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>> index 62fa2bd275fe..3a0115bdcee5 100644
>> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>> @@ -486,6 +486,24 @@ static const struct rkisp1_info rk3399_isp_info = {
>>  	.features = RKISP1_FEATURE_MIPI_CSI2,
>>  };
>>
>> +static const char * const imx8mp_isp_clks[] = {
>> +	"isp",
>> +	"hclk",
>> +	"aclk",
>> +};
>> +
>> +static const struct rkisp1_isr_data imx8mp_isp_isrs[] = {
>> +	{ NULL, rkisp1_isr },
>> +};
>> +
>> +static const struct rkisp1_info imx8mp_isp_info = {
>> +	.clks = imx8mp_isp_clks,
>> +	.clk_size = ARRAY_SIZE(imx8mp_isp_clks),
>> +	.isrs = imx8mp_isp_isrs,
>> +	.isr_size = ARRAY_SIZE(imx8mp_isp_isrs),
>> +	.isp_ver = IMX8MP_V10,
>> +};
>> +
>>  static const struct of_device_id rkisp1_of_match[] = {
>>  	{
>>  		.compatible = "rockchip,px30-cif-isp",
>> @@ -495,6 +513,10 @@ static const struct of_device_id rkisp1_of_match[] = {
>>  		.compatible = "rockchip,rk3399-cif-isp",
>>  		.data = &rk3399_isp_info,
>>  	},
>> +	{
>> +		.compatible = "fsl,imx8mp-isp",
>> +		.data = &imx8mp_isp_info,
>> +	},
>>  	{},
>>  };
>>  MODULE_DEVICE_TABLE(of, rkisp1_of_match);
>> diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h
>> index 583ca0d9a79d..40677d47825c 100644
>> --- a/include/uapi/linux/rkisp1-config.h
>> +++ b/include/uapi/linux/rkisp1-config.h
>> @@ -140,12 +140,15 @@
>>   * @RKISP1_V11: declared in the original vendor code, but not used
>>   * @RKISP1_V12: used at least in rk3326 and px30
>>   * @RKISP1_V13: used at least in rk1808
>> + * @IMX8MP_V10: used in at least imx8mp
>>   */
>>  enum rkisp1_cif_isp_version {
>>  	RKISP1_V10 = 10,
>>  	RKISP1_V11,
>>  	RKISP1_V12,
>>  	RKISP1_V13,
>> +	/* TODO Choose a better version for this */
>> +	IMX8MP_V10,
>
>Time to address this ? :-)
>
>Does anyone know where the current versioning scheme come from ?

It was added by Heiko Stübner, basically trying to figure out the
versions from the vedor code,
see https://lore.kernel.org/all/20210121144407.9045-6-dafna.hirschfeld@collabora.com/

thanks,
Dafna

>
>>  };
>>
>>  enum rkisp1_cif_isp_histogram_mode {
>
>-- 
>Regards,
>
>Laurent Pinchart