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

Merge branch '20231026105345.3376-3-bryan.odonoghue@linaro.org' into arm64-for-6.8

Merge the SC8280XP Camera Clock Controller binding updates from the
topic branch, to gain access to clock defines to be used in DeviceTree
source.

+201 -70
+4 -14
Documentation/devicetree/bindings/clock/qcom,camcc-sm8250.yaml
··· 15 15 16 16 See also:: include/dt-bindings/clock/qcom,camcc-sm8250.h 17 17 18 + allOf: 19 + - $ref: qcom,gcc.yaml# 20 + 18 21 properties: 19 22 compatible: 20 23 const: qcom,sm8250-camcc ··· 36 33 - const: bi_tcxo_ao 37 34 - const: sleep_clk 38 35 39 - '#clock-cells': 40 - const: 1 41 - 42 - '#reset-cells': 43 - const: 1 44 - 45 - '#power-domain-cells': 46 - const: 1 47 - 48 36 power-domains: 49 37 items: 50 38 - description: MMCX power domain ··· 50 56 51 57 required: 52 58 - compatible 53 - - reg 54 59 - clocks 55 60 - clock-names 56 - - '#clock-cells' 57 - - '#reset-cells' 58 - - '#power-domain-cells' 59 61 60 - additionalProperties: false 62 + unevaluatedProperties: false 61 63 62 64 examples: 63 65 - |
+4 -14
Documentation/devicetree/bindings/clock/qcom,sc7180-camcc.yaml
··· 15 15 16 16 See also:: include/dt-bindings/clock/qcom,camcc-sc7180.h 17 17 18 + allOf: 19 + - $ref: qcom,gcc.yaml# 20 + 18 21 properties: 19 22 compatible: 20 23 const: qcom,sc7180-camcc ··· 34 31 - const: iface 35 32 - const: xo 36 33 37 - '#clock-cells': 38 - const: 1 39 - 40 - '#reset-cells': 41 - const: 1 42 - 43 - '#power-domain-cells': 44 - const: 1 45 - 46 34 reg: 47 35 maxItems: 1 48 36 49 37 required: 50 38 - compatible 51 - - reg 52 39 - clocks 53 40 - clock-names 54 - - '#clock-cells' 55 - - '#reset-cells' 56 - - '#power-domain-cells' 57 41 58 - additionalProperties: false 42 + unevaluatedProperties: false 59 43 60 44 examples: 61 45 - |
+4 -14
Documentation/devicetree/bindings/clock/qcom,sc7280-camcc.yaml
··· 15 15 16 16 See also:: include/dt-bindings/clock/qcom,camcc-sc7280.h 17 17 18 + allOf: 19 + - $ref: qcom,gcc.yaml# 20 + 18 21 properties: 19 22 compatible: 20 23 const: qcom,sc7280-camcc ··· 34 31 - const: bi_tcxo_ao 35 32 - const: sleep_clk 36 33 37 - '#clock-cells': 38 - const: 1 39 - 40 - '#reset-cells': 41 - const: 1 42 - 43 - '#power-domain-cells': 44 - const: 1 45 - 46 34 reg: 47 35 maxItems: 1 48 36 49 37 required: 50 38 - compatible 51 - - reg 52 39 - clocks 53 40 - clock-names 54 - - '#clock-cells' 55 - - '#reset-cells' 56 - - '#power-domain-cells' 57 41 58 - additionalProperties: false 42 + unevaluatedProperties: false 59 43 60 44 examples: 61 45 - |
+4 -14
Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml
··· 15 15 16 16 See also:: include/dt-bindings/clock/qcom,camcc-sm845.h 17 17 18 + allOf: 19 + - $ref: qcom,gcc.yaml# 20 + 18 21 properties: 19 22 compatible: 20 23 const: qcom,sdm845-camcc ··· 30 27 items: 31 28 - const: bi_tcxo 32 29 33 - '#clock-cells': 34 - const: 1 35 - 36 - '#reset-cells': 37 - const: 1 38 - 39 - '#power-domain-cells': 40 - const: 1 41 - 42 30 reg: 43 31 maxItems: 1 44 32 45 33 required: 46 34 - compatible 47 - - reg 48 35 - clocks 49 36 - clock-names 50 - - '#clock-cells' 51 - - '#reset-cells' 52 - - '#power-domain-cells' 53 37 54 - additionalProperties: false 38 + unevaluatedProperties: false 55 39 56 40 examples: 57 41 - |
+6 -14
Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml
··· 16 16 See also:: 17 17 include/dt-bindings/clock/qcom,sm8450-camcc.h 18 18 include/dt-bindings/clock/qcom,sm8550-camcc.h 19 + include/dt-bindings/clock/qcom,sc8280xp-camcc.h 20 + 21 + allOf: 22 + - $ref: qcom,gcc.yaml# 19 23 20 24 properties: 21 25 compatible: 22 26 enum: 27 + - qcom,sc8280xp-camcc 23 28 - qcom,sm8450-camcc 24 29 - qcom,sm8550-camcc 25 30 ··· 45 40 description: 46 41 A phandle to an OPP node describing required MMCX performance point. 47 42 48 - '#clock-cells': 49 - const: 1 50 - 51 - '#reset-cells': 52 - const: 1 53 - 54 - '#power-domain-cells': 55 - const: 1 56 - 57 43 reg: 58 44 maxItems: 1 59 45 60 46 required: 61 47 - compatible 62 - - reg 63 48 - clocks 64 49 - power-domains 65 50 - required-opps 66 - - '#clock-cells' 67 - - '#reset-cells' 68 - - '#power-domain-cells' 69 51 70 - additionalProperties: false 52 + unevaluatedProperties: false 71 53 72 54 examples: 73 55 - |
+179
include/dt-bindings/clock/qcom,sc8280xp-camcc.h
··· 1 + /* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ 2 + /* 3 + * Copyright (c) 2021, The Linux Foundation. All rights reserved. 4 + * Copyright (c) 2023, Linaro Ltd. 5 + */ 6 + 7 + #ifndef __DT_BINDINGS_CLK_QCOM_CAMCC_SC8280XP_H__ 8 + #define __DT_BINDINGS_CLK_QCOM_CAMCC_SC8280XP_H__ 9 + 10 + /* CAMCC clocks */ 11 + #define CAMCC_PLL0 0 12 + #define CAMCC_PLL0_OUT_EVEN 1 13 + #define CAMCC_PLL0_OUT_ODD 2 14 + #define CAMCC_PLL1 3 15 + #define CAMCC_PLL1_OUT_EVEN 4 16 + #define CAMCC_PLL2 5 17 + #define CAMCC_PLL3 6 18 + #define CAMCC_PLL3_OUT_EVEN 7 19 + #define CAMCC_PLL4 8 20 + #define CAMCC_PLL4_OUT_EVEN 9 21 + #define CAMCC_PLL5 10 22 + #define CAMCC_PLL5_OUT_EVEN 11 23 + #define CAMCC_PLL6 12 24 + #define CAMCC_PLL6_OUT_EVEN 13 25 + #define CAMCC_PLL7 14 26 + #define CAMCC_PLL7_OUT_EVEN 15 27 + #define CAMCC_PLL7_OUT_ODD 16 28 + #define CAMCC_BPS_AHB_CLK 17 29 + #define CAMCC_BPS_AREG_CLK 18 30 + #define CAMCC_BPS_AXI_CLK 19 31 + #define CAMCC_BPS_CLK 20 32 + #define CAMCC_BPS_CLK_SRC 21 33 + #define CAMCC_CAMNOC_AXI_CLK 22 34 + #define CAMCC_CAMNOC_AXI_CLK_SRC 23 35 + #define CAMCC_CAMNOC_DCD_XO_CLK 24 36 + #define CAMCC_CCI_0_CLK 25 37 + #define CAMCC_CCI_0_CLK_SRC 26 38 + #define CAMCC_CCI_1_CLK 27 39 + #define CAMCC_CCI_1_CLK_SRC 28 40 + #define CAMCC_CCI_2_CLK 29 41 + #define CAMCC_CCI_2_CLK_SRC 30 42 + #define CAMCC_CCI_3_CLK 31 43 + #define CAMCC_CCI_3_CLK_SRC 32 44 + #define CAMCC_CORE_AHB_CLK 33 45 + #define CAMCC_CPAS_AHB_CLK 34 46 + #define CAMCC_CPHY_RX_CLK_SRC 35 47 + #define CAMCC_CSI0PHYTIMER_CLK 36 48 + #define CAMCC_CSI0PHYTIMER_CLK_SRC 37 49 + #define CAMCC_CSI1PHYTIMER_CLK 38 50 + #define CAMCC_CSI1PHYTIMER_CLK_SRC 39 51 + #define CAMCC_CSI2PHYTIMER_CLK 40 52 + #define CAMCC_CSI2PHYTIMER_CLK_SRC 41 53 + #define CAMCC_CSI3PHYTIMER_CLK 42 54 + #define CAMCC_CSI3PHYTIMER_CLK_SRC 43 55 + #define CAMCC_CSIPHY0_CLK 44 56 + #define CAMCC_CSIPHY1_CLK 45 57 + #define CAMCC_CSIPHY2_CLK 46 58 + #define CAMCC_CSIPHY3_CLK 47 59 + #define CAMCC_FAST_AHB_CLK_SRC 48 60 + #define CAMCC_GDSC_CLK 49 61 + #define CAMCC_ICP_AHB_CLK 50 62 + #define CAMCC_ICP_CLK 51 63 + #define CAMCC_ICP_CLK_SRC 52 64 + #define CAMCC_IFE_0_AXI_CLK 53 65 + #define CAMCC_IFE_0_CLK 54 66 + #define CAMCC_IFE_0_CLK_SRC 55 67 + #define CAMCC_IFE_0_CPHY_RX_CLK 56 68 + #define CAMCC_IFE_0_CSID_CLK 57 69 + #define CAMCC_IFE_0_CSID_CLK_SRC 58 70 + #define CAMCC_IFE_0_DSP_CLK 59 71 + #define CAMCC_IFE_1_AXI_CLK 60 72 + #define CAMCC_IFE_1_CLK 61 73 + #define CAMCC_IFE_1_CLK_SRC 62 74 + #define CAMCC_IFE_1_CPHY_RX_CLK 63 75 + #define CAMCC_IFE_1_CSID_CLK 64 76 + #define CAMCC_IFE_1_CSID_CLK_SRC 65 77 + #define CAMCC_IFE_1_DSP_CLK 66 78 + #define CAMCC_IFE_2_AXI_CLK 67 79 + #define CAMCC_IFE_2_CLK 68 80 + #define CAMCC_IFE_2_CLK_SRC 69 81 + #define CAMCC_IFE_2_CPHY_RX_CLK 70 82 + #define CAMCC_IFE_2_CSID_CLK 71 83 + #define CAMCC_IFE_2_CSID_CLK_SRC 72 84 + #define CAMCC_IFE_2_DSP_CLK 73 85 + #define CAMCC_IFE_3_AXI_CLK 74 86 + #define CAMCC_IFE_3_CLK 75 87 + #define CAMCC_IFE_3_CLK_SRC 76 88 + #define CAMCC_IFE_3_CPHY_RX_CLK 77 89 + #define CAMCC_IFE_3_CSID_CLK 78 90 + #define CAMCC_IFE_3_CSID_CLK_SRC 79 91 + #define CAMCC_IFE_3_DSP_CLK 80 92 + #define CAMCC_IFE_LITE_0_CLK 81 93 + #define CAMCC_IFE_LITE_0_CLK_SRC 82 94 + #define CAMCC_IFE_LITE_0_CPHY_RX_CLK 83 95 + #define CAMCC_IFE_LITE_0_CSID_CLK 84 96 + #define CAMCC_IFE_LITE_0_CSID_CLK_SRC 85 97 + #define CAMCC_IFE_LITE_1_CLK 86 98 + #define CAMCC_IFE_LITE_1_CLK_SRC 87 99 + #define CAMCC_IFE_LITE_1_CPHY_RX_CLK 88 100 + #define CAMCC_IFE_LITE_1_CSID_CLK 89 101 + #define CAMCC_IFE_LITE_1_CSID_CLK_SRC 90 102 + #define CAMCC_IFE_LITE_2_CLK 91 103 + #define CAMCC_IFE_LITE_2_CLK_SRC 92 104 + #define CAMCC_IFE_LITE_2_CPHY_RX_CLK 93 105 + #define CAMCC_IFE_LITE_2_CSID_CLK 94 106 + #define CAMCC_IFE_LITE_2_CSID_CLK_SRC 95 107 + #define CAMCC_IFE_LITE_3_CLK 96 108 + #define CAMCC_IFE_LITE_3_CLK_SRC 97 109 + #define CAMCC_IFE_LITE_3_CPHY_RX_CLK 98 110 + #define CAMCC_IFE_LITE_3_CSID_CLK 99 111 + #define CAMCC_IFE_LITE_3_CSID_CLK_SRC 100 112 + #define CAMCC_IPE_0_AHB_CLK 101 113 + #define CAMCC_IPE_0_AREG_CLK 102 114 + #define CAMCC_IPE_0_AXI_CLK 103 115 + #define CAMCC_IPE_0_CLK 104 116 + #define CAMCC_IPE_0_CLK_SRC 105 117 + #define CAMCC_IPE_1_AHB_CLK 106 118 + #define CAMCC_IPE_1_AREG_CLK 107 119 + #define CAMCC_IPE_1_AXI_CLK 108 120 + #define CAMCC_IPE_1_CLK 109 121 + #define CAMCC_JPEG_CLK 110 122 + #define CAMCC_JPEG_CLK_SRC 111 123 + #define CAMCC_LRME_CLK 112 124 + #define CAMCC_LRME_CLK_SRC 113 125 + #define CAMCC_MCLK0_CLK 114 126 + #define CAMCC_MCLK0_CLK_SRC 115 127 + #define CAMCC_MCLK1_CLK 116 128 + #define CAMCC_MCLK1_CLK_SRC 117 129 + #define CAMCC_MCLK2_CLK 118 130 + #define CAMCC_MCLK2_CLK_SRC 119 131 + #define CAMCC_MCLK3_CLK 120 132 + #define CAMCC_MCLK3_CLK_SRC 121 133 + #define CAMCC_MCLK4_CLK 122 134 + #define CAMCC_MCLK4_CLK_SRC 123 135 + #define CAMCC_MCLK5_CLK 124 136 + #define CAMCC_MCLK5_CLK_SRC 125 137 + #define CAMCC_MCLK6_CLK 126 138 + #define CAMCC_MCLK6_CLK_SRC 127 139 + #define CAMCC_MCLK7_CLK 128 140 + #define CAMCC_MCLK7_CLK_SRC 129 141 + #define CAMCC_SLEEP_CLK 130 142 + #define CAMCC_SLEEP_CLK_SRC 131 143 + #define CAMCC_SLOW_AHB_CLK_SRC 132 144 + #define CAMCC_XO_CLK_SRC 133 145 + 146 + /* CAMCC resets */ 147 + #define CAMCC_BPS_BCR 0 148 + #define CAMCC_CAMNOC_BCR 1 149 + #define CAMCC_CCI_BCR 2 150 + #define CAMCC_CPAS_BCR 3 151 + #define CAMCC_CSI0PHY_BCR 4 152 + #define CAMCC_CSI1PHY_BCR 5 153 + #define CAMCC_CSI2PHY_BCR 6 154 + #define CAMCC_CSI3PHY_BCR 7 155 + #define CAMCC_ICP_BCR 8 156 + #define CAMCC_IFE_0_BCR 9 157 + #define CAMCC_IFE_1_BCR 10 158 + #define CAMCC_IFE_2_BCR 11 159 + #define CAMCC_IFE_3_BCR 12 160 + #define CAMCC_IFE_LITE_0_BCR 13 161 + #define CAMCC_IFE_LITE_1_BCR 14 162 + #define CAMCC_IFE_LITE_2_BCR 15 163 + #define CAMCC_IFE_LITE_3_BCR 16 164 + #define CAMCC_IPE_0_BCR 17 165 + #define CAMCC_IPE_1_BCR 18 166 + #define CAMCC_JPEG_BCR 19 167 + #define CAMCC_LRME_BCR 20 168 + 169 + /* CAMCC GDSCRs */ 170 + #define BPS_GDSC 0 171 + #define IFE_0_GDSC 1 172 + #define IFE_1_GDSC 2 173 + #define IFE_2_GDSC 3 174 + #define IFE_3_GDSC 4 175 + #define IPE_0_GDSC 5 176 + #define IPE_1_GDSC 6 177 + #define TITAN_TOP_GDSC 7 178 + 179 + #endif /* __DT_BINDINGS_CLK_QCOM_CAMCC_SC8280XP_H__ */