Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch '20230223180935.60546-1-otto.pflueger@abscue.de' into clk-for-6.4

Merge MSM8917 Global Clock Controller and RPM clock controller bindings
through topic branch, to make it possible to introduce in Devicetree
source depending on these.

+201 -4
+9 -4
Documentation/devicetree/bindings/clock/qcom,gcc-msm8909.yaml
··· 4 4 $id: http://devicetree.org/schemas/clock/qcom,gcc-msm8909.yaml# 5 5 $schema: http://devicetree.org/meta-schemas/core.yaml# 6 6 7 - title: Qualcomm Global Clock & Reset Controller on MSM8909 7 + title: Qualcomm Global Clock & Reset Controller on MSM8909, MSM8917 and QM215 8 8 9 9 maintainers: 10 10 - Stephan Gerhold <stephan@gerhold.net> 11 11 12 12 description: | 13 13 Qualcomm global clock control module provides the clocks, resets and power 14 - domains on MSM8909. 14 + domains on MSM8909, MSM8917 or QM215. 15 15 16 - See also:: include/dt-bindings/clock/qcom,gcc-msm8909.h 16 + See also:: 17 + include/dt-bindings/clock/qcom,gcc-msm8909.h 18 + include/dt-bindings/clock/qcom,gcc-msm8917.h 17 19 18 20 properties: 19 21 compatible: 20 - const: qcom,gcc-msm8909 22 + enum: 23 + - qcom,gcc-msm8909 24 + - qcom,gcc-msm8917 25 + - qcom,gcc-qm215 21 26 22 27 clocks: 23 28 items:
+2
Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml
··· 31 31 - qcom,rpmcc-msm8660 32 32 - qcom,rpmcc-msm8909 33 33 - qcom,rpmcc-msm8916 34 + - qcom,rpmcc-msm8917 34 35 - qcom,rpmcc-msm8936 35 36 - qcom,rpmcc-msm8953 36 37 - qcom,rpmcc-msm8974 ··· 108 107 - qcom,rpmcc-mdm9607 109 108 - qcom,rpmcc-msm8226 110 109 - qcom,rpmcc-msm8916 110 + - qcom,rpmcc-msm8917 111 111 - qcom,rpmcc-msm8936 112 112 - qcom,rpmcc-msm8953 113 113 - qcom,rpmcc-msm8974
+190
include/dt-bindings/clock/qcom,gcc-msm8917.h
··· 1 + /* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ 2 + 3 + #ifndef _DT_BINDINGS_CLK_MSM_GCC_8917_H 4 + #define _DT_BINDINGS_CLK_MSM_GCC_8917_H 5 + 6 + /* Clocks */ 7 + #define APSS_AHB_CLK_SRC 0 8 + #define BLSP1_QUP2_I2C_APPS_CLK_SRC 1 9 + #define BLSP1_QUP2_SPI_APPS_CLK_SRC 2 10 + #define BLSP1_QUP3_I2C_APPS_CLK_SRC 3 11 + #define BLSP1_QUP3_SPI_APPS_CLK_SRC 4 12 + #define BLSP1_QUP4_I2C_APPS_CLK_SRC 5 13 + #define BLSP1_QUP4_SPI_APPS_CLK_SRC 6 14 + #define BLSP1_UART1_APPS_CLK_SRC 7 15 + #define BLSP1_UART2_APPS_CLK_SRC 8 16 + #define BLSP2_QUP1_I2C_APPS_CLK_SRC 9 17 + #define BLSP2_QUP1_SPI_APPS_CLK_SRC 10 18 + #define BLSP2_QUP2_I2C_APPS_CLK_SRC 11 19 + #define BLSP2_QUP2_SPI_APPS_CLK_SRC 12 20 + #define BLSP2_QUP3_I2C_APPS_CLK_SRC 13 21 + #define BLSP2_QUP3_SPI_APPS_CLK_SRC 14 22 + #define BLSP2_UART1_APPS_CLK_SRC 15 23 + #define BLSP2_UART2_APPS_CLK_SRC 16 24 + #define BYTE0_CLK_SRC 17 25 + #define CAMSS_GP0_CLK_SRC 18 26 + #define CAMSS_GP1_CLK_SRC 19 27 + #define CAMSS_TOP_AHB_CLK_SRC 20 28 + #define CCI_CLK_SRC 21 29 + #define CPP_CLK_SRC 22 30 + #define CRYPTO_CLK_SRC 23 31 + #define CSI0PHYTIMER_CLK_SRC 24 32 + #define CSI0_CLK_SRC 25 33 + #define CSI1PHYTIMER_CLK_SRC 26 34 + #define CSI1_CLK_SRC 27 35 + #define CSI2_CLK_SRC 28 36 + #define ESC0_CLK_SRC 29 37 + #define GCC_APSS_TCU_CLK 30 38 + #define GCC_BIMC_GFX_CLK 31 39 + #define GCC_BIMC_GPU_CLK 32 40 + #define GCC_BLSP1_AHB_CLK 33 41 + #define GCC_BLSP1_QUP2_I2C_APPS_CLK 34 42 + #define GCC_BLSP1_QUP2_SPI_APPS_CLK 35 43 + #define GCC_BLSP1_QUP3_I2C_APPS_CLK 36 44 + #define GCC_BLSP1_QUP3_SPI_APPS_CLK 37 45 + #define GCC_BLSP1_QUP4_I2C_APPS_CLK 38 46 + #define GCC_BLSP1_QUP4_SPI_APPS_CLK 39 47 + #define GCC_BLSP1_UART1_APPS_CLK 40 48 + #define GCC_BLSP1_UART2_APPS_CLK 41 49 + #define GCC_BLSP2_AHB_CLK 42 50 + #define GCC_BLSP2_QUP1_I2C_APPS_CLK 43 51 + #define GCC_BLSP2_QUP1_SPI_APPS_CLK 44 52 + #define GCC_BLSP2_QUP2_I2C_APPS_CLK 45 53 + #define GCC_BLSP2_QUP2_SPI_APPS_CLK 46 54 + #define GCC_BLSP2_QUP3_I2C_APPS_CLK 47 55 + #define GCC_BLSP2_QUP3_SPI_APPS_CLK 48 56 + #define GCC_BLSP2_UART1_APPS_CLK 49 57 + #define GCC_BLSP2_UART2_APPS_CLK 50 58 + #define GCC_BOOT_ROM_AHB_CLK 51 59 + #define GCC_CAMSS_AHB_CLK 52 60 + #define GCC_CAMSS_CCI_AHB_CLK 53 61 + #define GCC_CAMSS_CCI_CLK 54 62 + #define GCC_CAMSS_CPP_AHB_CLK 55 63 + #define GCC_CAMSS_CPP_CLK 56 64 + #define GCC_CAMSS_CSI0PHYTIMER_CLK 57 65 + #define GCC_CAMSS_CSI0PHY_CLK 58 66 + #define GCC_CAMSS_CSI0PIX_CLK 59 67 + #define GCC_CAMSS_CSI0RDI_CLK 60 68 + #define GCC_CAMSS_CSI0_AHB_CLK 61 69 + #define GCC_CAMSS_CSI0_CLK 62 70 + #define GCC_CAMSS_CSI1PHYTIMER_CLK 63 71 + #define GCC_CAMSS_CSI1PHY_CLK 64 72 + #define GCC_CAMSS_CSI1PIX_CLK 65 73 + #define GCC_CAMSS_CSI1RDI_CLK 66 74 + #define GCC_CAMSS_CSI1_AHB_CLK 67 75 + #define GCC_CAMSS_CSI1_CLK 68 76 + #define GCC_CAMSS_CSI2PHY_CLK 69 77 + #define GCC_CAMSS_CSI2PIX_CLK 70 78 + #define GCC_CAMSS_CSI2RDI_CLK 71 79 + #define GCC_CAMSS_CSI2_AHB_CLK 72 80 + #define GCC_CAMSS_CSI2_CLK 73 81 + #define GCC_CAMSS_CSI_VFE0_CLK 74 82 + #define GCC_CAMSS_CSI_VFE1_CLK 75 83 + #define GCC_CAMSS_GP0_CLK 76 84 + #define GCC_CAMSS_GP1_CLK 77 85 + #define GCC_CAMSS_ISPIF_AHB_CLK 78 86 + #define GCC_CAMSS_JPEG0_CLK 79 87 + #define GCC_CAMSS_JPEG_AHB_CLK 80 88 + #define GCC_CAMSS_JPEG_AXI_CLK 81 89 + #define GCC_CAMSS_MCLK0_CLK 82 90 + #define GCC_CAMSS_MCLK1_CLK 83 91 + #define GCC_CAMSS_MCLK2_CLK 84 92 + #define GCC_CAMSS_MICRO_AHB_CLK 85 93 + #define GCC_CAMSS_TOP_AHB_CLK 86 94 + #define GCC_CAMSS_VFE0_AHB_CLK 87 95 + #define GCC_CAMSS_VFE0_AXI_CLK 88 96 + #define GCC_CAMSS_VFE0_CLK 89 97 + #define GCC_CAMSS_VFE1_AHB_CLK 90 98 + #define GCC_CAMSS_VFE1_AXI_CLK 91 99 + #define GCC_CAMSS_VFE1_CLK 92 100 + #define GCC_CPP_TBU_CLK 93 101 + #define GCC_CRYPTO_AHB_CLK 94 102 + #define GCC_CRYPTO_AXI_CLK 95 103 + #define GCC_CRYPTO_CLK 96 104 + #define GCC_DCC_CLK 97 105 + #define GCC_GFX_TBU_CLK 98 106 + #define GCC_GFX_TCU_CLK 99 107 + #define GCC_GP1_CLK 100 108 + #define GCC_GP2_CLK 101 109 + #define GCC_GP3_CLK 102 110 + #define GCC_GTCU_AHB_CLK 103 111 + #define GCC_JPEG_TBU_CLK 104 112 + #define GCC_MDP_TBU_CLK 105 113 + #define GCC_MDSS_AHB_CLK 106 114 + #define GCC_MDSS_AXI_CLK 107 115 + #define GCC_MDSS_BYTE0_CLK 108 116 + #define GCC_MDSS_ESC0_CLK 109 117 + #define GCC_MDSS_MDP_CLK 110 118 + #define GCC_MDSS_PCLK0_CLK 111 119 + #define GCC_MDSS_VSYNC_CLK 112 120 + #define GCC_MSS_CFG_AHB_CLK 113 121 + #define GCC_MSS_Q6_BIMC_AXI_CLK 114 122 + #define GCC_OXILI_AHB_CLK 115 123 + #define GCC_OXILI_GFX3D_CLK 116 124 + #define GCC_PDM2_CLK 117 125 + #define GCC_PDM_AHB_CLK 118 126 + #define GCC_PRNG_AHB_CLK 119 127 + #define GCC_QDSS_DAP_CLK 120 128 + #define GCC_SDCC1_AHB_CLK 121 129 + #define GCC_SDCC1_APPS_CLK 122 130 + #define GCC_SDCC1_ICE_CORE_CLK 123 131 + #define GCC_SDCC2_AHB_CLK 124 132 + #define GCC_SDCC2_APPS_CLK 125 133 + #define GCC_SMMU_CFG_CLK 126 134 + #define GCC_USB2A_PHY_SLEEP_CLK 127 135 + #define GCC_USB_HS_AHB_CLK 128 136 + #define GCC_USB_HS_PHY_CFG_AHB_CLK 129 137 + #define GCC_USB_HS_SYSTEM_CLK 130 138 + #define GCC_VENUS0_AHB_CLK 131 139 + #define GCC_VENUS0_AXI_CLK 132 140 + #define GCC_VENUS0_CORE0_VCODEC0_CLK 133 141 + #define GCC_VENUS0_VCODEC0_CLK 134 142 + #define GCC_VENUS_TBU_CLK 135 143 + #define GCC_VFE1_TBU_CLK 136 144 + #define GCC_VFE_TBU_CLK 137 145 + #define GFX3D_CLK_SRC 138 146 + #define GP1_CLK_SRC 139 147 + #define GP2_CLK_SRC 140 148 + #define GP3_CLK_SRC 141 149 + #define GPLL0 142 150 + #define GPLL0_EARLY 143 151 + #define GPLL3 144 152 + #define GPLL3_EARLY 145 153 + #define GPLL4 146 154 + #define GPLL4_EARLY 147 155 + #define GPLL6 148 156 + #define GPLL6_EARLY 149 157 + #define JPEG0_CLK_SRC 150 158 + #define MCLK0_CLK_SRC 151 159 + #define MCLK1_CLK_SRC 152 160 + #define MCLK2_CLK_SRC 153 161 + #define MDP_CLK_SRC 154 162 + #define PCLK0_CLK_SRC 155 163 + #define PDM2_CLK_SRC 156 164 + #define SDCC1_APPS_CLK_SRC 157 165 + #define SDCC1_ICE_CORE_CLK_SRC 158 166 + #define SDCC2_APPS_CLK_SRC 159 167 + #define USB_HS_SYSTEM_CLK_SRC 160 168 + #define VCODEC0_CLK_SRC 161 169 + #define VFE0_CLK_SRC 162 170 + #define VFE1_CLK_SRC 163 171 + #define VSYNC_CLK_SRC 164 172 + 173 + /* GCC block resets */ 174 + #define GCC_CAMSS_MICRO_BCR 0 175 + #define GCC_MSS_BCR 1 176 + #define GCC_QUSB2_PHY_BCR 2 177 + #define GCC_USB_HS_BCR 3 178 + #define GCC_USB2_HS_PHY_ONLY_BCR 4 179 + 180 + /* GDSCs */ 181 + #define CPP_GDSC 0 182 + #define JPEG_GDSC 1 183 + #define MDSS_GDSC 2 184 + #define OXILI_GX_GDSC 3 185 + #define VENUS_CORE0_GDSC 4 186 + #define VENUS_GDSC 5 187 + #define VFE0_GDSC 6 188 + #define VFE1_GDSC 7 189 + 190 + #endif