From nobody Tue Apr 7 01:18:36 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE0023A542B for ; Tue, 17 Mar 2026 10:06:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773741970; cv=none; b=ioEIYwXL4dqLM+oouv2257TJX0kSMLHNSiiWBGUPD2ESe+uGg1xULnVK5WNIRoVsfNpRxqdNLfTu3Kt3V9GsXEreh8dCpen94zdJiY2PB4R7LqLIaCtKm6mzhCJK+PGY+APhGN4XYY4M84+3kFcFcHe+I8z5gD8a51FiFZkRVnk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773741970; c=relaxed/simple; bh=I0ecq1STikLraCQb155YIuV1t+JFsngrrzfAKTkbhz4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g25fOW2p8vWEJ3bneNStElGUwLQRmpcAmhXOr85zvRERnGGDlnRp2C2+aW/9GyN/hWbtCENdfMBHS+o3smZd/MsKD2pmCBK3XAW847eDGtTmhF6EQ9JfoYXeuQBsk0uOOPs6gF7FVlc10m3Y9LbO4NwDZXsZZH0Vn0ZGqlrE3u4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ehZ09NiQ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=XS4+DlSB; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ehZ09NiQ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="XS4+DlSB" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62H7PTGa3295277 for ; Tue, 17 Mar 2026 10:06:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= oYWrpozo6WX+xoPZB8Q6oxC4VHt2IErWR9xWnUjGoGg=; b=ehZ09NiQ3/u5oKIN 78b2rD+VrILlduzxVqY+FKM5mhNEsk5gXFGbgs72dTnMcI7U532rr0qDFKaFQEXc NlhCROFuRo2xj4kGXeO/bDHx6bieWsVxcggG0Os6qoCqpxPdMcA/5qb/qBYnRe0X nArhy5YbRIJwXRb9RfaKvBVzoMvRTIAXt5pxs8EIqp71wiMiN3ApKuFL13au7bp1 LGQ/9fpt5uufKp/iqqtitkmW0+qK98LdLVJlQhu3p9iSRLTH4BRXuw0RXNkEs0DZ I7JKvO+z54GcQ9o2lPxQCuiHUnn9wQ6VTCvVvh4l9jkDcsmboHfzx2RkexMwvPmI q146jA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxkuy3h3k-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 17 Mar 2026 10:06:06 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd722c1a69so358892085a.0 for ; Tue, 17 Mar 2026 03:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773741966; x=1774346766; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oYWrpozo6WX+xoPZB8Q6oxC4VHt2IErWR9xWnUjGoGg=; b=XS4+DlSB05GyDhkqtWXhPKQu+ueCaxL21xodreWEdG7uC2MFGcC7KqbB9DFllpvmo+ bwPJ3BUy817ix55hlh94ZzSTYoXDLkbZF22LDVabhVPHXhckE7+oo3xCYBBZFgqyRZQT Jjd19QHBOjzI35rA5mGw7H6AKSJ3cVBHTS+23a2XBdeN1mR+yS59BnYuL1xyO9exnTZt IEZYD1tds3odKvZxbSZKODqHRwHHPJMw6wwhi0UosG4jpngj2iD7n+QStHj0hYOHz3ht 3S2oY1M4SassYqVYDSqhM7Jf4LQ8E5MdszQkicbe1b4zwHdOXhD43MfM0DgX6pF2kAsN h0ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773741966; x=1774346766; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=oYWrpozo6WX+xoPZB8Q6oxC4VHt2IErWR9xWnUjGoGg=; b=NUwCplCtWNEqiKuHg+L0n6HeQCT5IEGKjANgZmSvDWw5F59Ic+gawgM78LZX5un3fy byY/s/5VsV4bM5wQDvYyiJe6jhKwKQfVHkaJAZLXRuuXGi7d6lek7R3mbI7PtQv0ngiz wgkinAVqjfcWF3NxKZVJIxAv+sWVFHB1IK/DgdvLEfnlxhh9mOHRYKQWaX9P0d7EOfTQ DGNDzfBzbhWI7cEN7Msd6x2qZawBtdcMuoYmTCfF7OV+CHC1lzVw240Bg4dj+YPBJDZi pK7aDwTiB0Wt1WSRrdmB5A9CmslyUmE6rnENOQPYl4qopQyecBQqUf3DUXzi1umqIxEu 4dng== X-Gm-Message-State: AOJu0Yx/MqorzEkgGPe+y5TRcJY/6iCIhQH/C5FIdv5JV4u3d7QOC50W gtmR12K7Hvuo77EY5o43f0eLo1XC21b3V+6k1FD4rHLXtlMdRdr4yj8V0m21MPHpwJ2ZfcjoePs C9L1vIvpkY3pQ42ubK0hZfXju7BLOLJIW1kJV+jOOOAEeMz1cziIae2OiwZ9BkBAxakM= X-Gm-Gg: ATEYQzzOSpHenOllTayVG/fv6QGeZLlp5rMJFz8A+cUfXam7OK0C/nSqn1oX9DIQIvu XdcTO7xaCrvhRUaBozLuX3v3HphikTFJppHwWXVO/h07b3xL+uAvXv6dKMe9f/rLbqd7xRbf0VD TP1fJ7CenIFxAMLxYvrAB7PTAwc1cEZzkypYitP/JsaFuI+UWnroaZ6LIySx2Tb7ZeEk9cGLq8E OxyrHyvgXPPdUbIcPjKdVcEHdrE113xoEaFx4Ui63Nvt2ZmIcRGjfJQmcZ+aif7Tmu604+PaF0Z 3YqEK9m7Ku+p9z+9b2K93loD1u1GHoV703/a9SuuGgy4gb5FgGpTgd/xmbExeCk8YzYe1UTol67 cwxZHWwnZ0of49yMkCEPc5G3r/5G8A/nd6FmAKZhKV7a/9SjO9rSx6Zx7ZfHBU5ri2c+vaohw1J 5pAxq64rUXGyur X-Received: by 2002:a05:620a:2802:b0:8cb:2b30:1c82 with SMTP id af79cd13be357-8cdb5a9175fmr2034781085a.36.1773741965721; Tue, 17 Mar 2026 03:06:05 -0700 (PDT) X-Received: by 2002:a05:620a:2802:b0:8cb:2b30:1c82 with SMTP id af79cd13be357-8cdb5a9175fmr2034776685a.36.1773741965231; Tue, 17 Mar 2026 03:06:05 -0700 (PDT) Received: from WENMLIU-LAB01.ap.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cda1fd9d38sm1375129285a.17.2026.03.17.03.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 03:06:04 -0700 (PDT) From: Wenmeng Liu Date: Tue, 17 Mar 2026 18:05:46 +0800 Subject: [PATCH v10 2/3] media: qcom: camss: Add link support for TPG Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260317-camss_tpg-v10-2-b4cfa85c2e1b@oss.qualcomm.com> References: <20260317-camss_tpg-v10-0-b4cfa85c2e1b@oss.qualcomm.com> In-Reply-To: <20260317-camss_tpg-v10-0-b4cfa85c2e1b@oss.qualcomm.com> To: Robert Foss , Todor Tomov , Bryan O'Donoghue , Vladimir Zapolskiy , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, Wenmeng Liu X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773741952; l=8236; i=wenmeng.liu@oss.qualcomm.com; s=20250925; h=from:subject:message-id; bh=I0ecq1STikLraCQb155YIuV1t+JFsngrrzfAKTkbhz4=; b=JV7wlmETCU8Ses9ukyhfPTDshgVBMgnqQcI5EdJUso3t6QAf9VjwnlwQp2qs6nUSHjA+CMLLC VwRixHVyMLtBf3LFdogP2z7sl/O3HzVHxeF+Lu6wsF3oYC/IStNXVSk X-Developer-Key: i=wenmeng.liu@oss.qualcomm.com; a=ed25519; pk=fQJjf9C3jGDjE1zj2kO3NQLTbQEaZObVcXAzx5WLPX0= X-Authority-Analysis: v=2.4 cv=br1BxUai c=1 sm=1 tr=0 ts=69b9278e cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=4PHYSIZUFMs0VUPmZFwA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE3MDA4OSBTYWx0ZWRfXysp3uR90z4Pu TmzU2eP16hPAujBRSRLzuJi6DcZfWDokdZ65JLiFzy8/lzo1QE94tvlewkkuUf8aET/4aR1oTtZ DqIZgcD43HHX1I3zcw0SJB3xFLqSOLYqVMPKAiJmiQt8nCCypJh2mwfbSwYZeYop+gDAtD+1F0x YdSHInyqZ+VBwSyEmXJfWDGpCRhR8GADDZpRvqIf1ZP+UwFJJN9sXGd0nz1GCHt8I957Jz8+R6W sCojazkjRsRhwgzzrPylTBGMjW/UzeM2FA7fNTbJA7V06PwBynUnEgRWP3ANR5b7WHUbn1VveW/ tlCW5g5Eqt8tNqEEVpCCIyiOvvYS/r0KkVglML3nB5XZo851dR1nMP6JQbeeXcjq/48oFe4IFLh Rp1SqG0ixNonY4dVs3AK0nUZ6V1sfmc88VPYGr7Wee7Kst5kq6hvZ+wDnKPLRXw9LscyHT9GMgN moohCfmzaciNJNua5HQ== X-Proofpoint-ORIG-GUID: bcedqHd6X370P63D1zButCTYXtO0Z7ck X-Proofpoint-GUID: bcedqHd6X370P63D1zButCTYXtO0Z7ck X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-17_01,2026-03-16_06,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 phishscore=0 clxscore=1015 impostorscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603170089 TPG is connected to the csid as an entity, the link needs to be adapted. Signed-off-by: Wenmeng Liu Reviewed-by: Bryan O'Donoghue Tested-by: Bryan O'Donoghue # Dell Inpsiron14p --- drivers/media/platform/qcom/camss/camss-csid.c | 45 +++++++++++++------ drivers/media/platform/qcom/camss/camss-csid.h | 1 + drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + drivers/media/platform/qcom/camss/camss-csiphy.h | 2 + drivers/media/platform/qcom/camss/camss.c | 55 ++++++++++++++++++++= ++++ 5 files changed, 90 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media= /platform/qcom/camss/camss-csid.c index ed1820488c9878df91c173cd4ff0209dfa1e3a8c..48459b46a981bc7504cdde7d6f3= 9fcc4a1e273de 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -35,6 +35,8 @@ #define HW_VERSION_REVISION 16 #define HW_VERSION_GENERATION 28 =20 +#define LANE_CFG_BITWIDTH 4 + #define MSM_CSID_NAME "msm_csid" =20 const char * const csid_testgen_modes[] =3D { @@ -1215,18 +1217,22 @@ void msm_csid_get_csid_id(struct media_entity *enti= ty, u8 *id) } =20 /* - * csid_get_lane_assign - Calculate CSI2 lane assign configuration paramet= er - * @lane_cfg - CSI2 lane configuration + * csid_get_lane_assign - Calculate lane assign by csiphy/tpg lane num + * @lane_cfg: CSI2 lane configuration + * @num_lanes: lane num * * Return lane assign */ -static u32 csid_get_lane_assign(struct csiphy_lanes_cfg *lane_cfg) +static u32 csid_get_lane_assign(struct csiphy_lanes_cfg *lane_cfg, int num= _lanes) { u32 lane_assign =3D 0; + int pos; int i; =20 - for (i =3D 0; i < lane_cfg->num_data; i++) - lane_assign |=3D lane_cfg->data[i].pos << (i * 4); + for (i =3D 0; i < num_lanes; i++) { + pos =3D lane_cfg ? lane_cfg->data[i].pos : i; + lane_assign |=3D pos << (i * LANE_CFG_BITWIDTH); + } =20 return lane_assign; } @@ -1251,6 +1257,7 @@ static int csid_link_setup(struct media_entity *entit= y, if ((local->flags & MEDIA_PAD_FL_SINK) && (flags & MEDIA_LNK_FL_ENABLED)) { struct v4l2_subdev *sd; + struct tpg_device *tpg; struct csid_device *csid; struct csiphy_device *csiphy; struct csiphy_lanes_cfg *lane_cfg; @@ -1265,18 +1272,28 @@ static int csid_link_setup(struct media_entity *ent= ity, return -EBUSY; =20 sd =3D media_entity_to_v4l2_subdev(remote->entity); - csiphy =3D v4l2_get_subdevdata(sd); + if (sd->grp_id =3D=3D TPG_GRP_ID) { + tpg =3D v4l2_get_subdevdata(sd); =20 - /* If a sensor is not linked to CSIPHY */ - /* do no allow a link from CSIPHY to CSID */ - if (!csiphy->cfg.csi2) - return -EPERM; + csid->phy.lane_cnt =3D tpg->res->lane_cnt; + csid->phy.csiphy_id =3D tpg->id; + csid->phy.lane_assign =3D csid_get_lane_assign(NULL, csid->phy.lane_cnt= ); + csid->tpg_linked =3D true; + } else { + csiphy =3D v4l2_get_subdevdata(sd); =20 - csid->phy.csiphy_id =3D csiphy->id; + /* If a sensor is not linked to CSIPHY */ + /* do no allow a link from CSIPHY to CSID */ + if (!csiphy->cfg.csi2) + return -EPERM; =20 - lane_cfg =3D &csiphy->cfg.csi2->lane_cfg; - csid->phy.lane_cnt =3D lane_cfg->num_data; - csid->phy.lane_assign =3D csid_get_lane_assign(lane_cfg); + csid->phy.csiphy_id =3D csiphy->id; + + lane_cfg =3D &csiphy->cfg.csi2->lane_cfg; + csid->phy.lane_cnt =3D lane_cfg->num_data; + csid->phy.lane_assign =3D csid_get_lane_assign(lane_cfg, lane_cfg->num_= data); + csid->tpg_linked =3D false; + } } /* Decide which virtual channels to enable based on which source pads are= enabled */ if (local->flags & MEDIA_PAD_FL_SOURCE) { diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media= /platform/qcom/camss/camss-csid.h index aedc96ed84b2fcc3f352160dcfd31554a671d0fc..5296b10f6bac839a3faa1039bdb= f0fbbbe9456ac 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.h +++ b/drivers/media/platform/qcom/camss/camss-csid.h @@ -161,6 +161,7 @@ struct csid_device { int num_supplies; struct completion reset_complete; struct csid_testgen_config testgen; + bool tpg_linked; struct csid_phy_config phy; struct v4l2_mbus_framefmt fmt[MSM_CSID_PADS_NUM]; struct v4l2_ctrl_handler ctrls; diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/med= ia/platform/qcom/camss/camss-csiphy.c index 62623393f414494d7d0095aa0efe5673382ec962..69fba36d10ef5d00d0d8e1ae0f5= b3646c066d81c 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -789,6 +789,7 @@ int msm_csiphy_register_entity(struct csiphy_device *cs= iphy, sd->flags |=3D V4L2_SUBDEV_FL_HAS_DEVNODE; snprintf(sd->name, ARRAY_SIZE(sd->name), "%s%d", MSM_CSIPHY_NAME, csiphy->id); + sd->grp_id =3D CSIPHY_GRP_ID; v4l2_set_subdevdata(sd, csiphy); =20 ret =3D csiphy_init_formats(sd, NULL); diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/med= ia/platform/qcom/camss/camss-csiphy.h index 2d5054819df7f9069611bcdf287846b1d20afc92..9d9657b82f748d02bf6be613948= 0cfbd0c5001c9 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.h +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h @@ -21,6 +21,8 @@ #define MSM_CSIPHY_PAD_SRC 1 #define MSM_CSIPHY_PADS_NUM 2 =20 +#define CSIPHY_GRP_ID 1 + struct csiphy_lane { u8 pos; u8 pol; diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/plat= form/qcom/camss/camss.c index 00b87fd9afbd89871ffaee9cb2b2db6538e1d70d..1de35bcd8e5fc6eaa9dab537960= 520b2c07dd830 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -4501,6 +4501,19 @@ static int camss_init_subdevices(struct camss *camss) } } =20 + if (camss->tpg) { + for (i =3D 0; i < camss->res->tpg_num; i++) { + ret =3D msm_tpg_subdev_init(camss, &camss->tpg[i], + &res->tpg_res[i], i); + if (ret < 0) { + dev_err(camss->dev, + "Failed to init tpg%d sub-device: %d\n", + i, ret); + return ret; + } + } + } + /* note: SM8250 requires VFE to be initialized before CSID */ for (i =3D 0; i < camss->res->vfe_num; i++) { ret =3D msm_vfe_subdev_init(camss, &camss->vfe[i], @@ -4589,6 +4602,23 @@ static int camss_link_entities(struct camss *camss) } } =20 + for (i =3D 0; i < camss->res->tpg_num; i++) { + for (j =3D 0; j < camss->res->csid_num; j++) { + ret =3D media_create_pad_link(&camss->tpg[i].subdev.entity, + MSM_TPG_PAD_SRC, + &camss->csid[j].subdev.entity, + MSM_CSID_PAD_SINK, + 0); + if (ret < 0) { + camss_link_err(camss, + camss->tpg[i].subdev.entity.name, + camss->csid[j].subdev.entity.name, + ret); + return ret; + } + } + } + if (camss->ispif) { for (i =3D 0; i < camss->res->csid_num; i++) { for (j =3D 0; j < camss->ispif->line_num; j++) { @@ -4693,6 +4723,19 @@ static int camss_register_entities(struct camss *cam= ss) } } =20 + if (camss->tpg) { + for (i =3D 0; i < camss->res->tpg_num; i++) { + ret =3D msm_tpg_register_entity(&camss->tpg[i], + &camss->v4l2_dev); + if (ret < 0) { + dev_err(camss->dev, + "Failed to register tpg%d entity: %d\n", + i, ret); + goto err_reg_tpg; + } + } + } + for (i =3D 0; i < camss->res->csid_num; i++) { ret =3D msm_csid_register_entity(&camss->csid[i], &camss->v4l2_dev); @@ -4736,6 +4779,13 @@ static int camss_register_entities(struct camss *cam= ss) for (i--; i >=3D 0; i--) msm_csid_unregister_entity(&camss->csid[i]); =20 + i =3D camss->res->tpg_num; +err_reg_tpg: + if (camss->tpg) { + for (i--; i >=3D 0; i--) + msm_tpg_unregister_entity(&camss->tpg[i]); + } + i =3D camss->res->csiphy_num; err_reg_csiphy: for (i--; i >=3D 0; i--) @@ -4757,6 +4807,11 @@ static void camss_unregister_entities(struct camss *= camss) for (i =3D 0; i < camss->res->csiphy_num; i++) msm_csiphy_unregister_entity(&camss->csiphy[i]); =20 + if (camss->tpg) { + for (i =3D 0; i < camss->res->tpg_num; i++) + msm_tpg_unregister_entity(&camss->tpg[i]); + } + for (i =3D 0; i < camss->res->csid_num; i++) msm_csid_unregister_entity(&camss->csid[i]); =20 --=20 2.34.1