mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 12:21:22 -05:00
Merge branch 'icc-kaanapali' into icc-next
Add interconnect dt-bindings and driver support for Qualcomm Kaanapali SoC. * icc-kaanapali dt-bindings: interconnect: document the RPMh Network-On-Chip interconnect in Kaanapali SoC interconnect: qcom: add Kaanapali interconnect provider driver dt-bindings: interconnect: qcom-bwmon: Document Kaanapali BWMONs Link: https://lore.kernel.org/r/20251031-knp-interconnect-v4-0-568bba2cb3e5@oss.qualcomm.com Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
@@ -0,0 +1,124 @@
|
||||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/interconnect/qcom,kaanapali-rpmh.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Qualcomm RPMh Network-On-Chip Interconnect on Kaanapali
|
||||
|
||||
maintainers:
|
||||
- Raviteja Laggyshetty <raviteja.laggyshetty@oss.qualcomm.com>
|
||||
|
||||
description: |
|
||||
RPMh interconnect providers support system bandwidth requirements through
|
||||
RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is
|
||||
able to communicate with the BCM through the Resource State Coordinator (RSC)
|
||||
associated with each execution environment. Provider nodes must point to at
|
||||
least one RPMh device child node pertaining to their RSC and each provider
|
||||
can map to multiple RPMh resources.
|
||||
|
||||
See also: include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- qcom,kaanapali-aggre-noc
|
||||
- qcom,kaanapali-clk-virt
|
||||
- qcom,kaanapali-cnoc-main
|
||||
- qcom,kaanapali-cnoc-cfg
|
||||
- qcom,kaanapali-gem-noc
|
||||
- qcom,kaanapali-lpass-ag-noc
|
||||
- qcom,kaanapali-lpass-lpiaon-noc
|
||||
- qcom,kaanapali-lpass-lpicx-noc
|
||||
- qcom,kaanapali-mc-virt
|
||||
- qcom,kaanapali-mmss-noc
|
||||
- qcom,kaanapali-nsp-noc
|
||||
- qcom,kaanapali-pcie-anoc
|
||||
- qcom,kaanapali-system-noc
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
clocks:
|
||||
minItems: 2
|
||||
maxItems: 3
|
||||
|
||||
required:
|
||||
- compatible
|
||||
|
||||
allOf:
|
||||
- $ref: qcom,rpmh-common.yaml#
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- qcom,kaanapali-clk-virt
|
||||
- qcom,kaanapali-mc-virt
|
||||
then:
|
||||
properties:
|
||||
reg: false
|
||||
else:
|
||||
required:
|
||||
- reg
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- qcom,kaanapali-pcie-anoc
|
||||
then:
|
||||
properties:
|
||||
clocks:
|
||||
items:
|
||||
- description: aggre-NOC PCIe AXI clock
|
||||
- description: cfg-NOC PCIe a-NOC AHB clock
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- qcom,kaanapali-aggre-noc
|
||||
then:
|
||||
properties:
|
||||
clocks:
|
||||
items:
|
||||
- description: aggre UFS PHY AXI clock
|
||||
- description: aggre USB3 PRIM AXI clock
|
||||
- description: RPMH CC IPA clock
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- qcom,kaanapali-aggre-noc
|
||||
- qcom,kaanapali-pcie-anoc
|
||||
then:
|
||||
required:
|
||||
- clocks
|
||||
else:
|
||||
properties:
|
||||
clocks: false
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
clk_virt: interconnect-0 {
|
||||
compatible = "qcom,kaanapali-clk-virt";
|
||||
#interconnect-cells = <2>;
|
||||
qcom,bcm-voters = <&apps_bcm_voter>;
|
||||
};
|
||||
|
||||
aggre_noc: interconnect@16e0000 {
|
||||
compatible = "qcom,kaanapali-aggre-noc";
|
||||
reg = <0x016e0000 0x42400>;
|
||||
#interconnect-cells = <2>;
|
||||
clocks = <&gcc_aggre_ufs_phy_axi_clk>,
|
||||
<&gcc_aggre_usb3_prim_axi_clk>,
|
||||
<&rpmhcc_ipa_clk>;
|
||||
qcom,bcm-voters = <&apps_bcm_voter>;
|
||||
};
|
||||
@@ -25,6 +25,7 @@ properties:
|
||||
- const: qcom,msm8998-bwmon # BWMON v4
|
||||
- items:
|
||||
- enum:
|
||||
- qcom,kaanapali-cpu-bwmon
|
||||
- qcom,qcm2290-cpu-bwmon
|
||||
- qcom,qcs615-cpu-bwmon
|
||||
- qcom,qcs8300-cpu-bwmon
|
||||
|
||||
@@ -17,6 +17,15 @@ config INTERCONNECT_QCOM_GLYMUR
|
||||
This is a driver for the Qualcomm Network-on-Chip on glymur-based
|
||||
platforms.
|
||||
|
||||
config INTERCONNECT_QCOM_KAANAPALI
|
||||
tristate "Qualcomm KAANAPALI interconnect driver"
|
||||
depends on INTERCONNECT_QCOM_RPMH_POSSIBLE
|
||||
select INTERCONNECT_QCOM_RPMH
|
||||
select INTERCONNECT_QCOM_BCM_VOTER
|
||||
help
|
||||
This is a driver for the Qualcomm Network-on-Chip on kaanapali-based
|
||||
platforms.
|
||||
|
||||
config INTERCONNECT_QCOM_MSM8909
|
||||
tristate "Qualcomm MSM8909 interconnect driver"
|
||||
depends on INTERCONNECT_QCOM
|
||||
|
||||
@@ -5,6 +5,7 @@ obj-$(CONFIG_INTERCONNECT_QCOM) += interconnect_qcom.o
|
||||
interconnect_qcom-y := icc-common.o
|
||||
icc-bcm-voter-objs := bcm-voter.o
|
||||
qnoc-glymur-objs := glymur.o
|
||||
qnoc-kaanapali-objs := kaanapali.o
|
||||
qnoc-milos-objs := milos.o
|
||||
qnoc-msm8909-objs := msm8909.o
|
||||
qnoc-msm8916-objs := msm8916.o
|
||||
@@ -48,6 +49,7 @@ icc-smd-rpm-objs := smd-rpm.o icc-rpm.o icc-rpm-clocks.o
|
||||
|
||||
obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o
|
||||
obj-$(CONFIG_INTERCONNECT_QCOM_GLYMUR) += qnoc-glymur.o
|
||||
obj-$(CONFIG_INTERCONNECT_QCOM_KAANAPALI) += qnoc-kaanapali.o
|
||||
obj-$(CONFIG_INTERCONNECT_QCOM_MILOS) += qnoc-milos.o
|
||||
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8909) += qnoc-msm8909.o
|
||||
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += qnoc-msm8916.o
|
||||
|
||||
1868
drivers/interconnect/qcom/kaanapali.c
Normal file
1868
drivers/interconnect/qcom/kaanapali.c
Normal file
File diff suppressed because it is too large
Load Diff
149
include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h
Normal file
149
include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h
Normal file
@@ -0,0 +1,149 @@
|
||||
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
|
||||
/*
|
||||
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
|
||||
*/
|
||||
|
||||
#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_KAANAPALI_H
|
||||
#define __DT_BINDINGS_INTERCONNECT_QCOM_KAANAPALI_H
|
||||
|
||||
#define MASTER_QSPI_0 0
|
||||
#define MASTER_CRYPTO 1
|
||||
#define MASTER_QUP_1 2
|
||||
#define MASTER_SDCC_4 3
|
||||
#define MASTER_UFS_MEM 4
|
||||
#define MASTER_USB3 5
|
||||
#define MASTER_QUP_2 6
|
||||
#define MASTER_QUP_3 7
|
||||
#define MASTER_QUP_4 8
|
||||
#define MASTER_IPA 9
|
||||
#define MASTER_SOCCP_PROC 10
|
||||
#define MASTER_SP 11
|
||||
#define MASTER_QDSS_ETR 12
|
||||
#define MASTER_QDSS_ETR_1 13
|
||||
#define MASTER_SDCC_2 14
|
||||
#define SLAVE_A1NOC_SNOC 15
|
||||
#define SLAVE_A2NOC_SNOC 16
|
||||
|
||||
#define MASTER_QUP_CORE_0 0
|
||||
#define MASTER_QUP_CORE_1 1
|
||||
#define MASTER_QUP_CORE_2 2
|
||||
#define MASTER_QUP_CORE_3 3
|
||||
#define MASTER_QUP_CORE_4 4
|
||||
#define SLAVE_QUP_CORE_0 5
|
||||
#define SLAVE_QUP_CORE_1 6
|
||||
#define SLAVE_QUP_CORE_2 7
|
||||
#define SLAVE_QUP_CORE_3 8
|
||||
#define SLAVE_QUP_CORE_4 9
|
||||
|
||||
#define MASTER_CNOC_CFG 0
|
||||
#define SLAVE_AHB2PHY_SOUTH 1
|
||||
#define SLAVE_AHB2PHY_NORTH 2
|
||||
#define SLAVE_CAMERA_CFG 3
|
||||
#define SLAVE_CLK_CTL 4
|
||||
#define SLAVE_CRYPTO_0_CFG 5
|
||||
#define SLAVE_DISPLAY_CFG 6
|
||||
#define SLAVE_EVA_CFG 7
|
||||
#define SLAVE_GFX3D_CFG 8
|
||||
#define SLAVE_I2C 9
|
||||
#define SLAVE_I3C_IBI0_CFG 10
|
||||
#define SLAVE_I3C_IBI1_CFG 11
|
||||
#define SLAVE_IMEM_CFG 12
|
||||
#define SLAVE_IPC_ROUTER_CFG 13
|
||||
#define SLAVE_CNOC_MSS 14
|
||||
#define SLAVE_PCIE_CFG 15
|
||||
#define SLAVE_PRNG 16
|
||||
#define SLAVE_QDSS_CFG 17
|
||||
#define SLAVE_QSPI_0 18
|
||||
#define SLAVE_QUP_1 19
|
||||
#define SLAVE_QUP_2 20
|
||||
#define SLAVE_QUP_3 21
|
||||
#define SLAVE_QUP_4 22
|
||||
#define SLAVE_SDCC_2 23
|
||||
#define SLAVE_SDCC_4 24
|
||||
#define SLAVE_SPSS_CFG 25
|
||||
#define SLAVE_TCSR 26
|
||||
#define SLAVE_TLMM 27
|
||||
#define SLAVE_UFS_MEM_CFG 28
|
||||
#define SLAVE_USB3 29
|
||||
#define SLAVE_VENUS_CFG 30
|
||||
#define SLAVE_VSENSE_CTRL_CFG 31
|
||||
#define SLAVE_CNOC_MNOC_CFG 32
|
||||
#define SLAVE_PCIE_ANOC_CFG 33
|
||||
#define SLAVE_QDSS_STM 34
|
||||
#define SLAVE_TCU 35
|
||||
|
||||
#define MASTER_GEM_NOC_CNOC 0
|
||||
#define MASTER_GEM_NOC_PCIE_SNOC 1
|
||||
#define SLAVE_AOSS 2
|
||||
#define SLAVE_IPA_CFG 3
|
||||
#define SLAVE_IPC_ROUTER_FENCE 4
|
||||
#define SLAVE_SOCCP 5
|
||||
#define SLAVE_TME_CFG 6
|
||||
#define SLAVE_APPSS 7
|
||||
#define SLAVE_CNOC_CFG 8
|
||||
#define SLAVE_DDRSS_CFG 9
|
||||
#define SLAVE_BOOT_IMEM 10
|
||||
#define SLAVE_IMEM 11
|
||||
#define SLAVE_PCIE_0 12
|
||||
|
||||
#define MASTER_GPU_TCU 0
|
||||
#define MASTER_SYS_TCU 1
|
||||
#define MASTER_APPSS_PROC 2
|
||||
#define MASTER_GFX3D 3
|
||||
#define MASTER_LPASS_GEM_NOC 4
|
||||
#define MASTER_MSS_PROC 5
|
||||
#define MASTER_MNOC_HF_MEM_NOC 6
|
||||
#define MASTER_MNOC_SF_MEM_NOC 7
|
||||
#define MASTER_COMPUTE_NOC 8
|
||||
#define MASTER_ANOC_PCIE_GEM_NOC 9
|
||||
#define MASTER_QPACE 10
|
||||
#define MASTER_SNOC_SF_MEM_NOC 11
|
||||
#define MASTER_WLAN_Q6 12
|
||||
#define MASTER_GIC 13
|
||||
#define SLAVE_GEM_NOC_CNOC 14
|
||||
#define SLAVE_LLCC 15
|
||||
#define SLAVE_MEM_NOC_PCIE_SNOC 16
|
||||
|
||||
#define MASTER_LPIAON_NOC 0
|
||||
#define SLAVE_LPASS_GEM_NOC 1
|
||||
|
||||
#define MASTER_LPASS_LPINOC 0
|
||||
#define SLAVE_LPIAON_NOC_LPASS_AG_NOC 1
|
||||
|
||||
#define MASTER_LPASS_PROC 0
|
||||
#define SLAVE_LPICX_NOC_LPIAON_NOC 1
|
||||
|
||||
#define MASTER_LLCC 0
|
||||
#define SLAVE_EBI1 1
|
||||
|
||||
#define MASTER_CAMNOC_HF 0
|
||||
#define MASTER_CAMNOC_NRT_ICP_SF 1
|
||||
#define MASTER_CAMNOC_RT_CDM_SF 2
|
||||
#define MASTER_CAMNOC_SF 3
|
||||
#define MASTER_MDP 4
|
||||
#define MASTER_MDSS_DCP 5
|
||||
#define MASTER_CDSP_HCP 6
|
||||
#define MASTER_VIDEO_CV_PROC 7
|
||||
#define MASTER_VIDEO_EVA 8
|
||||
#define MASTER_VIDEO_MVP 9
|
||||
#define MASTER_VIDEO_V_PROC 10
|
||||
#define MASTER_CNOC_MNOC_CFG 11
|
||||
#define SLAVE_MNOC_HF_MEM_NOC 12
|
||||
#define SLAVE_MNOC_SF_MEM_NOC 13
|
||||
#define SLAVE_SERVICE_MNOC 14
|
||||
|
||||
#define MASTER_CDSP_PROC 0
|
||||
#define SLAVE_CDSP_MEM_NOC 1
|
||||
|
||||
#define MASTER_PCIE_ANOC_CFG 0
|
||||
#define MASTER_PCIE_0 1
|
||||
#define SLAVE_ANOC_PCIE_GEM_NOC 2
|
||||
#define SLAVE_SERVICE_PCIE_ANOC 3
|
||||
|
||||
#define MASTER_A1NOC_SNOC 0
|
||||
#define MASTER_A2NOC_SNOC 1
|
||||
#define MASTER_APSS_NOC 2
|
||||
#define MASTER_CNOC_SNOC 3
|
||||
#define SLAVE_SNOC_GEM_NOC_SF 4
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user