Merge branch 'clk-qcom' into clk-next

* clk-qcom: (87 commits)
  clk: qcom: Fix SM_GPUCC_8450 dependencies
  clk: qcom: smd-rpm: Set XO rate and CLK_IS_CRITICAL on PCNoC
  clk: qcom: smd-rpm: Add a way to define bus clocks with rate and flags
  clk: qcom: gcc-ipq5018: change some variable static
  clk: qcom: gcc-ipq4019: add missing networking resets
  dt-bindings: clock: qcom: ipq4019: add missing networking resets
  clk: qcom: gcc-msm8917: Enable GPLL0_SLEEP_CLK_SRC
  dt-bindings: clock: gcc-msm8917: Add definition for GPLL0_SLEEP_CLK_SRC
  clk: qcom: gcc-qdu1000: Update the RCGs ops
  clk: qcom: gcc-qdu1000: Update the SDCC clock RCG ops
  clk: qcom: gcc-qdu1000: Add support for GDSCs
  clk: qcom: gcc-qdu1000: Add gcc_ddrss_ecpri_gsi_clk support
  clk: qcom: gcc-qdu1000: Register gcc_gpll1_out_even clock
  clk: qcom: gcc-qdu1000: Fix clkref clocks handling
  clk: qcom: gcc-qdu1000: Fix gcc_pcie_0_pipe_clk_src clock handling
  dt-bindings: clock: Update GCC clocks for QDU1000 and QRU1000 SoCs
  clk: qcom: gcc-sm8450: Use floor ops for SDCC RCGs
  clk: qcom: ipq5332: drop the gcc_apss_axi_clk_src clock
  clk: qcom: ipq5332: drop the mem noc clocks
  clk: qcom: gcc-msm8998: Don't check halt bit on some branch clks
  ...
This commit is contained in:
Stephen Boyd
2023-08-30 14:39:58 -07:00
92 changed files with 5383 additions and 1436 deletions

View File

@@ -165,5 +165,11 @@
#define GCC_QDSS_BCR 69
#define GCC_MPM_BCR 70
#define GCC_SPDM_BCR 71
#define ESS_MAC1_ARES 72
#define ESS_MAC2_ARES 73
#define ESS_MAC3_ARES 74
#define ESS_MAC4_ARES 75
#define ESS_MAC5_ARES 76
#define ESS_PSGMII_ARES 77
#endif

View File

