From: Robert Foss <robert.foss@linaro.org>
To: Jonathan Marek <jonathan@marek.ca>
Cc: MSM <linux-arm-msm@vger.kernel.org>,
Andrey Konovalov <andrey.konovalov@linaro.org>,
Todor Tomov <todor.too@gmail.com>, Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
"open list:QUALCOMM CAMERA SUBSYSTEM DRIVER"
<linux-media@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 03/17] media: camss: csiphy-3ph: add support for SM8250 CSI DPHY
Date: Wed, 19 May 2021 18:26:57 +0200 [thread overview]
Message-ID: <CAG3jFytj8sgC-GW03e17RWFLhJGhMGTBpBpFBhYi3fixJuAdFg@mail.gmail.com> (raw)
In-Reply-To: <20210511180728.23781-4-jonathan@marek.ca>
On Tue, 11 May 2021 at 20:08, Jonathan Marek <jonathan@marek.ca> wrote:
>
> Add support for CSIPHY (2PH/DPHY mode) found on SM8250 hardware.
>
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> ---
> .../qcom/camss/camss-csiphy-3ph-1-0.c | 144 +++++++++++++++++-
> 1 file changed, 137 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> index 783b65295d20..61947576ddfb 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> @@ -62,6 +62,7 @@ struct csiphy_reg_t {
> u32 csiphy_param_type;
> };
>
> +/* GEN2 1.0 2PH */
> static const struct
> csiphy_reg_t lane_regs_sdm845[5][14] = {
> {
> @@ -146,6 +147,121 @@ csiphy_reg_t lane_regs_sdm845[5][14] = {
> },
> };
>
> +/* GEN2 1.2.1 2PH */
> +static const struct
> +csiphy_reg_t lane_regs_sm8250[5][20] = {
> + {
> + {0x0030, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0900, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0908, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0904, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0904, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x002C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0034, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0010, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x001C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x003C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x0000, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0024, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0730, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C80, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C88, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C84, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C84, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x072C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0734, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0710, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x071C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x073C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0708, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x070c, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0724, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0230, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0A00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0A08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0A04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0A04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x022C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0234, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0210, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x021C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x023C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0208, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x0200, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x020c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0224, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0430, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0B00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0B08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0B04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0B04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x042C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0434, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0410, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x041C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x043C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0408, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x0400, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x040c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0428, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0424, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0630, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0C04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x062C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0634, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0610, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x061C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x063C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0608, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x0600, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x060c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0628, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0624, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> +};
> +
> static void csiphy_hw_version_read(struct csiphy_device *csiphy,
> struct device *dev)
> {
> @@ -298,13 +414,23 @@ static void csiphy_gen1_config_lanes(struct csiphy_device *csiphy,
> static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
> u8 settle_cnt)
> {
> - int i, l;
> - u32 val;
> + const struct csiphy_reg_t *r;
> + int i, l, array_size;
> + u32 val, lane_enable;
> +
> + switch (csiphy->camss->version) {
> + case CAMSS_845:
> + r = &lane_regs_sdm845[0][0];
> + array_size = ARRAY_SIZE(lane_regs_sdm845[0]);
> + break;
> + case CAMSS_8250:
CAMSS_8250 is not defined until later in the series, in "media: camss:
add support for SM8250 camss".
> + r = &lane_regs_sm8250[0][0];
> + array_size = ARRAY_SIZE(lane_regs_sm8250[0]);
> + break;
> + }
>
> for (l = 0; l < 5; l++) {
> - for (i = 0; i < 14; i++) {
> - const struct csiphy_reg_t *r = &lane_regs_sdm845[l][i];
> -
> + for (i = 0; i < array_size; i++, r++) {
> switch (r->csiphy_param_type) {
> case CSIPHY_SETTLE_CNT_LOWER_BYTE:
> val = settle_cnt & 0xff;
> @@ -331,7 +457,10 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
>
> settle_cnt = csiphy_settle_cnt_calc(link_freq, csiphy->timer_clk_rate);
>
> - val = BIT(c->clk.pos);
> + if (csiphy->camss->version == CAMSS_8250)
> + val = BIT(7);
> + else
> + val = BIT(c->clk.pos);
sdm845 and sm8250 behave the same way, and I think this chunk should
reflect that. With that being said the docs for camss-sdm845 mention
that the only valid lane for the clock is #7. I don't know if it is
preferred to enforce the restriction in the driver, yaml or both.
> for (i = 0; i < c->num_data; i++)
> val |= BIT(c->data[i].pos * 2);
>
> @@ -349,7 +478,8 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
> if (csiphy->camss->version == CAMSS_8x16 ||
> csiphy->camss->version == CAMSS_8x96)
> csiphy_gen1_config_lanes(csiphy, cfg, settle_cnt);
> - else if (csiphy->camss->version == CAMSS_845)
> + else if (csiphy->camss->version == CAMSS_845 ||
> + csiphy->camss->version == CAMSS_8250)
> csiphy_gen2_config_lanes(csiphy, settle_cnt);
>
> /* IRQ_MASK registers - disable all interrupts */
With the above issues fixed;
Reviewed-by: Robert Foss <robert.foss@linaro.org>
next prev parent reply other threads:[~2021-05-19 16:27 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-11 18:07 [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Jonathan Marek
2021-05-11 18:07 ` [PATCH 01/17] media: camss: csiphy-3ph: don't print HW version as an error Jonathan Marek
2021-05-19 10:16 ` Robert Foss
2021-05-11 18:07 ` [PATCH 02/17] media: camss: csiphy-3ph: disable interrupts Jonathan Marek
2021-05-19 15:52 ` Robert Foss
2021-05-11 18:07 ` [PATCH 03/17] media: camss: csiphy-3ph: add support for SM8250 CSI DPHY Jonathan Marek
2021-05-19 16:26 ` Robert Foss [this message]
2021-05-25 17:19 ` Andrey Konovalov
2021-05-25 17:35 ` Andrey Konovalov
2021-05-11 18:07 ` [PATCH 04/17] media: camss: csid-170: fix non-10bit formats Jonathan Marek
2021-05-20 10:31 ` Robert Foss
2021-05-25 18:15 ` Andrey Konovalov
2021-05-25 18:38 ` Jonathan Marek
2021-05-26 13:59 ` Andrey Konovalov
2021-05-11 18:07 ` [PATCH 05/17] media: camss: csid-170: don't enable unused irqs Jonathan Marek
2021-05-20 10:39 ` Robert Foss
2021-05-11 18:07 ` [PATCH 06/17] media: camss: csid-170: remove stray comment Jonathan Marek
2021-05-20 10:57 ` Robert Foss
2021-05-11 18:07 ` [PATCH 07/17] media: camss: csid-170: support more than one lite vfe Jonathan Marek
2021-05-20 11:54 ` Robert Foss
2021-05-11 18:07 ` [PATCH 08/17] media: camss: csid-170: set the right HALF_CMD when disabled Jonathan Marek
2021-05-20 11:10 ` Robert Foss
2021-05-11 18:07 ` [PATCH 09/17] media: camss: csid: allow csid to work without a regulator Jonathan Marek
2021-05-20 12:14 ` Robert Foss
2021-05-11 18:07 ` [PATCH 10/17] media: camss: remove vdda-csiN from sdm845 resources Jonathan Marek
2021-05-31 11:02 ` Robert Foss
2021-05-11 18:07 ` [PATCH 11/17] media: camss: fix VFE irq name Jonathan Marek
2021-05-31 11:03 ` Robert Foss
2021-05-11 18:07 ` [PATCH 12/17] media: camss: vfe-170: clean up some dead code Jonathan Marek
2021-05-31 11:11 ` Robert Foss
2021-05-11 18:07 ` [PATCH 13/17] media: camss: vfe-170: fix "VFE halt timeout" error Jonathan Marek
2021-05-31 11:13 ` Robert Foss
2021-05-11 18:07 ` [PATCH 14/17] media: camss: Add initial support for VFE hardware version Titan 480 Jonathan Marek
2021-05-31 12:13 ` Robert Foss
2021-06-08 23:08 ` Jonathan Marek
2021-06-09 15:06 ` Robert Foss
2021-05-11 18:07 ` [PATCH 15/17] media: camss: add support for V4L2_PIX_FMT_GREY for sdm845 HW Jonathan Marek
2021-05-31 12:14 ` Robert Foss
2021-05-11 18:07 ` [PATCH 16/17] media: camss: add support for SM8250 camss Jonathan Marek
2021-05-31 16:07 ` Robert Foss
2021-05-11 18:07 ` [PATCH 17/17] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding Jonathan Marek
2021-05-12 18:35 ` Rob Herring
2021-06-08 22:34 [PATCH 00/17] CAMSS: SM8250 support (and some fixes) Jonathan Marek
2021-06-08 22:34 ` [PATCH 03/17] media: camss: csiphy-3ph: add support for SM8250 CSI DPHY Jonathan Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAG3jFytj8sgC-GW03e17RWFLhJGhMGTBpBpFBhYi3fixJuAdFg@mail.gmail.com \
--to=robert.foss@linaro.org \
--cc=agross@kernel.org \
--cc=andrey.konovalov@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=jonathan@marek.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=todor.too@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).