From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 6673C1BDA85 for ; Thu, 31 Oct 2024 17:58:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397542; cv=none; b=S3soa2YH5Qb5a2weDfqIof+CzVYKWYdSLX+k7JanhYWUVIUQY801ORzcRJ3FcsFvO56KQI3gbLHoIXfCQhVGOuYFD3l2L6iZdsyVJnBNfuzV9DMvn/hdKzhKH21nvvYsEdkw7N0aK+VYgBuVV7B9sNDAGVHgkxh5NbGvsv5Q0Fk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397542; c=relaxed/simple; bh=VcPhg/lN+FcqsNlnQk/AR8TKjXox62BIIeVmO1/jB5Q=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=nBunwveZ1DxBk5PY5DhYUGPEioR1bZBDpm8PX4aXBiq8TTfhICj6xcag6GXa0guSPRPAo+4HMxfdX1r3gRWJ0dTjepUKu0jW5GO28NBuCYkJLB4Td8403TOLIDzwh/33yCg2vgzeierK6qUw6/CiKH4u4T/AmOrskngKcBQSBgY= 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=HZJffybf; arc=none smtp.client-ip=209.85.128.51 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HZJffybf" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4316a44d1bbso10672465e9.3 for ; Thu, 31 Oct 2024 10:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730397538; x=1731002338; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=VuifK9ssbByZoxkDSJx5oYjnqJDuMVfVzL90tw7nJak=; b=HZJffybfshMryuHJM1vW8oQdxOYOaDpAB5HCdwvmq/P/IIDn/9SYfoTRq9DLPNJgjD mimxTGbn1gLTxG4f9K/iFBNvLa01NCXAqQqYWEjQEHZ+fKYt48ww4FshYy/GDLZv/Igu 1q/G2J7+HhPuQuduVgmaKQGu77RnYOKFBORTV69Zueipw/uqMwcQc9t9kIs2NiNoBTWo urEwUEdS/j9eX7CGrO70EH784niZHoe2nhcpJ37oghOWoVmWSMxGE4D/Wg3sLERAF/u1 Tsuou8kZ4P3LhcKFIMQjECDmNjuAe7LInpaRwJCPeiQOFXO7bEb0nswURvQqOrCwOOlZ F5cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730397538; x=1731002338; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VuifK9ssbByZoxkDSJx5oYjnqJDuMVfVzL90tw7nJak=; b=l7cU/Aqls0bR1RMz1oeG3h6sPKmU7AhICVT2exgwVh6V/05ZjfzL3XFyGmybdxh3MV hkLvUJ/nJNZn6cmUJLBWqDWOh3yF7hqsOdTDE63JDcAzb1f0zqs/wp7ARr77bkOorc70 MQjEjZXKAmKiU6jqtdDDuc2euS6RG4U+/lYSqiyH7HDfqdT+urLzZGea8kY4/TGyOhxP 57u3VT/hD3gX7Az2mftFDcKEmD1jJrc4cy48+qg9YYrZAuYaZLoKDHwOxF6L2YSCFGyq sGRQawaUq2sF1CvINyKj2wsXB1Ss6Ys/I+SJubneXgW09u5GHeveOKUPCTJf6RdW86qs nUVw== X-Forwarded-Encrypted: i=1; AJvYcCV+PIPmOlytawWIKCdCXaDAPH9mgTCEU/1xfe0bZg8TzVxAOt/u3StsutgPrFoC6dcnSZyO9S1rJTB6nQo=@vger.kernel.org X-Gm-Message-State: AOJu0YzC2NvLGPPamEalOMbFa5ztLTjqtsREY/rJe8YEx3EfZ9Dd2QYJ YfFi8evabNVhZzTCtHgAnRH5RK8GckE+WaZO8LX2aDWsRaGXeplELSzh8rrIVQM= X-Google-Smtp-Source: AGHT+IHVFS3EEahXMmwf1uXc498PntDJFpAi99I26Hiqrk9r31i5G0llOXVhvkN/yJFqVWGq3yU2SA== X-Received: by 2002:a05:6000:4013:b0:37d:4517:acdb with SMTP id ffacd0b85a97d-381be783511mr3580290f8f.20.1730397537669; Thu, 31 Oct 2024 10:58:57 -0700 (PDT) Received: from [192.168.0.17] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c113e856sm2777954f8f.87.2024.10.31.10.58.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 31 Oct 2024 10:58:57 -0700 (PDT) Message-ID: Date: Thu, 31 Oct 2024 17:58:55 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 3/6] media: qcom: camss: Add support for camss driver on SC7280 To: Vikram Sharma , rfoss@kernel.org, todor.too@gmail.com, mchehab@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, akapatra@quicinc.com, hariramp@quicinc.com, andersson@kernel.org, konradybcio@kernel.org, hverkuil-cisco@xs4all.nl, cros-qcom-dts-watchers@chromium.org, catalin.marinas@arm.com, will@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@quicinc.com References: <20241030105347.2117034-1-quic_vikramsa@quicinc.com> <20241030105347.2117034-4-quic_vikramsa@quicinc.com> Content-Language: en-US From: Bryan O'Donoghue In-Reply-To: <20241030105347.2117034-4-quic_vikramsa@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 30/10/2024 10:53, Vikram Sharma wrote: > From: Suresh Vankadara > > Add support for the camss driver on the SC7280 SoC. > > Signed-off-by: Suresh Vankadara > Signed-off-by: Trishansh Bhardwaj > Signed-off-by: Vikram Sharma > --- > .../media/platform/qcom/camss/camss-csid.c | 1 - > .../qcom/camss/camss-csiphy-3ph-1-0.c | 5 + > .../media/platform/qcom/camss/camss-csiphy.c | 5 + > .../media/platform/qcom/camss/camss-csiphy.h | 1 + > drivers/media/platform/qcom/camss/camss-vfe.c | 2 + > drivers/media/platform/qcom/camss/camss.c | 339 ++++++++++++++++++ > drivers/media/platform/qcom/camss/camss.h | 1 + > 7 files changed, 353 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c > index 858db5d4ca75..8d3dc26e2af4 100644 > --- a/drivers/media/platform/qcom/camss/camss-csid.c > +++ b/drivers/media/platform/qcom/camss/camss-csid.c > @@ -1028,7 +1028,6 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid, > csid->res->hw_ops->subdev_init(csid); > > /* Memory */ > - Extraneous deletion. > if (camss->res->version == CAMSS_8250) { > /* for titan 480, CSID registers are inside the VFE region, > * between the VFE "top" and "bus" registers. this requires > 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 7d2490c9de01..f341f7b7fd8a 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 > @@ -505,6 +505,10 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy, > u32 val; > > switch (csiphy->camss->res->version) { > + case CAMSS_7280: > + r = &lane_regs_sm8250[0][0]; > + array_size = ARRAY_SIZE(lane_regs_sm8250[0]); > + break; > case CAMSS_8250: > r = &lane_regs_sm8250[0][0]; > array_size = ARRAY_SIZE(lane_regs_sm8250[0]); > @@ -557,6 +561,7 @@ static bool csiphy_is_gen2(u32 version) > bool ret = false; > > switch (version) { > + case CAMSS_7280: > case CAMSS_8250: > case CAMSS_8280XP: > case CAMSS_845: > diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c > index 68a3ea1ba2a5..9722cee4143f 100644 > --- a/drivers/media/platform/qcom/camss/camss-csiphy.c > +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c > @@ -108,6 +108,11 @@ const struct csiphy_formats csiphy_formats_sdm845 = { > .formats = formats_sdm845 > }; > > +const struct csiphy_formats csiphy_formats_sc7280 = { > + .nformats = ARRAY_SIZE(formats_sdm845), > + .formats = formats_sdm845 > +}; > + > /* > * csiphy_get_bpp - map media bus format to bits per pixel > * @formats: supported media bus formats array > diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h > index eebc1ff1cfab..67a96ef55bb6 100644 > --- a/drivers/media/platform/qcom/camss/camss-csiphy.h > +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h > @@ -112,6 +112,7 @@ void msm_csiphy_unregister_entity(struct csiphy_device *csiphy); > extern const struct csiphy_formats csiphy_formats_8x16; > extern const struct csiphy_formats csiphy_formats_8x96; > extern const struct csiphy_formats csiphy_formats_sdm845; > +extern const struct csiphy_formats csiphy_formats_sc7280; > > extern const struct csiphy_hw_ops csiphy_ops_2ph_1_0; > extern const struct csiphy_hw_ops csiphy_ops_3ph_1_0; > diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c > index ffcb1e2ec417..61f6815a3756 100644 > --- a/drivers/media/platform/qcom/camss/camss-vfe.c > +++ b/drivers/media/platform/qcom/camss/camss-vfe.c > @@ -334,6 +334,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code, > } > break; > case CAMSS_660: > + case CAMSS_7280: > case CAMSS_8x96: > case CAMSS_8250: > case CAMSS_8280XP: > @@ -1692,6 +1693,7 @@ static int vfe_bpl_align(struct vfe_device *vfe) > int ret = 8; > > switch (vfe->camss->res->version) { > + case CAMSS_7280: > case CAMSS_8250: > case CAMSS_8280XP: > case CAMSS_845: > diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c > index e8cd8afe7bee..addaed8f77cb 100644 > --- a/drivers/media/platform/qcom/camss/camss.c > +++ b/drivers/media/platform/qcom/camss/camss.c > @@ -1480,6 +1480,330 @@ static const struct resources_icc icc_res_sc8280xp[] = { > }, > }; > > +static const struct camss_subdev_resources csiphy_res_7280[] = { > + /* CSIPHY0 */ > + { > + .regulators = {}, > + .clock = { "csiphy0", "csiphy0_timer"}, > + .clock_rate = { > + { 300000000 }, > + { 300000000 } > + }, > + .reg = { "csiphy0" }, > + .interrupt = { "csiphy0" }, > + .csiphy = { > + .hw_ops = &csiphy_ops_3ph_1_0, > + .formats = &csiphy_formats_sc7280 > + } > + }, > + /* CSIPHY1 */ > + { > + .regulators = {}, > + .clock = { "csiphy1", "csiphy1_timer"}, > + .clock_rate = { > + { 300000000 }, > + { 300000000 } > + }, > + .reg = { "csiphy1" }, > + .interrupt = { "csiphy1" }, > + .csiphy = { > + .hw_ops = &csiphy_ops_3ph_1_0, > + .formats = &csiphy_formats_sc7280 > + } > + }, > + /* CSIPHY2 */ > + { > + .regulators = {}, > + .clock = { "csiphy2", "csiphy2_timer"}, > + .clock_rate = { > + { 300000000 }, > + { 300000000 } > + }, > + .reg = { "csiphy2" }, > + .interrupt = { "csiphy2" }, > + .csiphy = { > + .hw_ops = &csiphy_ops_3ph_1_0, > + .formats = &csiphy_formats_sc7280 > + } > + }, > + /* CSIPHY3 */ > + { > + .regulators = {}, > + .clock = { "csiphy3", "csiphy3_timer"}, > + .clock_rate = { > + { 300000000 }, > + { 300000000 } > + }, > + .reg = { "csiphy3" }, > + .interrupt = { "csiphy3" }, > + .csiphy = { > + .hw_ops = &csiphy_ops_3ph_1_0, > + .formats = &csiphy_formats_sc7280 > + } > + }, > + /* CSIPHY4 */ > + { > + .regulators = {}, > + .clock = { "csiphy4", "csiphy4_timer"}, > + .clock_rate = { > + { 300000000 }, > + { 300000000 } > + }, > + .reg = { "csiphy4" }, > + .interrupt = { "csiphy4" }, > + .csiphy = { > + .hw_ops = &csiphy_ops_3ph_1_0, > + .formats = &csiphy_formats_sc7280 > + } > + }, > +}; > + > +static const struct camss_subdev_resources csid_res_7280[] = { > + /* CSID0 */ > + { > + .regulators = { "vdda-phy", "vdda-pll" }, > + > + .clock = { "csi0", "vfe0_cphy_rx", "vfe0", "soc_ahb"}, csi0 should probably be named vfe0_csid, same with the other csiX clocks here. 7280 is similar/derived from 8250 so the naming convention should be followed. > + .clock_rate = { > + { 300000000, 0, 380000000, 0}, > + { 400000000, 0, 510000000, 0}, > + { 400000000, 0, 637000000, 0}, > + { 400000000, 0, 760000000, 0} > + }, > + > + .reg = { "csid0" }, > + .interrupt = { "csid0" }, > + .csid = { > + .is_lite = false, > + .hw_ops = &csid_ops_gen2, > + .parent_dev_ops = &vfe_parent_dev_ops, > + .formats = &csid_formats_gen2 > + } > + }, > + /* CSID1 */ > + { > + .regulators = { "vdda-phy", "vdda-pll" }, > + > + .clock = { "csi1", "vfe1_cphy_rx", "vfe1", "soc_ahb"}, > + .clock_rate = { > + { 300000000, 0, 380000000, 0}, > + { 400000000, 0, 510000000, 0}, > + { 400000000, 0, 637000000, 0}, > + { 400000000, 0, 760000000, 0} > + }, > + > + .reg = { "csid1" }, > + .interrupt = { "csid1" }, > + .csid = { > + .is_lite = false, > + .hw_ops = &csid_ops_gen2, > + .parent_dev_ops = &vfe_parent_dev_ops, > + .formats = &csid_formats_gen2 > + } > + }, > + /* CSID2 */ > + { > + .regulators = { "vdda-phy", "vdda-pll" }, > + > + .clock = { "csi2", "vfe2_cphy_rx", "vfe2", "soc_ahb"}, > + .clock_rate = { > + { 300000000, 0, 380000000, 0}, > + { 400000000, 0, 510000000, 0}, > + { 400000000, 0, 637000000, 0}, > + { 400000000, 0, 760000000, 0} > + }, > + > + .reg = { "csid2" }, > + .interrupt = { "csid2" }, > + .csid = { > + .is_lite = false, > + .hw_ops = &csid_ops_gen2, > + .parent_dev_ops = &vfe_parent_dev_ops, > + .formats = &csid_formats_gen2 > + } > + }, > + /* CSID3 */ > + { > + .regulators = { "vdda-phy", "vdda-pll" }, > + > + .clock = { "csi3", "vfe0_lite_cphy_rx", "vfe0_lite", "soc_ahb"}, As with 8250 I'd expect "lite" to appear in the clock name When fixed please add. Reviewed-by: Bryan O'Donoghue --- bod