@@ -0,0 +1,183 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
/*
* Copyright (c) 2023, The Linux Foundation. All rights reserved.
*/
#ifndef _DT_BINDINGS_CLOCK_IPQ_GCC_5018_H
#define _DT_BINDINGS_CLOCK_IPQ_GCC_5018_H
#define GPLL0_MAIN 0
#define GPLL0 1
#define GPLL2_MAIN 2
#define GPLL2 3
#define GPLL4_MAIN 4
#define GPLL4 5
#define UBI32_PLL_MAIN 6
#define UBI32_PLL 7
#define ADSS_PWM_CLK_SRC 8
#define BLSP1_QUP1_I2C_APPS_CLK_SRC 9
#define BLSP1_QUP1_SPI_APPS_CLK_SRC 10
#define BLSP1_QUP2_I2C_APPS_CLK_SRC 11
#define BLSP1_QUP2_SPI_APPS_CLK_SRC 12
#define BLSP1_QUP3_I2C_APPS_CLK_SRC 13
#define BLSP1_QUP3_SPI_APPS_CLK_SRC 14
#define BLSP1_UART1_APPS_CLK_SRC 15
#define BLSP1_UART2_APPS_CLK_SRC 16
#define CRYPTO_CLK_SRC 17
#define GCC_ADSS_PWM_CLK 18
#define GCC_BLSP1_AHB_CLK 19
#define GCC_BLSP1_QUP1_I2C_APPS_CLK 20
#define GCC_BLSP1_QUP1_SPI_APPS_CLK 21
#define GCC_BLSP1_QUP2_I2C_APPS_CLK 22
#define GCC_BLSP1_QUP2_SPI_APPS_CLK 23
#define GCC_BLSP1_QUP3_I2C_APPS_CLK 24
#define GCC_BLSP1_QUP3_SPI_APPS_CLK 25
#define GCC_BLSP1_UART1_APPS_CLK 26
#define GCC_BLSP1_UART2_APPS_CLK 27
#define GCC_BTSS_LPO_CLK 28
#define GCC_CMN_BLK_AHB_CLK 29
#define GCC_CMN_BLK_SYS_CLK 30
#define GCC_CRYPTO_AHB_CLK 31
#define GCC_CRYPTO_AXI_CLK 32
#define GCC_CRYPTO_CLK 33
#define GCC_CRYPTO_PPE_CLK 34
#define GCC_DCC_CLK 35
#define GCC_GEPHY_RX_CLK 36
#define GCC_GEPHY_TX_CLK 37
#define GCC_GMAC0_CFG_CLK 38
#define GCC_GMAC0_PTP_CLK 39
#define GCC_GMAC0_RX_CLK 40
#define GCC_GMAC0_SYS_CLK 41
#define GCC_GMAC0_TX_CLK 42
#define GCC_GMAC1_CFG_CLK 43
#define GCC_GMAC1_PTP_CLK 44
#define GCC_GMAC1_RX_CLK 45
#define GCC_GMAC1_SYS_CLK 46
#define GCC_GMAC1_TX_CLK 47
#define GCC_GP1_CLK 48
#define GCC_GP2_CLK 49
#define GCC_GP3_CLK 50
#define GCC_LPASS_CORE_AXIM_CLK 51
#define GCC_LPASS_SWAY_CLK 52
#define GCC_MDIO0_AHB_CLK 53
#define GCC_MDIO1_AHB_CLK 54
#define GCC_PCIE0_AHB_CLK 55
#define GCC_PCIE0_AUX_CLK 56
#define GCC_PCIE0_AXI_M_CLK 57
#define GCC_PCIE0_AXI_S_BRIDGE_CLK 58
#define GCC_PCIE0_AXI_S_CLK 59
#define GCC_PCIE0_PIPE_CLK 60
#define GCC_PCIE1_AHB_CLK 61
#define GCC_PCIE1_AUX_CLK 62
#define GCC_PCIE1_AXI_M_CLK 63
#define GCC_PCIE1_AXI_S_BRIDGE_CLK 64
#define GCC_PCIE1_AXI_S_CLK 65
#define GCC_PCIE1_PIPE_CLK 66
#define GCC_PRNG_AHB_CLK 67
#define GCC_Q6_AXIM_CLK 68
#define GCC_Q6_AXIM2_CLK 69
#define GCC_Q6_AXIS_CLK 70
#define GCC_Q6_AHB_CLK 71
#define GCC_Q6_AHB_S_CLK 72
#define GCC_Q6_TSCTR_1TO2_CLK 73
#define GCC_Q6SS_ATBM_CLK 74
#define GCC_Q6SS_PCLKDBG_CLK 75
#define GCC_Q6SS_TRIG_CLK 76
#define GCC_QDSS_AT_CLK 77
#define GCC_QDSS_CFG_AHB_CLK 78
#define GCC_QDSS_DAP_AHB_CLK 79
#define GCC_QDSS_DAP_CLK 80
#define GCC_QDSS_ETR_USB_CLK 81
#define GCC_QDSS_EUD_AT_CLK 82
#define GCC_QDSS_STM_CLK 83
#define GCC_QDSS_TRACECLKIN_CLK 84
#define GCC_QDSS_TSCTR_DIV8_CLK 85
#define GCC_QPIC_AHB_CLK 86
#define GCC_QPIC_CLK 87
#define GCC_QPIC_IO_MACRO_CLK 88
#define GCC_SDCC1_AHB_CLK 89
#define GCC_SDCC1_APPS_CLK 90
#define GCC_SLEEP_CLK_SRC 91
#define GCC_SNOC_GMAC0_AHB_CLK 92
#define GCC_SNOC_GMAC0_AXI_CLK 93
#define GCC_SNOC_GMAC1_AHB_CLK 94
#define GCC_SNOC_GMAC1_AXI_CLK 95
#define GCC_SNOC_LPASS_AXIM_CLK 96
#define GCC_SNOC_LPASS_SWAY_CLK 97
#define GCC_SNOC_UBI0_AXI_CLK 98
#define GCC_SYS_NOC_PCIE0_AXI_CLK 99
#define GCC_SYS_NOC_PCIE1_AXI_CLK 100
#define GCC_SYS_NOC_QDSS_STM_AXI_CLK 101
#define GCC_SYS_NOC_USB0_AXI_CLK 102
#define GCC_SYS_NOC_WCSS_AHB_CLK 103
#define GCC_UBI0_AXI_CLK 104
#define GCC_UBI0_CFG_CLK 105
#define GCC_UBI0_CORE_CLK 106
#define GCC_UBI0_DBG_CLK 107
#define GCC_UBI0_NC_AXI_CLK 108
#define GCC_UBI0_UTCM_CLK 109
#define GCC_UNIPHY_AHB_CLK 110
#define GCC_UNIPHY_RX_CLK 111
#define GCC_UNIPHY_SYS_CLK 112
#define GCC_UNIPHY_TX_CLK 113
#define GCC_USB0_AUX_CLK 114
#define GCC_USB0_EUD_AT_CLK 115
#define GCC_USB0_LFPS_CLK 116
#define GCC_USB0_MASTER_CLK 117
#define GCC_USB0_MOCK_UTMI_CLK 118
#define GCC_USB0_PHY_CFG_AHB_CLK 119
#define GCC_USB0_SLEEP_CLK 120
#define GCC_WCSS_ACMT_CLK 121
#define GCC_WCSS_AHB_S_CLK 122
#define GCC_WCSS_AXI_M_CLK 123
#define GCC_WCSS_AXI_S_CLK 124
#define GCC_WCSS_DBG_IFC_APB_BDG_CLK 125
#define GCC_WCSS_DBG_IFC_APB_CLK 126
#define GCC_WCSS_DBG_IFC_ATB_BDG_CLK 127
#define GCC_WCSS_DBG_IFC_ATB_CLK 128
#define GCC_WCSS_DBG_IFC_DAPBUS_BDG_CLK 129
#define GCC_WCSS_DBG_IFC_DAPBUS_CLK 130
#define GCC_WCSS_DBG_IFC_NTS_BDG_CLK 131
#define GCC_WCSS_DBG_IFC_NTS_CLK 132
#define GCC_WCSS_ECAHB_CLK 133
#define GCC_XO_CLK 134
#define GCC_XO_CLK_SRC 135
#define GMAC0_RX_CLK_SRC 136
#define GMAC0_TX_CLK_SRC 137
#define GMAC1_RX_CLK_SRC 138
#define GMAC1_TX_CLK_SRC 139
#define GMAC_CLK_SRC 140
#define GP1_CLK_SRC 141
#define GP2_CLK_SRC 142
#define GP3_CLK_SRC 143
#define LPASS_AXIM_CLK_SRC 144
#define LPASS_SWAY_CLK_SRC 145
#define PCIE0_AUX_CLK_SRC 146
#define PCIE0_AXI_CLK_SRC 147
#define PCIE1_AUX_CLK_SRC 148
#define PCIE1_AXI_CLK_SRC 149
#define PCNOC_BFDCD_CLK_SRC 150
#define Q6_AXI_CLK_SRC 151
#define QDSS_AT_CLK_SRC 152
#define QDSS_STM_CLK_SRC 153
#define QDSS_TSCTR_CLK_SRC 154
#define QDSS_TRACECLKIN_CLK_SRC 155
#define QPIC_IO_MACRO_CLK_SRC 156
#define SDCC1_APPS_CLK_SRC 157
#define SYSTEM_NOC_BFDCD_CLK_SRC 158
#define UBI0_AXI_CLK_SRC 159
#define UBI0_CORE_CLK_SRC 160
#define USB0_AUX_CLK_SRC 161
#define USB0_LFPS_CLK_SRC 162
#define USB0_MASTER_CLK_SRC 163
#define USB0_MOCK_UTMI_CLK_SRC 164
#define WCSS_AHB_CLK_SRC 165
#define PCIE0_PIPE_CLK_SRC 166
#define PCIE1_PIPE_CLK_SRC 167
#define USB0_PIPE_CLK_SRC 168
#define GCC_USB0_PIPE_CLK 169
#define GMAC0_RX_DIV_CLK_SRC 170
#define GMAC0_TX_DIV_CLK_SRC 171
#define GMAC1_RX_DIV_CLK_SRC 172
#define GMAC1_TX_DIV_CLK_SRC 173
#endif

