From nobody Mon Jun 8 06:38:14 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 067A83BB69D for ; Mon, 1 Jun 2026 14:44:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780325042; cv=none; b=GxJ9J5Kb813R5ENI6Y4BnS9nIGH4GRt9fzMP6nzfvvw6B4Ega/F+KV4yQXTIx5Ad7goL6OpXd9IArW1PPmmnT0MKMDxCcziF46pJCcNEdHjup6wwYA36sXor/GQHPK9cVXRiwrrFaL1idoyO5+hieElXlE5VYpaMSV8E41VrfMU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780325042; c=relaxed/simple; bh=N6c38JRUAszf5/liy1AJCAUPHKkM078LMV0KgQRiJVE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=m2vBB1P1GIP6PQC2cvdf6WMHY3N4TWIhQyszkQeWBnFWA+MY14A6yol7LDUdZkIMPfMiXOxxseYd39i+o/Tfh2ZaBDLPL77ISE59ftpS/FKlgxC20T84AJT7a/zPa2uXT/0aWA54U9tzvf5nmSwTvL2KvvMtyRfMlhiPzYp1gcY= 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=W3G2gQBd; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dvJYgMdR; arc=none smtp.client-ip=205.220.168.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="W3G2gQBd"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dvJYgMdR" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6518fISu144951 for ; Mon, 1 Jun 2026 14:44:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=s/dVAMDYklnIjRMwsKkL0V rHnKFzaoTe8yhRBOtC8rk=; b=W3G2gQBdWPvl37KcjkkQBNttGkhSdp8u25YB+5 rtkLyjcel6izKcBw+93N4KYwXeSEz/YwxnkkOnBke/LOykkuKH6S4pgHA8xasI46 a0mgP244RnaG+Ksy0o7cESCQhitEQ/uSAngigViC7Pl+h9xnyvSjDDk26XYAtDul yF0MotpZ3XHK5tcgb9dHteHVcRj+5CKZxLssbL+Iff/TEsCRZUQmKReiNfisBHW2 5Gx3/gEEaRYy52fcy763UllypRCt0t2i9BQDmaZnmMMf8kIjKzD/LlnOF1eJkCr+ INdAF9eRJeUbJemimHpNeVrJ5KrvORQ4fwaUMAHYjpXTsehQ== Received: from mail-dy1-f199.google.com (mail-dy1-f199.google.com [74.125.82.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eh6stsebs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 01 Jun 2026 14:44:00 +0000 (GMT) Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-304ed777a96so1721473eec.1 for ; Mon, 01 Jun 2026 07:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780325040; x=1780929840; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=s/dVAMDYklnIjRMwsKkL0VrHnKFzaoTe8yhRBOtC8rk=; b=dvJYgMdRpH/MxscovHBRWE7oLdZwTW484/CiTwLKTwMAvRFNDhBSgkobAgUZ0WtODP Jwnr9rEDxum+CLY/NMiWoxK4vH7yx+xo8iHnJ3jX8kfsdP3FUvpICIu4lzGxN+8h7K53 R9O48Oq9equ/1kcXW/S46UTsmb2rJfdIUKOaR05fO5R2rbWiera+mrtfRXMF12WvVsI+ +s3zk3FEGXxNXToCVqDQwsNWhjCRW8tR9yyuXX3e2Wk+hN9ETHtddLL5vOLWTqqdmdUz qya+7/FmxLHN4+3zc1ZEGT/g8iYrZ7B+obnRufKc6FnhVT2B0QQCecn/jZDMxBFISkL/ ODAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780325040; x=1780929840; h=cc:to: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=s/dVAMDYklnIjRMwsKkL0VrHnKFzaoTe8yhRBOtC8rk=; b=m5FVxuIC3rniQR4gnY/Xnd7OzY+/ELP6oU7dWHkBBiA9kGc6PxWivT7sza8Y6R+kdR wxVSabhFkZfic288Ktqbf8vxRmbUPcYZpEMXQT7lEHtw5RNqRneWXwlRYZrLwuEJ5+dR SV9GDjt+2JnCBh0DmcGc/IL9KgeCxzFsfBmTE/R7D0cNVg/41tr/4LoDBNwfKxpGqFpW XvCVcG1JVtondNA8TMTDW+L2rUxM1DSA3CeqkK3aBV6PcAI6tqegiumHrecTVcRnNrK8 h/mSv2sJsfosxKmPsU9Hq0w/I97rg/VTKeCzZqcwmzpf5/YUDhAeju3vG7Vu4BrBPB4M HxNg== X-Forwarded-Encrypted: i=1; AFNElJ+PxeAjmRO/zlu2+llcnABRJqj3SXb0qq9CGOMHQot9i68TF7KiqbDJqy0AIEpUuB4rXefKnuX+xP74dkc=@vger.kernel.org X-Gm-Message-State: AOJu0YyccjtYj/glmprZVLL+6egKVM71uG+Wc2rGRs+CNOhQ0uDSU/p3 N0eZtG6AlG4vRRmaO9k/tidV8dS/YJswqC38wLD+TsW6vu3BbULUEQ0LxIToMTfWHx1FvwDH0a4 AzZ6tORB0l7Bqi8/c4LfMk3gEluAAjBE08eS1ZTmp8XqC7p6K4na86ga/HkUxOlcygSs= X-Gm-Gg: Acq92OGBxBaQONAGgBFcpM4Axwc6AO6/9KMum+K04O/po5HyBmX6luhgvURqKyAH2ME TYb3f/6klOf26avyISvc6yu4RuWDBoBkOL8J6d8D9+1acAyLEiAcHbmR+05I87Sw+QSW4btoI76 SFNWyhsOjruj3xcSGeVAerFlveHgM8pOISBHE4WnbGhLYkxL8JuHbNUuX4dzH05/7ydc7ppUbfl i++/5WMrovS20/uErn5TPFB778GSvAxg2AY3mDAWb3C+2OyiLBu3NeN8LCSTTg/GOeKj+lyTQm1 SumblTobQ+TQimcb37yuRWB8zqR/4nXqqJTRtOFrrsvc4ok2kt53fF08JMR1ng+6qHjlHUi4ypY AxNUvCt1QW/dFcoleRHp3fy0gp1EjlOyitSn3FWNOPTE5mvevCvrRR9ujq6Y5RhYGkJMai61hjg WDKNzcmJfYMXI= X-Received: by 2002:a05:7300:5b9e:b0:2c6:67b6:3acc with SMTP id 5a478bee46e88-304eb1e9955mr6425782eec.15.1780325039448; Mon, 01 Jun 2026 07:43:59 -0700 (PDT) X-Received: by 2002:a05:7300:5b9e:b0:2c6:67b6:3acc with SMTP id 5a478bee46e88-304eb1e9955mr6425758eec.15.1780325038871; Mon, 01 Jun 2026 07:43:58 -0700 (PDT) Received: from hu-hangxian-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-304ed2c154fsm8169661eec.3.2026.06.01.07.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 07:43:58 -0700 (PDT) From: Hangxiang Ma Date: Mon, 01 Jun 2026 07:43:53 -0700 Subject: [PATCH] media: qcom: camss: csid: Consolidate CSI2_RX_CFG0_PHY_SEL_BASE_IDX definition 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: <20260601-camss-macro-v1-1-cabf1fb99241@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAKiaHWoC/yXMQQ6DIBCF4auQWXcSRGqiV2lcUJi2swBaBhsT4 90luvxf8r4NhAqTwKQ2KPRn4ZxadDcF/uPSm5BDazDaDHrQHXoXRTA6XzL2wWpvg6VRB2iPb6E Xr6f2mK8u9FsaWq8Rnk4IfY6R66QSrRVP+G5GmPf9AE6ELIOOAAAA X-Change-ID: 20260601-camss-macro-3d40c4d4e90d To: Robert Foss , Todor Tomov , Bryan O'Donoghue , Vladimir Zapolskiy , Mauro Carvalho Chehab , Loic Poulain Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Hangxiang Ma X-Mailer: b4 0.14.3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjAxMDE0NyBTYWx0ZWRfX2NlITQptC8Qq z5TyuUvJuCb8TO1+sw7NL436q6ddqRP+pzp1wHjNj/nA/VNyImYfuHgi3Oa4zy9orT5CQdQdn0F AuMF1v7euyYMJ60pOF32bk8MXRJL8bZrBvhn5nqCy0vWOQq3RNFtIAbYJgrZOqP81L/0z4mF+k1 00oSZws8z/HT/3u05SRVjRUvAjRl2w7bJhizEkzES7VnQUj34JcpdgS8SOkqrE919gBbaQ9Cho9 DHYl2Rzuf51ikJO4o6quAKQqIAydRWUl6TkbFIqXHP4mZnmzD73WS//9KhQGgQ2XDTzpWhvFYFN qH/w0xhFp1i55vcrSN1qPpcd7Qc2sxv7R71DTJdd2QiUJNu90Mt596+aIm5847EHGq9KTYdEjjn 5DMKBU9IrbH/8IDEw0BI7XwMadG9MAW5GMbK1tshpJxaFKwmoOZUJ5lCtYAls7BXrFD+8oe/7S/ N3M8DLW7/nySdSZhyOg== X-Proofpoint-ORIG-GUID: wOgMA1BQXQ0gO9GXhmKLyEu2Sm2EGVXK X-Authority-Analysis: v=2.4 cv=HrNG3UTS c=1 sm=1 tr=0 ts=6a1d9ab0 cx=c_pps a=cFYjgdjTJScbgFmBucgdfQ==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=DR9wR5qphd0UyIk5iGcA:9 a=QEXdDO2ut3YA:10 a=scEy_gLbYbu1JhEsrz4S:22 X-Proofpoint-GUID: wOgMA1BQXQ0gO9GXhmKLyEu2Sm2EGVXK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-01_04,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 impostorscore=0 adultscore=0 malwarescore=0 phishscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606010147 Move the duplicate CSI2_RX_CFG0_PHY_SEL_BASE_IDX definition from camss-csid-680.c and camss-csid-gen3.c into the shared camss-csid.h header. This eliminates redundancy and makes the constant available to future CSID implementations. Signed-off-by: Hangxiang Ma --- Move the duplicate CSI2_RX_CFG0_PHY_SEL_BASE_IDX definition from camss-csid-680.c and camss-csid-gen3.c into the shared camss-csid.h header. This eliminates redundancy and makes the constant available to future CSID implementations. --- drivers/media/platform/qcom/camss/camss-csid-680.c | 1 - drivers/media/platform/qcom/camss/camss-csid-gen3.c | 1 - drivers/media/platform/qcom/camss/camss-csid.h | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid-680.c b/drivers/m= edia/platform/qcom/camss/camss-csid-680.c index 345a67c8fb94..bf7164085ddb 100644 --- a/drivers/media/platform/qcom/camss/camss-csid-680.c +++ b/drivers/media/platform/qcom/camss/camss-csid-680.c @@ -101,7 +101,6 @@ #define CSI2_RX_CFG0_DL2_INPUT_SEL 12 #define CSI2_RX_CFG0_DL3_INPUT_SEL 16 #define CSI2_RX_CFG0_PHY_NUM_SEL 20 -#define CSI2_RX_CFG0_PHY_SEL_BASE_IDX 1 #define CSI2_RX_CFG0_PHY_TYPE_SEL 24 #define CSI2_RX_CFG0_TPG_MUX_EN BIT(27) #define CSI2_RX_CFG0_TPG_MUX_SEL GENMASK(29, 28) diff --git a/drivers/media/platform/qcom/camss/camss-csid-gen3.c b/drivers/= media/platform/qcom/camss/camss-csid-gen3.c index 0fdbf75fb27d..da9458cd178b 100644 --- a/drivers/media/platform/qcom/camss/camss-csid-gen3.c +++ b/drivers/media/platform/qcom/camss/camss-csid-gen3.c @@ -105,7 +105,6 @@ #define CSID_RDI_IRQ_SUBSAMPLE_PERIOD(rdi) (csid_is_lite(csid) && IS_CSID_= 690(csid) ?\ (0x34C + 0x100 * (rdi)) :\ (0x54C + 0x100 * (rdi))) -#define CSI2_RX_CFG0_PHY_SEL_BASE_IDX 1 =20 static void __csid_configure_rx(struct csid_device *csid, struct csid_phy_config *phy, int vc) diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media= /platform/qcom/camss/camss-csid.h index 5296b10f6bac..059ac94ad1be 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.h +++ b/drivers/media/platform/qcom/camss/camss-csid.h @@ -27,6 +27,8 @@ /* CSID hardware can demultiplex up to 4 outputs */ #define MSM_CSID_MAX_SRC_STREAMS 4 =20 +/* CSIPHY to hardware PHY selector mapping */ +#define CSI2_RX_CFG0_PHY_SEL_BASE_IDX 1 #define CSID_RESET_TIMEOUT_MS 500 =20 enum csid_testgen_mode { --- base-commit: 697a0e31ee66f5ddb929c09895139779fff33f20 change-id: 20260601-camss-macro-3d40c4d4e90d Best regards, --=20 Hangxiang Ma