Re: [PATCH v10 3/5] media: qcom: camss: csiphy: Add support for v2.4.0 two-phase CSIPHY

[Bryan O'Donoghue]

On 11/12/2025 12:03, Hangxiang Ma wrote:
> Add more detailed resource information for CSIPHY devices in the camss
> driver along with the support for v2.4.0 in the 2 phase CSIPHY driver
> that is responsible for the PHY lane register configuration, module
> reset and interrupt handling.
>
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
> Signed-off-by: Hangxiang Ma <hangxiang.ma@xxxxxxxxxxxxxxxx>

I'm giving up on this series, please rebase.

╰─$ git apply --3way < /tmp/\[PATCH\ v10\ 3_5\]\ media:\ qcom:\ camss:\ 
csiphy:\ Add\ support\ for\ v2.4.0\ two-phase\ CSIPHY\ -\ Hangxiang\ Ma\ 
\<hangxiang.ma@xxxxxxxxxxxxxxxx\>\ -\ 2025-12-11\ 1203.eml
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
error: patch failed: 
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c:588
error: drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c: patch 
does not apply
error: patch failed: drivers/media/platform/qcom/camss/camss.c:34
Falling back to direct application...
error: patch failed: drivers/media/platform/qcom/camss/camss.c:34
error: drivers/media/platform/qcom/camss/camss.c: patch does not apply

╭─deckard@sagittarius-a 
~/Development/worktree/merges/media-committers-next-qcom ‹knp-test●›
╰─$ git-log-graph 
 
                                    1 ↵
* 84de87a909327 - (HEAD -> knp-test) media: qcom: camss: Add Kaanapali 
compatible camss driver (62 seconds ago)
* d6a22e0ea1d47 - media: dt-bindings: Add CAMSS device for Kaanapali (70 
seconds ago)
* 336367fab9b96 - (media-committers/next, media-committers/HEAD) media: 
chips-media: wave5: Fix Potential Probe Resource Leak (4 days ago)