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

dt-bindings: clk: amlogic,a1-peripherals-clkc: expose all clock ids

Due to a policy change in clock ID bindings handling, expose
all the "private" clock IDs to the public clock dt-bindings
to move out of the previous maintenance scheme.

This refers to a discussion at [1] & [2] with Krzysztof about
the issue with the current maintenance.

It was decided to move every A1 peripherals ID to the public clock
dt-bindings headers to be merged in a single tree so we
can safely add new clocks without having merge issues.

[1] https://lore.kernel.org/all/c088e01c-0714-82be-8347-6140daf56640@linaro.org/
[2] https://lore.kernel.org/all/2fabe721-7434-43e7-bae5-088a42ba128d@app.fastmail.com/

Reviewed-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230607-topic-amlogic-upstream-clkid-public-migration-v2-12-38172d17c27a@linaro.org
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

authored by

Neil Armstrong and committed by
Jerome Brunet
57049a1c 165a1941

+53 -63
-63
drivers/clk/meson/a1-peripherals.h
··· 46 46 /* include the CLKIDs that have been made part of the DT binding */ 47 47 #include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> 48 48 49 - /* 50 - * CLKID index values for internal clocks 51 - * 52 - * These indices are entirely contrived and do not map onto the hardware. 53 - * It has now been decided to expose everything by default in the DT header: 54 - * include/dt-bindings/clock/a1-peripherals-clkc.h. 55 - * Only the clocks ids we don't want to expose, such as the internal muxes and 56 - * dividers of composite clocks, will remain defined here. 57 - */ 58 - #define CLKID_XTAL_IN 0 59 - #define CLKID_DSPA_SEL 61 60 - #define CLKID_DSPB_SEL 62 61 - #define CLKID_SARADC_SEL 74 62 - #define CLKID_SYS_A_SEL 89 63 - #define CLKID_SYS_A_DIV 90 64 - #define CLKID_SYS_A 91 65 - #define CLKID_SYS_B_SEL 92 66 - #define CLKID_SYS_B_DIV 93 67 - #define CLKID_SYS_B 94 68 - #define CLKID_DSPA_A_DIV 96 69 - #define CLKID_DSPA_A 97 70 - #define CLKID_DSPA_B_DIV 99 71 - #define CLKID_DSPA_B 100 72 - #define CLKID_DSPB_A_DIV 102 73 - #define CLKID_DSPB_A 103 74 - #define CLKID_DSPB_B_DIV 105 75 - #define CLKID_DSPB_B 106 76 - #define CLKID_RTC_32K_IN 107 77 - #define CLKID_RTC_32K_DIV 108 78 - #define CLKID_RTC_32K_XTAL 109 79 - #define CLKID_RTC_32K_SEL 110 80 - #define CLKID_CECB_32K_IN 111 81 - #define CLKID_CECB_32K_DIV 112 82 - #define CLKID_CECA_32K_IN 115 83 - #define CLKID_CECA_32K_DIV 116 84 - #define CLKID_DIV2_PRE 119 85 - #define CLKID_24M_DIV2 120 86 - #define CLKID_GEN_DIV 122 87 - #define CLKID_SARADC_DIV 123 88 - #define CLKID_PWM_A_DIV 125 89 - #define CLKID_PWM_B_DIV 127 90 - #define CLKID_PWM_C_DIV 129 91 - #define CLKID_PWM_D_DIV 131 92 - #define CLKID_PWM_E_DIV 133 93 - #define CLKID_PWM_F_DIV 135 94 - #define CLKID_SPICC_SEL 136 95 - #define CLKID_SPICC_DIV 137 96 - #define CLKID_SPICC_SEL2 138 97 - #define CLKID_TS_DIV 139 98 - #define CLKID_SPIFC_SEL 140 99 - #define CLKID_SPIFC_DIV 141 100 - #define CLKID_SPIFC_SEL2 142 101 - #define CLKID_USB_BUS_SEL 143 102 - #define CLKID_USB_BUS_DIV 144 103 - #define CLKID_SD_EMMC_SEL 145 104 - #define CLKID_SD_EMMC_DIV 146 105 - #define CLKID_PSRAM_SEL 148 106 - #define CLKID_PSRAM_DIV 149 107 - #define CLKID_PSRAM_SEL2 150 108 - #define CLKID_DMC_SEL 151 109 - #define CLKID_DMC_DIV 152 110 - #define CLKID_DMC_SEL2 153 111 - 112 49 #endif /* __A1_PERIPHERALS_H */
+53
include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h
··· 10 10 #ifndef __A1_PERIPHERALS_CLKC_H 11 11 #define __A1_PERIPHERALS_CLKC_H 12 12 13 + #define CLKID_XTAL_IN 0 13 14 #define CLKID_FIXPLL_IN 1 14 15 #define CLKID_USB_PHY_IN 2 15 16 #define CLKID_USB_CTRL_IN 3 ··· 71 70 #define CLKID_CPU_CTRL 58 72 71 #define CLKID_ROM 59 73 72 #define CLKID_PROC_I2C 60 73 + #define CLKID_DSPA_SEL 61 74 + #define CLKID_DSPB_SEL 62 74 75 #define CLKID_DSPA_EN 63 75 76 #define CLKID_DSPA_EN_NIC 64 76 77 #define CLKID_DSPB_EN 65 ··· 84 81 #define CLKID_12M 71 85 82 #define CLKID_FCLK_DIV2_DIVN 72 86 83 #define CLKID_GEN 73 84 + #define CLKID_SARADC_SEL 74 87 85 #define CLKID_SARADC 75 88 86 #define CLKID_PWM_A 76 89 87 #define CLKID_PWM_B 77 ··· 99 95 #define CLKID_SD_EMMC 86 100 96 #define CLKID_PSRAM 87 101 97 #define CLKID_DMC 88 98 + #define CLKID_SYS_A_SEL 89 99 + #define CLKID_SYS_A_DIV 90 100 + #define CLKID_SYS_A 91 101 + #define CLKID_SYS_B_SEL 92 102 + #define CLKID_SYS_B_DIV 93 103 + #define CLKID_SYS_B 94 102 104 #define CLKID_DSPA_A_SEL 95 105 + #define CLKID_DSPA_A_DIV 96 106 + #define CLKID_DSPA_A 97 103 107 #define CLKID_DSPA_B_SEL 98 108 + #define CLKID_DSPA_B_DIV 99 109 + #define CLKID_DSPA_B 100 104 110 #define CLKID_DSPB_A_SEL 101 111 + #define CLKID_DSPB_A_DIV 102 112 + #define CLKID_DSPB_A 103 105 113 #define CLKID_DSPB_B_SEL 104 114 + #define CLKID_DSPB_B_DIV 105 115 + #define CLKID_DSPB_B 106 116 + #define CLKID_RTC_32K_IN 107 117 + #define CLKID_RTC_32K_DIV 108 118 + #define CLKID_RTC_32K_XTAL 109 119 + #define CLKID_RTC_32K_SEL 110 120 + #define CLKID_CECB_32K_IN 111 121 + #define CLKID_CECB_32K_DIV 112 106 122 #define CLKID_CECB_32K_SEL_PRE 113 107 123 #define CLKID_CECB_32K_SEL 114 124 + #define CLKID_CECA_32K_IN 115 125 + #define CLKID_CECA_32K_DIV 116 108 126 #define CLKID_CECA_32K_SEL_PRE 117 109 127 #define CLKID_CECA_32K_SEL 118 128 + #define CLKID_DIV2_PRE 119 129 + #define CLKID_24M_DIV2 120 110 130 #define CLKID_GEN_SEL 121 131 + #define CLKID_GEN_DIV 122 132 + #define CLKID_SARADC_DIV 123 111 133 #define CLKID_PWM_A_SEL 124 134 + #define CLKID_PWM_A_DIV 125 112 135 #define CLKID_PWM_B_SEL 126 136 + #define CLKID_PWM_B_DIV 127 113 137 #define CLKID_PWM_C_SEL 128 138 + #define CLKID_PWM_C_DIV 129 114 139 #define CLKID_PWM_D_SEL 130 140 + #define CLKID_PWM_D_DIV 131 115 141 #define CLKID_PWM_E_SEL 132 142 + #define CLKID_PWM_E_DIV 133 116 143 #define CLKID_PWM_F_SEL 134 144 + #define CLKID_PWM_F_DIV 135 145 + #define CLKID_SPICC_SEL 136 146 + #define CLKID_SPICC_DIV 137 147 + #define CLKID_SPICC_SEL2 138 148 + #define CLKID_TS_DIV 139 149 + #define CLKID_SPIFC_SEL 140 150 + #define CLKID_SPIFC_DIV 141 151 + #define CLKID_SPIFC_SEL2 142 152 + #define CLKID_USB_BUS_SEL 143 153 + #define CLKID_USB_BUS_DIV 144 154 + #define CLKID_SD_EMMC_SEL 145 155 + #define CLKID_SD_EMMC_DIV 146 117 156 #define CLKID_SD_EMMC_SEL2 147 157 + #define CLKID_PSRAM_SEL 148 158 + #define CLKID_PSRAM_DIV 149 159 + #define CLKID_PSRAM_SEL2 150 160 + #define CLKID_DMC_SEL 151 161 + #define CLKID_DMC_DIV 152 162 + #define CLKID_DMC_SEL2 153 118 163 119 164 #endif /* __A1_PERIPHERALS_CLKC_H */