Hi Niklas,
Thank you for the patch.
On Wed, Mar 13, 2019 at 12:50:18AM +0100, Niklas Söderlund wrote:
> Latest information from hardware engineers reveals that H3 ES2 and ES3
> behave differently when working with link speeds bellow 250 Mpbs.
> Add a SoC match for H3 ES2.* and use the correct startup sequence.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/rcar-vin/rcar-csi2.c | 35 +++++++++++++++++----
> 1 file changed, 29 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c
> index aaf35afc6c87b3c0..0a4a71be60bee89b 100644
> --- a/drivers/media/platform/rcar-vin/rcar-csi2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
> @@ -875,7 +875,8 @@ static int rcsi2_phtw_write_mbps(struct rcar_csi2 *priv, unsigned int mbps,
> return rcsi2_phtw_write(priv, value->reg, code);
> }
>
> -static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)
> +static int __rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv,
> + unsigned int mbps)
> {
> static const struct phtw_value step1[] = {
> { .data = 0xcc, .code = 0xe2 },
> @@ -901,7 +902,7 @@ static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)
> if (ret)
> return ret;
>
> - if (mbps <= 250) {
> + if (mbps != 0 && mbps <= 250) {
I would have gone for a third argument, but this works too, and is
probably a tad more efficient. If we later need mbps here for other
reasons on ES2.0 we can always change the code, so
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ret = rcsi2_phtw_write(priv, 0x39, 0x05);
> if (ret)
> return ret;
> @@ -915,6 +916,16 @@ static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)
> return rcsi2_phtw_write_array(priv, step2);
> }
>
> +static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)
> +{
> + return __rcsi2_init_phtw_h3_v3h_m3n(priv, mbps);
> +}
> +
> +static int rcsi2_init_phtw_h3es2(struct rcar_csi2 *priv, unsigned int mbps)
> +{
> + return __rcsi2_init_phtw_h3_v3h_m3n(priv, 0);
> +}
> +
> static int rcsi2_init_phtw_v3m_e3(struct rcar_csi2 *priv, unsigned int mbps)
> {
> return rcsi2_phtw_write_mbps(priv, mbps, phtw_mbps_v3m_e3, 0x44);
> @@ -977,6 +988,14 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a7795es1 = {
> .num_channels = 4,
> };
>
> +static const struct rcar_csi2_info rcar_csi2_info_r8a7795es2 = {
> + .init_phtw = rcsi2_init_phtw_h3es2,
> + .hsfreqrange = hsfreqrange_h3_v3h_m3n,
> + .csi0clkfreqrange = 0x20,
> + .num_channels = 4,
> + .clear_ulps = true,
> +};
> +
> static const struct rcar_csi2_info rcar_csi2_info_r8a7796 = {
> .hsfreqrange = hsfreqrange_m3w_h3es1,
> .num_channels = 4,
> @@ -1042,11 +1061,15 @@ static const struct of_device_id rcar_csi2_of_table[] = {
> };
> MODULE_DEVICE_TABLE(of, rcar_csi2_of_table);
>
> -static const struct soc_device_attribute r8a7795es1[] = {
> +static const struct soc_device_attribute r8a7795[] = {
> {
> .soc_id = "r8a7795", .revision = "ES1.*",
> .data = &rcar_csi2_info_r8a7795es1,
> },
> + {
> + .soc_id = "r8a7795", .revision = "ES2.*",
> + .data = &rcar_csi2_info_r8a7795es2,
> + },
> { /* sentinel */ },
> };
>
> @@ -1064,10 +1087,10 @@ static int rcsi2_probe(struct platform_device *pdev)
> priv->info = of_device_get_match_data(&pdev->dev);
>
> /*
> - * r8a7795 ES1.x behaves differently than the ES2.0+ but doesn't
> - * have it's own compatible string.
> + * The different ES versions of r8a7795 (H3) behave differently but
> + * share the same compatible string.
> */
> - attr = soc_device_match(r8a7795es1);
> + attr = soc_device_match(r8a7795);
> if (attr)
> priv->info = attr->data;
>
--
Regards,
Laurent Pinchart