View File

@@ -169,6 +169,7 @@
#define VFE0_CLK_SRC 162
#define VFE1_CLK_SRC 163
#define VSYNC_CLK_SRC 164
#define GPLL0_SLEEP_CLK_SRC 165
/* GCC block resets */
#define GCC_CAMSS_MICRO_BCR 0

View File

@@ -190,6 +190,9 @@
#define AGGRE2_SNOC_NORTH_AXI 181
#define SSC_XO 182
#define SSC_CNOC_AHBS_CLK 183
#define GCC_MMSS_GPLL0_DIV_CLK 184
#define GCC_GPU_GPLL0_DIV_CLK 185
#define GCC_GPU_GPLL0_CLK 186
#define PCIE_0_GDSC 0
#define UFS_GDSC 1

View File

@@ -494,5 +494,15 @@
#define USB30_SEC_GDSC 11
#define EMAC_0_GDSC 12
#define EMAC_1_GDSC 13
#define USB4_1_GDSC 14
#define USB4_GDSC 15
#define HLOS1_VOTE_MMNOC_MMU_TBU_HF0_GDSC 16
#define HLOS1_VOTE_MMNOC_MMU_TBU_HF1_GDSC 17
#define HLOS1_VOTE_MMNOC_MMU_TBU_SF0_GDSC 18
#define HLOS1_VOTE_MMNOC_MMU_TBU_SF1_GDSC 19
#define HLOS1_VOTE_TURING_MMU_TBU0_GDSC 20
#define HLOS1_VOTE_TURING_MMU_TBU1_GDSC 21
#define HLOS1_VOTE_TURING_MMU_TBU2_GDSC 22
#define HLOS1_VOTE_TURING_MMU_TBU3_GDSC 23
#endif

