From nobody Mon Oct 6 22:52:28 2025 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 A55A81FF601; Thu, 17 Jul 2025 03:20:41 +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=1752722443; cv=none; b=UT2qwG0QwVGzJw9sDmYlH9jZ5z4PjjVOFy1tOUUmd0rHKcj7QOoG3WmoWXIi5z8M5mlskJUZdYpQQdeV+7hf61JU2zSNnPj0U0prrcEDkXB9RJSBH5GPBTUyJPuxGwbGATV0wrf9Xol7XAaBYRX1lbdThjHWc1Y4HqtIiN6EkcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752722443; c=relaxed/simple; bh=aJOzE9DowZm3gqIql2B3msjdfyg7QyA5ZEazy58SkYM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=e7hYtaSFtcOyy5x3zKEWU1rR0teAGSgDjM0lISz+VZfPWcejIEp3mUgKe7T8nn8wrFUxCcbkGLGZ/jR7INUcG/5AlG1uC43qaw1tT4gphXDGt36etlqFAz0S+86NJmtWw/guTgDqtajI5yxsGtVuyQGc6d3LUfSOofCbVjWcfa8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=KKkw1lxU; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="KKkw1lxU" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56GGDUiG008525; Thu, 17 Jul 2025 03:20:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= oAc3sJBLBZ9UQq2xRjQ9oMBhA7ruu9lwFKJBVTeTDrw=; b=KKkw1lxUGkNvLbdl +eEG63peZWF7FQQg6pKeDf1I0lvG1SQn84zVXV6wINtW9JUBOmnFClwFgedr9fzS 7I09w5DXn9UG4mPrX4IyUKC5jVfg16jfdrCi2KgjJIbbEEt52Oppr2lEC1P092hW D+UmpB9vfZ3IiaI2OizUKsJCFSE0iXp6g+Zu/D+qkRhLhsavzG4n8uGk1XcKEuat IyZ5buMBTwbIK/id4XpAQy16UaCNF42plqJGocf/fxHfaN0Mv1O4B+L94fVczEsx ziCSE/3pmFVV2AgrCkd9sNpybpah+3WMjjK0sooq11vw9Fo1J8P6SwDbQJazy5Eo FBp+pA== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47ufxb64jb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Jul 2025 03:20:37 +0000 (GMT) Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 56H3KaeG007573 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Jul 2025 03:20:36 GMT Received: from cse-cd01-lnx.ap.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Wed, 16 Jul 2025 20:20:34 -0700 From: Wenmeng Liu Date: Thu, 17 Jul 2025 11:20:07 +0800 Subject: [PATCH v2 3/3] media: qcom: camss: tpg: Add TPG support for SA8775P 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: <20250717-lemans_tpg-v2-3-a2538659349c@quicinc.com> References: <20250717-lemans_tpg-v2-0-a2538659349c@quicinc.com> In-Reply-To: <20250717-lemans_tpg-v2-0-a2538659349c@quicinc.com> To: Robert Foss , Todor Tomov , "Bryan O'Donoghue" , Mauro Carvalho Chehab CC: , , , Wenmeng Liu X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1752722426; l=13062; i=quic_wenmliu@quicinc.com; s=20250211; h=from:subject:message-id; bh=aJOzE9DowZm3gqIql2B3msjdfyg7QyA5ZEazy58SkYM=; b=S+b6Ak+k3kDHQGqiBEMO937xVMq/LiRrdnFnXl6l7cIX7RHDC9i/cDNpp9FsIm+Qo1ulwphIk Vnud7unsgXuDtx2+q0xTnXOtyxkva7k4HmJFj3mFzWVfX1kUxAqhUNX X-Developer-Key: i=quic_wenmliu@quicinc.com; a=ed25519; pk=PTegr3w0f1C9dOSL6CUdJR5+u+X/4vsW7VMfwIMeMXQ= X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: Jdph4Z166nLWsoCifXBaXj5kBTL6mSPd X-Proofpoint-ORIG-GUID: Jdph4Z166nLWsoCifXBaXj5kBTL6mSPd X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE3MDAyOCBTYWx0ZWRfX66ZJdCFpt4h0 TmmnFtldACtKH3stJceWl953/TYb8Lr9C253U31e1+FDwz/nVAMCNzZCRTPVmqfQoOHTUYQ01aQ rpu3nJA4QcVg/wgMoveV9Z+offC0utTRMAa4Rsrm+OJgWpOKDzi5bXEfzS3rIA+Y7ewm5TMF79X bF4DSjGktW0nKiGZllACfoLwzq2wIQ2uPBJal+6vbl1GcikYaFNkElGYN0D162cvdO97GDk5l9H 5VD4LIaAcPONOF78Dp3424YLlnvfHfzJK0ku2zIcZONWN6032np8xIS7WkiMNsgKNfFpjAKoDNl JSevM5z+o977rcROpHF4U45JPFRczLabRKG/yNW8V0w2XpIqm1fX4zm7sIAN3ioT7++luaOLluN vPkAoCgrXty+Zv6KAMJoiMBQveaSoxHxgwEuIcc0DAynF1Mwa2CXxa1ZvKQv+FWprx9vQ05n X-Authority-Analysis: v=2.4 cv=Xc2JzJ55 c=1 sm=1 tr=0 ts=68786c05 cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=COk6AnOGAAAA:8 a=4iagCNAp_ivI1716DHcA:9 a=hSIi_ENWJPfcIP4Z:21 a=QEXdDO2ut3YA:10 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-17_01,2025-07-16_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 priorityscore=1501 adultscore=0 mlxlogscore=999 phishscore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507170028 Add support for TPG found on SA8775P. Signed-off-by: Wenmeng Liu --- drivers/media/platform/qcom/camss/Makefile | 1 + .../media/platform/qcom/camss/camss-csid-gen3.c | 17 ++ drivers/media/platform/qcom/camss/camss-tpg-gen1.c | 245 +++++++++++++++++= ++++ drivers/media/platform/qcom/camss/camss.c | 56 +++++ 4 files changed, 319 insertions(+) diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/pla= tform/qcom/camss/Makefile index e4cf3033b8798cf0ffeff85409ae4ed3559879c1..274fa1e8fef3ce972a94e735565= 1c3801bc1dddc 100644 --- a/drivers/media/platform/qcom/camss/Makefile +++ b/drivers/media/platform/qcom/camss/Makefile @@ -25,5 +25,6 @@ qcom-camss-objs +=3D \ camss-video.o \ camss-format.o \ camss-tpg.o \ + camss-tpg-gen1.o \ =20 obj-$(CONFIG_VIDEO_QCOM_CAMSS) +=3D qcom-camss.o diff --git a/drivers/media/platform/qcom/camss/camss-csid-gen3.c b/drivers/= media/platform/qcom/camss/camss-csid-gen3.c index 581399b6a767fc2ba0764dc0f5228e737cdd0d67..2af4fc039948a1a43a2e4eed330= 04cbfd6bf66fb 100644 --- a/drivers/media/platform/qcom/camss/camss-csid-gen3.c +++ b/drivers/media/platform/qcom/camss/camss-csid-gen3.c @@ -69,6 +69,8 @@ #define CSI2_RX_CFG0_VC_MODE 3 #define CSI2_RX_CFG0_DL0_INPUT_SEL 4 #define CSI2_RX_CFG0_PHY_NUM_SEL 20 +#define CSI2_RX_CFG0_TPG_NUM_EN 27 +#define CSI2_RX_CFG0_TPG_NUM_SEL 28 =20 #define CSID_CSI2_RX_CFG1 0x204 #define CSI2_RX_CFG1_ECC_CORRECTION_EN BIT(0) @@ -112,7 +114,10 @@ static void __csid_configure_rx(struct csid_device *cs= id, struct csid_phy_config *phy, int vc) { int val; + struct camss *camss; + struct tpg_device *tpg; =20 + camss =3D csid->camss; val =3D (phy->lane_cnt - 1) << CSI2_RX_CFG0_NUM_ACTIVE_LANES; val |=3D phy->lane_assign << CSI2_RX_CFG0_DL0_INPUT_SEL; val |=3D (phy->csiphy_id + CSI2_RX_CFG0_PHY_SEL_BASE_IDX) << CSI2_RX_CFG0= _PHY_NUM_SEL; @@ -120,6 +125,18 @@ static void __csid_configure_rx(struct csid_device *cs= id, if (IS_CSID_690(csid) && (vc > 3)) val |=3D 1 << CSI2_RX_CFG0_VC_MODE; =20 + if (camss->tpg) { + tpg =3D &camss->tpg[phy->csiphy_id]; + + if (tpg->testgen.mode > 0) { + val |=3D (phy->csiphy_id + 1) << CSI2_RX_CFG0_TPG_NUM_SEL; + val |=3D 1 << CSI2_RX_CFG0_TPG_NUM_EN; + } else { + val |=3D 0 << CSI2_RX_CFG0_TPG_NUM_SEL; + val |=3D 0 << CSI2_RX_CFG0_TPG_NUM_EN; + } + } + writel(val, csid->base + CSID_CSI2_RX_CFG0); =20 val =3D CSI2_RX_CFG1_ECC_CORRECTION_EN; diff --git a/drivers/media/platform/qcom/camss/camss-tpg-gen1.c b/drivers/m= edia/platform/qcom/camss/camss-tpg-gen1.c new file mode 100644 index 0000000000000000000000000000000000000000..a8899ccac52b0ad66296182f3fb= 70ad34bb1f711 --- /dev/null +++ b/drivers/media/platform/qcom/camss/camss-tpg-gen1.c @@ -0,0 +1,245 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * camss-tpg-gen1.c + * + * Qualcomm MSM Camera Subsystem - TPG (Test Patter Generator) Module + * + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ +#include +#include +#include +#include +#include + +#include "camss-tpg.h" +#include "camss.h" + +#define TPG_HW_VERSION 0x0 +#define HW_VERSION_STEPPING 0 +#define HW_VERSION_REVISION 16 +#define HW_VERSION_GENERATION 28 + +#define TPG_HW_STATUS 0x4 + +#define TPG_VC_n_GAIN_CFG(n) (0x60 + (n) * 0x60) + +#define TPG_CTRL 0x64 +#define TPG_CTRL_TEST_EN 0 +#define TPG_CTRL_PHY_SEL 3 +#define TPG_CTRL_NUM_ACTIVE_LANES 4 +#define TPG_CTRL_VC_DT_PATTERN_ID 6 +#define TPG_CTRL_OVERLAP_SHDR_EN 10 +#define TPG_CTRL_NUM_ACTIVE_VC 30 +#define NUM_ACTIVE_VC_0_ENABLED 0 +#define NUM_ACTIVE_VC_0_1_ENABLED 1 +#define NUM_ACTIVE_VC_0_1_2_ENABLED 2 +#define NUM_ACTIVE_VC_0_1_3_ENABLED 3 + +#define TPG_VC_n_CFG0(n) (0x68 + (n) * 0x60) +#define TPG_VC_n_CFG0_VC_NUM 0 +#define TPG_VC_n_CFG0_NUM_ACTIVE_DT 8 +#define NUM_ACTIVE_SLOTS_0_ENABLED 0 +#define NUM_ACTIVE_SLOTS_0_1_ENABLED 1 +#define NUM_ACTIVE_SLOTS_0_1_2_ENABLED 2 +#define NUM_ACTIVE_SLOTS_0_1_3_ENABLED 3 +#define TPG_VC_n_CFG0_NUM_BATCH 12 +#define TPG_VC_n_CFG0_NUM_FRAMES 16 + +#define TPG_VC_n_LSFR_SEED(n) (0x6C + (n) * 0x60) + +#define TPG_VC_n_HBI_CFG(n) (0x70 + (n) * 0x60) + +#define TPG_VC_n_VBI_CFG(n) (0x74 + (n) * 0x60) + +#define TPG_VC_n_COLOR_BARS_CFG(n) (0x78 + (n) * 0x60) +#define TPG_VC_n_COLOR_BARS_CFG_PIX_PATTERN 0 +#define TPG_VC_n_COLOR_BARS_CFG_QCFA_EN 3 +#define TPG_VC_n_COLOR_BARS_CFG_SPLIT_EN 4 +#define TPG_VC_n_COLOR_BARS_CFG_NOISE_EN 5 +#define TPG_VC_n_COLOR_BARS_CFG_ROTATE_PERIOD 8 +#define TPG_VC_n_COLOR_BARS_CFG_XCFA_EN 16 +#define TPG_VC_n_COLOR_BARS_CFG_SIZE_X 24 +#define TPG_VC_n_COLOR_BARS_CFG_SIZE_Y 28 + +#define TPG_VC_m_DT_n_CFG_0(m, n) (0x7C + (m) * 0x60 + (n) * 0xC) +#define TPG_VC_m_DT_n_CFG_0_FRAME_HEIGHT 0 +#define TPG_VC_m_DT_n_CFG_0_FRAME_WIDTH 16 + +#define TPG_VC_m_DT_n_CFG_1(m, n) (0x80 + (m) * 0x60 + (n) * 0xC) +#define TPG_VC_m_DT_n_CFG_1_DATA_TYPE 0 +#define TPG_VC_m_DT_n_CFG_1_ECC_XOR_MASK 8 +#define TPG_VC_m_DT_n_CFG_1_CRC_XOR_MASK 16 + +#define TPG_VC_m_DT_n_CFG_2(m, n) (0x84 + (m) * 0x60 + (n) * 0xC) +#define TPG_VC_m_DT_n_CFG_2_PAYLOAD_MODE 0 +#define TPG_VC_m_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD 4 +#define TPG_VC_m_DT_n_CFG_2_ENCODE_FORMAT 28 + +#define TPG_VC_n_COLOR_BAR_CFA_COLOR0(n) (0xB0 + (n) * 0x60) +#define TPG_VC_n_COLOR_BAR_CFA_COLOR1(n) (0xB4 + (n) * 0x60) +#define TPG_VC_n_COLOR_BAR_CFA_COLOR2(n) (0xB8 + (n) * 0x60) +#define TPG_VC_n_COLOR_BAR_CFA_COLOR3(n) (0xBC + (n) * 0x60) + +/* Line offset between VC(n) and VC(n-1), n form 1 to 3 */ +#define TPG_VC_n_SHDR_CFG (0x84 + (n) * 0x60) + +#define TPG_TOP_IRQ_STATUS 0x1E0 +#define TPG_TOP_IRQ_MASK 0x1E4 +#define TPG_TOP_IRQ_CLEAR 0x1E8 +#define TPG_TOP_IRQ_SET 0x1EC +#define TPG_IRQ_CMD 0x1F0 +#define TPG_CLEAR 0x1F4 + +static int tpg_stream_on(struct tpg_device *tpg) +{ + struct tpg_testgen_config *tg =3D &tpg->testgen; + struct v4l2_mbus_framefmt *input_format; + const struct tpg_format_info *format; + u8 lane_cnt =3D tpg->res->lane_cnt; + u8 i; + u8 dt_cnt =3D 0; + u32 val; + + /* Loop through all enabled VCs and configure stream for each */ + for (i =3D 0; i < tpg->res->vc_cnt; i++) { + input_format =3D &tpg->fmt[MSM_TPG_PAD_SRC + i]; + format =3D tpg_get_fmt_entry(tpg->res->formats->formats, + tpg->res->formats->nformats, + input_format->code); + + val =3D (input_format->height & 0xffff) << TPG_VC_m_DT_n_CFG_0_FRAME_HEI= GHT; + val |=3D (input_format->width & 0xffff) << TPG_VC_m_DT_n_CFG_0_FRAME_WID= TH; + writel_relaxed(val, tpg->base + TPG_VC_m_DT_n_CFG_0(i, dt_cnt)); + + val =3D format->data_type << TPG_VC_m_DT_n_CFG_1_DATA_TYPE; + writel_relaxed(val, tpg->base + TPG_VC_m_DT_n_CFG_1(i, dt_cnt)); + + val =3D (tg->mode - 1) << TPG_VC_m_DT_n_CFG_2_PAYLOAD_MODE; + val |=3D 0xBE << TPG_VC_m_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD; + val |=3D format->encode_format << TPG_VC_m_DT_n_CFG_2_ENCODE_FORMAT; + writel_relaxed(val, tpg->base + TPG_VC_m_DT_n_CFG_2(i, dt_cnt)); + + writel_relaxed(0xA00, tpg->base + TPG_VC_n_COLOR_BARS_CFG(i)); + + writel_relaxed(0x4701, tpg->base + TPG_VC_n_HBI_CFG(i)); + writel_relaxed(0x438, tpg->base + TPG_VC_n_VBI_CFG(i)); + + writel_relaxed(0x12345678, tpg->base + TPG_VC_n_LSFR_SEED(i)); + + /* configure one DT, infinite frames */ + val =3D i << TPG_VC_n_CFG0_VC_NUM; + val |=3D 0 << TPG_VC_n_CFG0_NUM_FRAMES; + writel_relaxed(val, tpg->base + TPG_VC_n_CFG0(i)); + } + + writel_relaxed(1, tpg->base + TPG_TOP_IRQ_MASK); + + val =3D 1 << TPG_CTRL_TEST_EN; + val |=3D 0 << TPG_CTRL_PHY_SEL; + val |=3D (lane_cnt - 1) << TPG_CTRL_NUM_ACTIVE_LANES; + val |=3D 0 << TPG_CTRL_VC_DT_PATTERN_ID; + val |=3D (tpg->res->vc_cnt - 1) << TPG_CTRL_NUM_ACTIVE_VC; + writel_relaxed(val, tpg->base + TPG_CTRL); + + return 0; +} + +static void tpg_stream_off(struct tpg_device *tpg) +{ + writel_relaxed(0, tpg->base + TPG_CTRL); + writel_relaxed(0, tpg->base + TPG_TOP_IRQ_MASK); + writel_relaxed(1, tpg->base + TPG_TOP_IRQ_CLEAR); + writel_relaxed(1, tpg->base + TPG_IRQ_CMD); + writel_relaxed(1, tpg->base + TPG_CLEAR); +} + +static void tpg_configure_stream(struct tpg_device *tpg, u8 enable) +{ + if (enable) + tpg_stream_on(tpg); + else + tpg_stream_off(tpg); +} + +static int tpg_configure_testgen_pattern(struct tpg_device *tpg, s32 val) +{ + if (val > 0 && val <=3D TPG_PAYLOAD_MODE_COLOR_BARS) + tpg->testgen.mode =3D val; + + return 0; +} + +/* + * tpg_hw_version - tpg hardware version query + * @tpg: tpg device + * + * Return HW version or error + */ +static u32 tpg_hw_version(struct tpg_device *tpg) +{ + u32 hw_version; + u32 hw_gen; + u32 hw_rev; + u32 hw_step; + + hw_version =3D readl_relaxed(tpg->base + TPG_HW_VERSION); + hw_gen =3D (hw_version >> HW_VERSION_GENERATION) & 0xF; + hw_rev =3D (hw_version >> HW_VERSION_REVISION) & 0xFFF; + hw_step =3D (hw_version >> HW_VERSION_STEPPING) & 0xFFFF; + dev_dbg(tpg->camss->dev, "tpg HW Version =3D %u.%u.%u\n", + hw_gen, hw_rev, hw_step); + + return hw_version; +} + +/* + * tpg_isr - tpg module interrupt service routine + * @irq: Interrupt line + * @dev: tpg device + * + * Return IRQ_HANDLED on success + */ +static irqreturn_t tpg_isr(int irq, void *dev) +{ + struct tpg_device *tpg =3D dev; + u32 val; + + val =3D readl_relaxed(tpg->base + TPG_TOP_IRQ_STATUS); + writel_relaxed(val, tpg->base + TPG_TOP_IRQ_CLEAR); + writel_relaxed(1, tpg->base + TPG_IRQ_CMD); + + return IRQ_HANDLED; +} + +/* + * tpg_reset - Trigger reset on tpg module and wait to complete + * @tpg: tpg device + * + * Return 0 on success or a negative error code otherwise + */ +static int tpg_reset(struct tpg_device *tpg) +{ + writel_relaxed(0, tpg->base + TPG_CTRL); + writel_relaxed(0, tpg->base + TPG_TOP_IRQ_MASK); + writel_relaxed(1, tpg->base + TPG_TOP_IRQ_CLEAR); + writel_relaxed(1, tpg->base + TPG_IRQ_CMD); + writel_relaxed(1, tpg->base + TPG_CLEAR); + + return 0; +} + +static void tpg_subdev_init(struct tpg_device *tpg) +{ + tpg->testgen.modes =3D testgen_payload_modes; + tpg->testgen.nmodes =3D TPG_PAYLOAD_MODE_NUM_SUPPORTED_GEN1; +} + +const struct tpg_hw_ops tpg_ops_gen1 =3D { + .configure_stream =3D tpg_configure_stream, + .configure_testgen_pattern =3D tpg_configure_testgen_pattern, + .hw_version =3D tpg_hw_version, + .isr =3D tpg_isr, + .reset =3D tpg_reset, + .subdev_init =3D tpg_subdev_init, +}; diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/plat= form/qcom/camss/camss.c index 34f71039038e881ced9c9f06bd70915b5c5f610f..ced31e3655a52a7b2e55b109085= cf24a9e230f1d 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -2935,6 +2935,53 @@ static const struct camss_subdev_resources csiphy_re= s_8775p[] =3D { }, }; =20 +static const struct camss_subdev_resources tpg_res_8775p[] =3D { + /* TPG0 */ + { + .regulators =3D { }, + .clock =3D { "csiphy_rx" }, + .clock_rate =3D { { 400000000 } }, + .reg =3D { "tpg0" }, + .interrupt =3D { "tpg0" }, + .tpg =3D { + .lane_cnt =3D 4, + .vc_cnt =3D 1, + .formats =3D &tpg_formats_gen1, + .hw_ops =3D &tpg_ops_gen1 + } + }, + + /* TPG1 */ + { + .regulators =3D { }, + .clock =3D { "csiphy_rx" }, + .clock_rate =3D { { 400000000 } }, + .reg =3D { "tpg1" }, + .interrupt =3D { "tpg1" }, + .tpg =3D { + .lane_cnt =3D 4, + .vc_cnt =3D 1, + .formats =3D &tpg_formats_gen1, + .hw_ops =3D &tpg_ops_gen1 + } + }, + + /* TPG2 */ + { + .regulators =3D { }, + .clock =3D { "csiphy_rx" }, + .clock_rate =3D { { 400000000 } }, + .reg =3D { "tpg2" }, + .interrupt =3D { "tpg2" }, + .tpg =3D { + .lane_cnt =3D 4, + .vc_cnt =3D 1, + .formats =3D &tpg_formats_gen1, + .hw_ops =3D &tpg_ops_gen1 + } + }, +}; + static const struct camss_subdev_resources csid_res_8775p[] =3D { /* CSID0 */ { @@ -4445,6 +4492,13 @@ static int camss_probe(struct platform_device *pdev) if (!camss->csiphy) return -ENOMEM; =20 + if (camss->res->version =3D=3D CAMSS_8775P) { + camss->tpg =3D devm_kcalloc(dev, camss->res->tpg_num, + sizeof(*camss->tpg), GFP_KERNEL); + if (!camss->tpg) + return -ENOMEM; + } + camss->csid =3D devm_kcalloc(dev, camss->res->csid_num, sizeof(*camss->cs= id), GFP_KERNEL); if (!camss->csid) @@ -4638,11 +4692,13 @@ static const struct camss_resources sa8775p_resourc= es =3D { .version =3D CAMSS_8775P, .pd_name =3D "top", .csiphy_res =3D csiphy_res_8775p, + .tpg_res =3D tpg_res_8775p, .csid_res =3D csid_res_8775p, .csid_wrapper_res =3D &csid_wrapper_res_sa8775p, .vfe_res =3D vfe_res_8775p, .icc_res =3D icc_res_sa8775p, .csiphy_num =3D ARRAY_SIZE(csiphy_res_8775p), + .tpg_num =3D ARRAY_SIZE(tpg_res_8775p), .csid_num =3D ARRAY_SIZE(csid_res_8775p), .vfe_num =3D ARRAY_SIZE(vfe_res_8775p), .icc_path_num =3D ARRAY_SIZE(icc_res_sa8775p), --=20 2.34.1