From patchwork Thu Feb 22 17:16:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 20808 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp86342dyb; Thu, 22 Feb 2024 09:19:28 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX6quTcqlnMvAYrdfXFhHMlHfWQibeg+Vno9tIN/1Zs/raLF7HhWBRgG0Nkwo3V/4TO7KGFtuuqq+ciFE4J29MPedrkrw== X-Google-Smtp-Source: AGHT+IHgQURBvqSW4wJM8ValDGk3mjKyiE8+LcEVMAvcdutezbgftW1fpR4e0dzUQl/4MMO3eJUR X-Received: by 2002:a17:902:e80b:b0:1dc:e6d:a403 with SMTP id u11-20020a170902e80b00b001dc0e6da403mr11153071plg.32.1708622368374; Thu, 22 Feb 2024 09:19:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708622368; cv=pass; d=google.com; s=arc-20160816; b=LxM/nwwWOYdXmnPpc2NWGuOzXI5nunfRq+RIDMH6YGMSTKYsfTgecGGM7MxhA/xPmO 7RqlcNXO85PNf7orGLV0NGMYoRrJfINJSXIW3JLlv/LB5plEIWOSZQL8aFyCuTQBi6pA DMxsVoaRAQg3QTB9yiq3bF2CPt7p3sR+MgayS031gWahP0XpxvrvbSsqi4Qc1AgRWZXP oo6/b4hWR0A14ldr2LCIrcLGNMHwSSPGbxhLMPUd/lDyAUeyX30DR3aZrWED/ZPfYJBr lGZLyfWj7qv+uBXnQ6bqurq0QT8PY0DSrTsg5Rv9Si+MvzJ0qtspl67/9iGakzqASALR U05w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:from :dkim-signature; bh=Hty7Q8TdVcE5cj7rf2bC8mc3p4rUC33JHE6Y9JSzuwI=; fh=/j9YwSHBGqBPF3IeCmFTghOIDojeOiRmH3tRFceexqo=; b=OJesomNGe7fgPbGUOfzEKlQjmblzCD+VoBm4CeoTU/8lUTSZYMWuFFG25l2343FRYG tPSacUne2AaPBHDT1qvkEdc207M4k22g44tamLU+ZMlU167yPstu1ao+qK1lv5ueYElV TydRLkPuBohfqsE1ryCQFLC28wlA33gFQ8nSia9/OaRznm7MBF2B9R4UT73R/6ynDxSh 0lf8zBTOT1U4X8f7FAVE0/+jj/lcxuffAyPdPzm9d1PAVXQu2dIhUlkfJZ9P/1aQSb+1 WjN/WFVw9QNl8Ai80ZaEEFGBJu+As66MFJEMAtVGxd9bJbbnmaVwxBRmxn+fiV+hJeoQ +llQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iNoUCLzj; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-76958-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76958-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w7-20020a170902e88700b001dc2d9a3328si3967845plg.398.2024.02.22.09.19.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 09:19:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76958-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iNoUCLzj; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-76958-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76958-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C7CC5289A38 for ; Thu, 22 Feb 2024 17:17:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D179B155A21; Thu, 22 Feb 2024 17:17:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="iNoUCLzj" Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61AFF154437 for ; Thu, 22 Feb 2024 17:17:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708622229; cv=none; b=p3cJh/2IRX9jGx+ic1wJYeyvkqRdVSAr+ks8EPgyUMAVw53Kc3Iie7hGUR8QUSQfARonfNqmnxuciU7gRlCavyR+HUrmfYL4nLSen3iQHr+9WwQxAzyFyZz+jO17O+VV96fCfwsecyFDYYu35gVv8eR/MQHWO8yGgHtA3xuYZMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708622229; c=relaxed/simple; bh=Z9TW01ieGheVvSYGj35+wS9k2elxysGt636MZCOr0HM=; h=From:Subject:Date:Message-Id:MIME-Version:Content-Type:To:Cc; b=bZgYpZmMzLJQsf0DNpfkEaG5dI7VQwG1ihcyRprNkoD8KGStMWj6DYSWMX55W3IwLBKv4xSgBpGKZKRxCy71dq1kDsVnh4bnkGIQ74qdwU6keGh2CqedpUzSuhewaGXIYtS6FeYKvtlJ36cjxLFkj7GyRogxwb8S8C3Qlv7hq6g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=iNoUCLzj; arc=none smtp.client-ip=209.85.208.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2d1094b5568so242401fa.1 for ; Thu, 22 Feb 2024 09:17:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708622225; x=1709227025; darn=vger.kernel.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=Hty7Q8TdVcE5cj7rf2bC8mc3p4rUC33JHE6Y9JSzuwI=; b=iNoUCLzjE98kmZzEVJnjRakmNWsCPq9CDLfvGwkxSLtfWWvl2WAqGXZ8HCaxzq1Yze 5IW5LO1ZSQwjWX58jMrlbIw3aJSgS5n5Y2XE8FRY9d9X4zbyHgXgr+jYfdu/MgbXAX8/ VsnQG/rzPOqAJBP9ny/OMbkkw0AVpHP4h7M+Muv2k0GJ1z9t1fguePxqii33ijyMoDLO 3DNe0nMHrszP6q49BzCZXLnaCarwdl600Sd8565ilBSgsYKIu50qJN1klJBnX4UlH5il FmC6OY3hGdjugFHOeAMAD45zRMFdT3C8bydpTCnrAs5xwR98cvs624OMl8EDpWymMw1q 2kXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708622225; x=1709227025; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hty7Q8TdVcE5cj7rf2bC8mc3p4rUC33JHE6Y9JSzuwI=; b=DfuIZn9rF8ZeVNK+4xQDvQVUn28hYjnU6Lg4Iz7Bft3sxrEoJQohK5pI26DkLw0X8k SCdgHn6AHnz/NMqt9X5axBo+JDeMEA5ijdOfeVtWT7lrDVw4dpxpofTOSZbIP/AUJmkR 1PdaPaE4oZtlAmNXh+Ok0ODkB7SEr8bUT5WNqGY4CSZtf75UdjgN8KCNe39rrbJID9Hr KQkrzMp5gBw3sW77sCi7nSkSNYEamOxldV4jlRnz29UWaPNNxwPFbwd+fwHkbEO6DcaZ h7pOHxRIfqg+dZjdvxt2nJ4jg0V3PCM7wuFsBIAiZq4zjSK7AkO5f4n4zf+hINfZPyuz cx9Q== X-Forwarded-Encrypted: i=1; AJvYcCXLdUBpCL7h8AhIEVPoXjYrk/nVomzbiE+KZSW3og8fCYUsHnUYt4copFebaxanumOwpOTWQ+R0d4hobzD0gE403/UOyzgPXHiG+gPU X-Gm-Message-State: AOJu0YyQLPbkDIUWg7dbpIX6PpSMggWbQWKUPzaNgY0CcscHjzFEvx6M akDq+1sbMnUWLWkrJJezSm0UJDh2gRJjXKCrQPAFOXKEmIW5ceXp9KL+X9Qf0Iw= X-Received: by 2002:a2e:a272:0:b0:2d2:4388:63fc with SMTP id k18-20020a2ea272000000b002d2438863fcmr6008642ljm.44.1708622225561; Thu, 22 Feb 2024 09:17:05 -0800 (PST) Received: from [127.0.1.1] ([176.61.106.68]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b0040fe4b733f4sm6656512wmc.26.2024.02.22.09.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 09:17:05 -0800 (PST) From: Bryan O'Donoghue Subject: [PATCH v6 0/6] media: qcom: camss: Add sc8280xp support Date: Thu, 22 Feb 2024 17:16:58 +0000 Message-Id: <20240222-b4-camss-sc8280xp-v6-0-0e0e6a2f8962@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAIqB12UC/23OwYoCMQyA4VeRnu2SpqnTevI9lj20tdHCOiOtD C4y775VWJjFHv9AvuQhaio5VbHfPERJc655GlvsthsRz348JZmPrQUCaqVAyUAy+kutskaLFu5 XCUkFp1JAFVi0vWtJnO8v8/Or9TnX21R+Xidm9Zz+adjRZiVBOud2TCEGy3T4zqMv08dUTuLJz bgmdI/ARoTBMx3RaI/wRug1YXqEbgQFHfWAzND5gtaE6xHUCGO9sSEiALs3wqwIBT3CNGJgcjT EaFy0/4hlWX4B+zwe8b8BAAA= To: hverkuil-cisco@xs4all.nl, laurent.pinchart@ideasonboard.com, Andy Gross , Bjorn Andersson , Konrad Dybcio , Robert Foss , Todor Tomov , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , vincent.knecht@mailoo.org, matti.lehtimaki@gmail.com, quic_grosikop@quicinc.com Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Krzysztof Kozlowski X-Mailer: b4 0.13-dev-4e032 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791620408420115164 X-GMAIL-MSGID: 1791620408420115164 V6: - Add of camss.yaml passes on linux-stable/master as at commit: ff93872a9c61 ("clk: qcom: camcc-sc8280xp: Add sc8280xp CAMCC") - Fixed IFE/VFE comment discongruity - Konrad - Per my explaination I don't propose to change IFE/VFE naming since they are the same thing. SFE blocks should be named SFE though, not IFE/VFE - Referring to Konrad's other comments on IFE/VFE naming https://lore.kernel.org/all/9a13471b-fc39-4081-8905-9d0d7c28b501@linaro.org/#t The next two changes I intend not covered in this SoC series a) Completing the conversion to named power-domains b) Camera NOC => OPPs for the camera NoC Not covered in this series though. Link to v5: https://lore.kernel.org/r/20231110-b4-camss-sc8280xp-v5-0-7f4947cc59c8@linaro.org Link to tree: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/b4/camss-sc8280xp-v6 Bootable: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/sc8280xp-v6.8-rc4-camss?ref_type=heads V5: - Fixes the lower case 0x0c to 0x0C not sure how Konrad even saw this. - Drops frequency table to just individual frequencies not full array of opps - Konrad - As explained doesn't change the finding of frequencies. Current array size will ensure testing if (freq[x]) succeeds though I do agree this should be changed up. Plan to restructure struct params for specificity to VFE, CSID and will incorporate this change then. Link: https://lore.kernel.org/all/e80d4026-a525-48ef-b53a-f1276dd316e6@linaro.org - Reset sequence Right now the reset works. I agree qcom's downstream has more stuff in it. I've logged a task to evaluate expansion of the reset and to test across multiple platforms. For now not required for this drop. - _src clocks One assumes the reason at some stage in time we didn't have SET_PARENT in our CAMCC which meant setting _src clocks was necessary. In any case it ought not to be necessary now. Removing the _src from existing platforms should be trivial however we might find that as a result some of the CAMCC drivers need to be updated. That obviously is a separate series. Link to v4: https://lore.kernel.org/r/20231109-b4-camss-sc8280xp-v4-0-58a58bc200f9@linaro.org Link to tree: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/b4/camss-sc8280xp-v5 V4: - Drops all _src clocks and _SRC indexes in series. True enough the CAMCC driver has all of the appropriate SET_PARENT flags so there's no need to represent _src clocks. - Konrad - I've opted not to split C-PHY and D-PHY init sequences up unless/until we have a C-PHY init sequence upstream. - bod/Konrad - b4 trailes --update -> + Konrad's Acks Link to v3: https://lore.kernel.org/r/20231105-b4-camss-sc8280xp-v3-0-4b3c372ff0f4@linaro.org Link to tree: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/b4/camss-sc8280xp-v4 V3: - Strip pointer to dependencies from yaml patch I was hoping the robot would understand the links but it doesn't - Krzysztof Link to v2: https://lore.kernel.org/r/20231103-b4-camss-sc8280xp-v2-0-b7af4d253a20@linaro.org b4 base: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/b4/camss-sc8280xp-v3 V2: - Rebase to capture is_lite flag from named power-domain series - Amends commit log of final patch to give more detail on rename - Konrad - Opted not to change switch() statements with returns. - bod/Konrad Requires CAMCC for sc8280xp which applies to qcom/clk-for-6.7: https://lore.kernel.org/linux-arm-msm/20231026105345.3376-1-bryan.odonoghue@linaro.org/ b4 shazam 20231026105345.3376-1-bryan.odonoghue@linaro.org Requires the named power-domain patches which apply to media-tree/*: https://lore.kernel.org/linux-arm-msm/20231103-b4-camss-named-power-domains-v4-0-33a905359dbc@linaro.org/ b4 shazam e700133b-58f7-4a4d-8e5c-0d04441b789b@linaro.org Link to v1: https://lore.kernel.org/r/20231102-b4-camss-sc8280xp-v1-0-9996f4bcb8f4@linaro.org b4 base: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/b4/camss-sc8280xp-v2 V1: sc8280xp is the SoC found in the Lenovo X13s. This series adds support to bring up the CSIPHY, CSID, VFE/RDI interfaces. A number of precursor patches make this series smaller overall than previous series. sc8280xp provides - 4 x VFE, 4 RDI per VFE - 4 x VFE Lite, 4 RDI per VFE - 4 x CSID - 4 x CSID Lite - 4 x CSI PHY I've taken the yaml from a dtsi series and included it here since 1) I sent the yaml to the wrong person and 2) it already has RB from Krzysztof. Requires CAMCC for sc8280xp which applies to qcom/clk-for-6.7: https://lore.kernel.org/linux-arm-msm/20231026105345.3376-1-bryan.odonoghue@linaro.org/ b4 shazam 20231026105345.3376-1-bryan.odonoghue@linaro.org Requires the named power-domain patches which apply to media-tree/* : https://lore.kernel.org/linux-arm-msm/20231101-b4-camss-named-power-domains-v3-5-bbdf5f22462a@linaro.org/ b4 shazam 20231101-b4-camss-named-power-domains-v3-5-bbdf5f22462a@linaro.org To use the camera on x13s with say Google Hangouts or Microsoft Teams you will need to 1. Run Firefox 2. Update about:config to enable pipewire 3. Use this WIP version of libcamera https://gitlab.freedesktop.org/camera/libcamera-softisp A working bootable tree can be found here: Link: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/lenovo-x13s-linux-6.5.y b4 base: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/b4/camss-sc8280xp Signed-off-by: Bryan O'Donoghue --- Bryan O'Donoghue (6): media: dt-bindings: media: camss: Add qcom,sc8280xp-camss binding media: qcom: camss: csiphy-3ph: Add Gen2 v1.1 two-phase MIPI CSI-2 DPHY init media: qcom: camss: Add CAMSS_SC8280XP enum media: qcom: camss: Add sc8280xp resources media: qcom: camss: Add sc8280xp support media: qcom: camss: vfe-17x: Rename camss-vfe-170 to camss-vfe-17x .../bindings/media/qcom,sc8280xp-camss.yaml | 512 +++++++++++++++++++++ drivers/media/platform/qcom/camss/Makefile | 2 +- .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 108 ++++- drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + .../camss/{camss-vfe-170.c => camss-vfe-17x.c} | 0 drivers/media/platform/qcom/camss/camss-vfe.c | 25 +- drivers/media/platform/qcom/camss/camss-video.c | 1 + drivers/media/platform/qcom/camss/camss.c | 307 ++++++++++++ drivers/media/platform/qcom/camss/camss.h | 1 + 9 files changed, 948 insertions(+), 9 deletions(-) --- base-commit: e31185ce00a96232308300008db193416ceb9769 change-id: 20231101-b4-camss-sc8280xp-0e1b91eb21bf Best regards,