View File

@@ -214,4 +214,6 @@
#define GCC_CRYPTO_CLK 205
#define GCC_CRYPTO_AXI_CLK 206
#define GCC_CRYPTO_AHB_CLK 207
#define GCC_USB0_PIPE_CLK 208
#define GCC_USB0_SLEEP_CLK 209
#endif

View File

@@ -1,44 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* Copyright (c) BayLibre, SAS.
* Author : Neil Armstrong <narmstrong@baylibre.com>
*/
#ifndef _DT_BINDINGS_CLK_LCC_MDM9615_H
#define _DT_BINDINGS_CLK_LCC_MDM9615_H
#define PLL4 0
#define MI2S_OSR_SRC 1
#define MI2S_OSR_CLK 2
#define MI2S_DIV_CLK 3
#define MI2S_BIT_DIV_CLK 4
#define MI2S_BIT_CLK 5
#define PCM_SRC 6
#define PCM_CLK_OUT 7
#define PCM_CLK 8
#define SLIMBUS_SRC 9
#define AUDIO_SLIMBUS_CLK 10
#define SPS_SLIMBUS_CLK 11
#define CODEC_I2S_MIC_OSR_SRC 12
#define CODEC_I2S_MIC_OSR_CLK 13
#define CODEC_I2S_MIC_DIV_CLK 14
#define CODEC_I2S_MIC_BIT_DIV_CLK 15
#define CODEC_I2S_MIC_BIT_CLK 16
#define SPARE_I2S_MIC_OSR_SRC 17
#define SPARE_I2S_MIC_OSR_CLK 18
#define SPARE_I2S_MIC_DIV_CLK 19
#define SPARE_I2S_MIC_BIT_DIV_CLK 20
#define SPARE_I2S_MIC_BIT_CLK 21
#define CODEC_I2S_SPKR_OSR_SRC 22
#define CODEC_I2S_SPKR_OSR_CLK 23
#define CODEC_I2S_SPKR_DIV_CLK 24
#define CODEC_I2S_SPKR_BIT_DIV_CLK 25
#define CODEC_I2S_SPKR_BIT_CLK 26
#define SPARE_I2S_SPKR_OSR_SRC 27
#define SPARE_I2S_SPKR_OSR_CLK 28
#define SPARE_I2S_SPKR_DIV_CLK 29
#define SPARE_I2S_SPKR_BIT_DIV_CLK 30
#define SPARE_I2S_SPKR_BIT_CLK 31
#endif

