From mboxrd@z Thu Jan 1 00:00:00 1970 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 B0FFC217659 for ; Sun, 19 Oct 2025 08:02:17 +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=1760860939; cv=none; b=qdpC0DIix/mXglz+VeLXo3M+g45t+k52tNyXDF8IkpeWxrlP79E5RjxyKv98/uDG9lnCJ9DAWMPgyYcdgi+zlpeG6S9oxjr3oVVjoX7M87WX8Xk/M+nGqlts14v/ApHv+DyNkoHneQha/Ub6rxLoADZXga6T3NkIF2PRBDjo/CQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760860939; c=relaxed/simple; bh=IhkNdhV1hTAXKq74opsigwyH+OgEAhY4flHRuC9QW9s=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GB4XHI/ky5qr+pfGmK7nEPWnGW94UVy6blIhRdN+Bkx6fZ3gqsQgeiZdfYuIVB6A9Sv7q6bGVagtH9Fis5QBpLuuUBQ5qIxTiO7iO2yjdWsXPtCRalgfd/MJz6212vMngnP64Jb9tdqKLRt0uCmx5U1jJ3mMZFwEUzh6QOYBlio= 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=jWH/HZBi; 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="jWH/HZBi" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59J7fsx6016204 for ; Sun, 19 Oct 2025 08:02:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=PCu0f4HoNX7 caVYPLTD2PG4lkgiTCB9Bw+ris27XvNs=; b=jWH/HZBioTNnNbZLKnZuw6hhCP0 7cHT8I5DO1jk/q4JLcPhxPEzYbIcwbW6vMT0XDrg1t1bpaOZzA9909N1dl5Xz9mK 0hiBVwwvowpmaJGUXF9aGklsSrowfN7c4BQ6R7iipwWGXUTD2eVD/j4/6IHrB++G 0JlDNiLNx+cWFSyXWpPm4/tTXhXA4ocitX0kLnb3VIEsV19oBPRFrn0rhoPleWJn APvwwOnYMquD3JHIiFtcWizTVlSoIDRBrhLNwymKgTSzTk0XYaRk3Xx0QTUlt3Dh B9awR4tIohWO+ExAnjP9PvzvPNptlhaUYbL+OrJrlpC+w2il/ZSDER00tOA== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49v0kfa94p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 19 Oct 2025 08:02:16 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-87c0e0d12ddso124129476d6.3 for ; Sun, 19 Oct 2025 01:02:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760860935; x=1761465735; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PCu0f4HoNX7caVYPLTD2PG4lkgiTCB9Bw+ris27XvNs=; b=wwDmc6rvefLTenHAZWxePJLF2w9cfHUgSr8qx2CNA7cYd3SCTV8FggYigTxQ+/MRIn IGRHlDtkZZGZpvn8alg2yRiTiILKNNcj24SNb67cXjGxKAoAUB8AHiRo5kJ3WZ3mYs8+ oneDj9IWCsGYl0y3hFjTwA8RRs8wD1fjoSwN0E2A254Y7M8O/KPYiFah4jFwiH17lYI+ 7T/EA7hkh1IR1G5leGhLGKrL/RlfZ5/KlRta0DU41uHAit2H4T1xX2lFG7mZM2O8xCDR jDWZ/epuIOqbY0F39uDbSMAw0sE7vHHjiAu0+bMUNey2bRtphpJQOKX2cbKjaYQF+ZPl wRuQ== X-Forwarded-Encrypted: i=1; AJvYcCX9mDGz72afa0548tAwFs36+eqHHlQXBycHFHi4hAEOCaYvg5vsKJBqUjJU279SNtOxshO+zGXA4nGETy89@vger.kernel.org X-Gm-Message-State: AOJu0Yxb3OtKk1Ma7gBVKI/mP7a4exx0fGkDjzdwX97IkZVEkQs1yxTr FI13cwXcit/oS3yNuNtQnuMQp9gtlaB4WS8dVuibcQEQajnT+5ansj2AnBwciDJti0xlZTyjnAK KM0L+k7TAvh1cdhYAVb04VDT8kcL1Vhrlm8vJzSAuOnXruSdOX9ieTkDR7sCE9QXmoJDL X-Gm-Gg: ASbGncvqdgJpgYDFV7WeU//5DtnhbAku7IQSh3cFs2Ifz6lq113cWkmp4PWgngCGhUv o+htxvwJru7Ta5xrYHow2mgZQ8KTSmrlic8E/u0Ad+CYCo1+nM99aInnxjCxl+aow1R9fZH1+Yz 3pUgtk8sCtIkhXcKVC6Ue5LZVdYk+2o3iWsfLyqr+MXSCR5uAGyGEQxP1WF7CiT63CWMXM4InXD 5OqvLZysx+PyIKnTwOSmDugcFc3U9d2ZeKRJMwPAmfgMrIaiBTMc1zSRoqEU+rTyS8bWsLax0wj GDN0hxHtmhERZLXSLF7GHQxYzPeYY3IPI0fGRxxJOQjNQLQGRzE5sX8eiysYb+FwGHiSnBbWf8S Qxry2UkykU0Xwlg3CrnDa4Ne5SdQg+h33QFPlL5qhI3w5vg6iphr2luIiBIFIwj9ZESNUCblCXN QxU24O4DO2t24= X-Received: by 2002:a05:622a:1a87:b0:4e8:a359:b798 with SMTP id d75a77b69052e-4e8a359be46mr88922571cf.67.1760860935540; Sun, 19 Oct 2025 01:02:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG1eVAe3sKqBxqT4zkB9fpGbudrcKFbHhI0WnnRPaKtVd0Wn3A5JdSj2juSSn+NQSfKGzlVYw== X-Received: by 2002:a05:622a:1a87:b0:4e8:a359:b798 with SMTP id d75a77b69052e-4e8a359be46mr88922131cf.67.1760860935059; Sun, 19 Oct 2025 01:02:15 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-591def1695fsm1353170e87.61.2025.10.19.01.02.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 01:02:14 -0700 (PDT) From: Dmitry Baryshkov To: Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Dmitry Baryshkov , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vishnu Reddy , Vikash Garodia Subject: [PATCH 1/2] media: iris: sort out common register definitions Date: Sun, 19 Oct 2025 10:59:01 +0300 Message-ID: <20251019080212.142623-3-dmitry.baryshkov@oss.qualcomm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <0251017-knp_video-v2-5-f568ce1a4be3@oss.qualcomm.com> References: <0251017-knp_video-v2-5-f568ce1a4be3@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=E6LAZKdl c=1 sm=1 tr=0 ts=68f49b08 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=zaoXWFKIo8GWO-w5zvgA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-ORIG-GUID: qCReXxeaUA1lyMSrUhaWjgLvRg_tFdp0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAwMiBTYWx0ZWRfX72/XSQ6/G4iu U5KJMxvQr4XHiFJiZ0AdZnq5Re5ttqQHkHwpM7ut1kzgtS29xWRzhpxxigpf/aT33NWFenznRRP mSPN7uUjjE6egNOZNSeLqan3dIqbqJikBsLvWVDJbrfdBmb5NoBicD44V9FgTMgNNg9mcjUeww3 n0iMY+G6v5+FnR1fOWo2jsqdubHQX0AmLLrg+TVNnOJrLw8RAqBvdywfwkstdGzD9RlVc+BzWp0 ofJIezhgrMzbkoCmHQthJ6FnuyZVxgOujmaXLsj1W/8OfwR/l7Gx1WLOeQ/4DTCz+nqzANhlIrh CZFPq3N+4kJrvH1DbE6jzw2XH/SLvz0nVIJFqweI5+v6L6hZkI3M2dBBVgaVFtnJdTRyfyn2wzg Xl/DZKQuT6Uc10Qhn2NjgrAQBkmynA== X-Proofpoint-GUID: qCReXxeaUA1lyMSrUhaWjgLvRg_tFdp0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-19_03,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 bulkscore=0 priorityscore=1501 spamscore=0 phishscore=0 impostorscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510180002 In order to make it easier to modify the file, sort the definitions by the register base and then by the offset. Also move bits definitions next to the registers which they describe (as it was done before). Signed-off-by: Dmitry Baryshkov --- Vikash, I have dropped these patches from SC7280 patchseries as they are no longer required. If the series gets resent, please feel free to pick these two patches in or to squash them into the corresponding patch. --- .../qcom/iris/iris_vpu_register_defines.h | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h b/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h index 6474f561c8dc..1c3ff6cab343 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h @@ -7,40 +7,49 @@ #define __IRIS_VPU_REGISTER_DEFINES_H__ #define VCODEC_BASE_OFFS 0x00000000 +#define AON_MVP_NOC_RESET 0x0001F000 #define CPU_BASE_OFFS 0x000A0000 #define WRAPPER_BASE_OFFS 0x000B0000 -#define AON_BASE_OFFS 0x000E0000 #define WRAPPER_TZ_BASE_OFFS 0x000C0000 -#define AON_MVP_NOC_RESET 0x0001F000 +#define AON_BASE_OFFS 0x000E0000 -#define CPU_CS_BASE_OFFS (CPU_BASE_OFFS) +#define VCODEC_SS_IDLE_STATUSN (VCODEC_BASE_OFFS + 0x70) -#define WRAPPER_CORE_POWER_STATUS (WRAPPER_BASE_OFFS + 0x80) -#define WRAPPER_CORE_CLOCK_CONFIG (WRAPPER_BASE_OFFS + 0x88) -#define AON_WRAPPER_MVP_NOC_LPI_CONTROL (AON_BASE_OFFS) -#define WRAPPER_DEBUG_BRIDGE_LPI_CONTROL (WRAPPER_BASE_OFFS + 0x54) -#define WRAPPER_DEBUG_BRIDGE_LPI_STATUS (WRAPPER_BASE_OFFS + 0x58) -#define WRAPPER_IRIS_CPU_NOC_LPI_CONTROL (WRAPPER_BASE_OFFS + 0x5C) -#define WRAPPER_IRIS_CPU_NOC_LPI_STATUS (WRAPPER_BASE_OFFS + 0x60) -#define WRAPPER_TZ_CTL_AXI_CLOCK_CONFIG (WRAPPER_TZ_BASE_OFFS + 0x14) -#define CPU_CS_AHB_BRIDGE_SYNC_RESET (CPU_CS_BASE_OFFS + 0x160) -#define CPU_CS_X2RPMH (CPU_CS_BASE_OFFS + 0x168) #define AON_WRAPPER_MVP_NOC_RESET_REQ (AON_MVP_NOC_RESET + 0x000) + #define AON_WRAPPER_MVP_NOC_RESET_ACK (AON_MVP_NOC_RESET + 0x004) -#define VCODEC_SS_IDLE_STATUSN (VCODEC_BASE_OFFS + 0x70) -#define AON_WRAPPER_MVP_NOC_LPI_STATUS (AON_BASE_OFFS + 0x4) -#define WRAPPER_TZ_QNS4PDXFIFO_RESET (WRAPPER_TZ_BASE_OFFS + 0x18) +#define CPU_CS_BASE_OFFS (CPU_BASE_OFFS) + +#define CPU_CS_AHB_BRIDGE_SYNC_RESET (CPU_CS_BASE_OFFS + 0x160) #define CORE_BRIDGE_SW_RESET BIT(0) #define CORE_BRIDGE_HW_RESET_DISABLE BIT(1) + +#define CPU_CS_X2RPMH (CPU_CS_BASE_OFFS + 0x168) #define MSK_SIGNAL_FROM_TENSILICA BIT(0) #define MSK_CORE_POWER_ON BIT(1) -#define CTL_AXI_CLK_HALT BIT(0) -#define CTL_CLK_HALT BIT(1) + +#define WRAPPER_DEBUG_BRIDGE_LPI_CONTROL (WRAPPER_BASE_OFFS + 0x54) +#define WRAPPER_DEBUG_BRIDGE_LPI_STATUS (WRAPPER_BASE_OFFS + 0x58) +#define WRAPPER_IRIS_CPU_NOC_LPI_CONTROL (WRAPPER_BASE_OFFS + 0x5C) #define REQ_POWER_DOWN_PREP BIT(0) -#define RESET_HIGH BIT(0) + +#define WRAPPER_IRIS_CPU_NOC_LPI_STATUS (WRAPPER_BASE_OFFS + 0x60) #define NOC_LPI_STATUS_DONE BIT(0) /* Indicates the NOC handshake is complete */ #define NOC_LPI_STATUS_DENY BIT(1) /* Indicates the NOC handshake is denied */ #define NOC_LPI_STATUS_ACTIVE BIT(2) /* Indicates the NOC is active */ +#define WRAPPER_CORE_POWER_STATUS (WRAPPER_BASE_OFFS + 0x80) +#define WRAPPER_CORE_CLOCK_CONFIG (WRAPPER_BASE_OFFS + 0x88) + +#define WRAPPER_TZ_CTL_AXI_CLOCK_CONFIG (WRAPPER_TZ_BASE_OFFS + 0x14) +#define CTL_AXI_CLK_HALT BIT(0) +#define CTL_CLK_HALT BIT(1) + +#define WRAPPER_TZ_QNS4PDXFIFO_RESET (WRAPPER_TZ_BASE_OFFS + 0x18) +#define RESET_HIGH BIT(0) + +#define AON_WRAPPER_MVP_NOC_LPI_CONTROL (AON_BASE_OFFS) +#define AON_WRAPPER_MVP_NOC_LPI_STATUS (AON_BASE_OFFS + 0x4) + #endif -- 2.47.3