View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */
/*
* Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef _DT_BINDINGS_CLK_QCOM_GCC_QDU1000_H
@@ -138,6 +138,8 @@
#define GCC_AGGRE_NOC_ECPRI_GSI_CLK 128
#define GCC_PCIE_0_PIPE_CLK_SRC 129
#define GCC_PCIE_0_PHY_AUX_CLK_SRC 130
#define GCC_GPLL1_OUT_EVEN 131
#define GCC_DDRSS_ECPRI_GSI_CLK 132
/* GCC resets */
#define GCC_ECPRI_CC_BCR 0

View File

@@ -0,0 +1,13 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
/*
* Copyright (c) 2023, Linaro Limited
*/
#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_RPM_ICC_H
#define __DT_BINDINGS_INTERCONNECT_QCOM_RPM_ICC_H
#define RPM_ACTIVE_TAG (1 << 0)
#define RPM_SLEEP_TAG (1 << 1)
#define RPM_ALWAYS_TAG (RPM_ACTIVE_TAG | RPM_SLEEP_TAG)
#endif

View File

@@ -0,0 +1,122 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
/*
* Copyright (c) 2023, The Linux Foundation. All rights reserved.
*/
#ifndef _DT_BINDINGS_RESET_IPQ_GCC_5018_H
#define _DT_BINDINGS_RESET_IPQ_GCC_5018_H
#define GCC_APC0_VOLTAGE_DROOP_DETECTOR_BCR 0
#define GCC_BLSP1_BCR 1
#define GCC_BLSP1_QUP1_BCR 2
#define GCC_BLSP1_QUP2_BCR 3
#define GCC_BLSP1_QUP3_BCR 4
#define GCC_BLSP1_UART1_BCR 5
#define GCC_BLSP1_UART2_BCR 6
#define GCC_BOOT_ROM_BCR 7
#define GCC_BTSS_BCR 8
#define GCC_CMN_BLK_BCR 9
#define GCC_CMN_LDO_BCR 10
#define GCC_CE_BCR 11
#define GCC_CRYPTO_BCR 12
#define GCC_DCC_BCR 13
#define GCC_DCD_BCR 14
#define GCC_DDRSS_BCR 15
#define GCC_EDPD_BCR 16
#define GCC_GEPHY_BCR 17
#define GCC_GEPHY_MDC_SW_ARES 18
#define GCC_GEPHY_DSP_HW_ARES 19
#define GCC_GEPHY_RX_ARES 20
#define GCC_GEPHY_TX_ARES 21
#define GCC_GMAC0_BCR 22
#define GCC_GMAC0_CFG_ARES 23
#define GCC_GMAC0_SYS_ARES 24
#define GCC_GMAC1_BCR 25
#define GCC_GMAC1_CFG_ARES 26
#define GCC_GMAC1_SYS_ARES 27
#define GCC_IMEM_BCR 28
#define GCC_LPASS_BCR 29
#define GCC_MDIO0_BCR 30
#define GCC_MDIO1_BCR 31
#define GCC_MPM_BCR 32
#define GCC_PCIE0_BCR 33
#define GCC_PCIE0_LINK_DOWN_BCR 34
#define GCC_PCIE0_PHY_BCR 35
#define GCC_PCIE0PHY_PHY_BCR 36
#define GCC_PCIE0_PIPE_ARES 37
#define GCC_PCIE0_SLEEP_ARES 38
#define GCC_PCIE0_CORE_STICKY_ARES 39
#define GCC_PCIE0_AXI_MASTER_ARES 40
#define GCC_PCIE0_AXI_SLAVE_ARES 41
#define GCC_PCIE0_AHB_ARES 42
#define GCC_PCIE0_AXI_MASTER_STICKY_ARES 43
#define GCC_PCIE0_AXI_SLAVE_STICKY_ARES 44
#define GCC_PCIE1_BCR 45
#define GCC_PCIE1_LINK_DOWN_BCR 46
#define GCC_PCIE1_PHY_BCR 47
#define GCC_PCIE1PHY_PHY_BCR 48
#define GCC_PCIE1_PIPE_ARES 49
#define GCC_PCIE1_SLEEP_ARES 50
#define GCC_PCIE1_CORE_STICKY_ARES 51
#define GCC_PCIE1_AXI_MASTER_ARES 52
#define GCC_PCIE1_AXI_SLAVE_ARES 53
#define GCC_PCIE1_AHB_ARES 54
#define GCC_PCIE1_AXI_MASTER_STICKY_ARES 55
#define GCC_PCIE1_AXI_SLAVE_STICKY_ARES 56
#define GCC_PCNOC_BCR 57
#define GCC_PCNOC_BUS_TIMEOUT0_BCR 58
#define GCC_PCNOC_BUS_TIMEOUT1_BCR 59
#define GCC_PCNOC_BUS_TIMEOUT2_BCR 60
#define GCC_PCNOC_BUS_TIMEOUT3_BCR 61
#define GCC_PCNOC_BUS_TIMEOUT4_BCR 62
#define GCC_PCNOC_BUS_TIMEOUT5_BCR 63
#define GCC_PCNOC_BUS_TIMEOUT6_BCR 64
#define GCC_PCNOC_BUS_TIMEOUT7_BCR 65
#define GCC_PCNOC_BUS_TIMEOUT8_BCR 66
#define GCC_PCNOC_BUS_TIMEOUT9_BCR 67
#define GCC_PCNOC_BUS_TIMEOUT10_BCR 68
#define GCC_PCNOC_BUS_TIMEOUT11_BCR 69
#define GCC_PRNG_BCR 70
#define GCC_Q6SS_DBG_ARES 71
#define GCC_Q6_AHB_S_ARES 72
#define GCC_Q6_AHB_ARES 73
#define GCC_Q6_AXIM2_ARES 74
#define GCC_Q6_AXIM_ARES 75
#define GCC_Q6_AXIS_ARES 76
#define GCC_QDSS_BCR 77
#define GCC_QPIC_BCR 78
#define GCC_QUSB2_0_PHY_BCR 79
#define GCC_SDCC1_BCR 80
#define GCC_SEC_CTRL_BCR 81
#define GCC_SPDM_BCR 82
#define GCC_SYSTEM_NOC_BCR 83
#define GCC_TCSR_BCR 84
#define GCC_TLMM_BCR 85
#define GCC_UBI0_AXI_ARES 86
#define GCC_UBI0_AHB_ARES 87
#define GCC_UBI0_NC_AXI_ARES 88
#define GCC_UBI0_DBG_ARES 89
#define GCC_UBI0_UTCM_ARES 90
#define GCC_UBI0_CORE_ARES 91
#define GCC_UBI32_BCR 92
#define GCC_UNIPHY_BCR 93
#define GCC_UNIPHY_AHB_ARES 94
#define GCC_UNIPHY_SYS_ARES 95
#define GCC_UNIPHY_RX_ARES 96
#define GCC_UNIPHY_TX_ARES 97
#define GCC_USB0_BCR 98
#define GCC_USB0_PHY_BCR 99
#define GCC_WCSS_BCR 100
#define GCC_WCSS_DBG_ARES 101
#define GCC_WCSS_ECAHB_ARES 102
#define GCC_WCSS_ACMT_ARES 103
#define GCC_WCSS_DBG_BDG_ARES 104
#define GCC_WCSS_AHB_S_ARES 105
#define GCC_WCSS_AXI_M_ARES 106
#define GCC_WCSS_AXI_S_ARES 107
#define GCC_WCSS_Q6_BCR 108
#define GCC_WCSSAON_RESET 109
#define GCC_UNIPHY_SOFT_RESET 110
#define GCC_GEPHY_MISC_ARES 111
#endif