| Message ID | 20231211162331.435900-7-peter.griffin@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add minimal Tensor/GS101 SoC support and Oriole/Pixel6 board | expand |
On Mon, Dec 11, 2023 at 10:24 AM Peter Griffin <peter.griffin@linaro.org> wrote: > > 166 was skipped by mistake and two clocks: > * CLK_MOUT_CMU_HSI0_USBDPDGB > * CLK_GOUT_HSI0_USBDPDGB > > Have an incorrect DGB ending instead of DBG. > > This is an ABI break, but as the patch was only applied yesterday this > header has never been in an actual release so it seems better to fix > this early than ignore it. > > Fixes: 0a910f160638 ("dt-bindings: clock: Add Google gs101 clock management unit bindings") > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > --- Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > include/dt-bindings/clock/google,gs101.h | 118 +++++++++++------------ > 1 file changed, 59 insertions(+), 59 deletions(-) > > diff --git a/include/dt-bindings/clock/google,gs101.h b/include/dt-bindings/clock/google,gs101.h > index 5d2c2d907a7b..9761c0b24e66 100644 > --- a/include/dt-bindings/clock/google,gs101.h > +++ b/include/dt-bindings/clock/google,gs101.h > @@ -59,7 +59,7 @@ > #define CLK_MOUT_CMU_HSI0_BUS 45 > #define CLK_MOUT_CMU_HSI0_DPGTC 46 > #define CLK_MOUT_CMU_HSI0_USB31DRD 47 > -#define CLK_MOUT_CMU_HSI0_USBDPDGB 48 > +#define CLK_MOUT_CMU_HSI0_USBDPDBG 48 > #define CLK_MOUT_CMU_HSI1_BUS 49 > #define CLK_MOUT_CMU_HSI1_PCIE 50 > #define CLK_MOUT_CMU_HSI2_BUS 51 > @@ -181,64 +181,64 @@ > #define CLK_GOUT_BUS2_BUS 163 > #define CLK_GOUT_CIS_CLK0 164 > #define CLK_GOUT_CIS_CLK1 165 > -#define CLK_GOUT_CIS_CLK2 167 > -#define CLK_GOUT_CIS_CLK3 168 > -#define CLK_GOUT_CIS_CLK4 169 > -#define CLK_GOUT_CIS_CLK5 170 > -#define CLK_GOUT_CIS_CLK6 171 > -#define CLK_GOUT_CIS_CLK7 172 > -#define CLK_GOUT_CMU_BOOST 173 > -#define CLK_GOUT_CORE_BUS 174 > -#define CLK_GOUT_CPUCL0_DBG 175 > -#define CLK_GOUT_CPUCL0_SWITCH 176 > -#define CLK_GOUT_CPUCL1_SWITCH 177 > -#define CLK_GOUT_CPUCL2_SWITCH 178 > -#define CLK_GOUT_CSIS_BUS 179 > -#define CLK_GOUT_DISP_BUS 180 > -#define CLK_GOUT_DNS_BUS 181 > -#define CLK_GOUT_DPU_BUS 182 > -#define CLK_GOUT_EH_BUS 183 > -#define CLK_GOUT_G2D_G2D 184 > -#define CLK_GOUT_G2D_MSCL 185 > -#define CLK_GOUT_G3AA_G3AA 186 > -#define CLK_GOUT_G3D_BUSD 187 > -#define CLK_GOUT_G3D_GLB 188 > -#define CLK_GOUT_G3D_SWITCH 189 > -#define CLK_GOUT_GDC_GDC0 190 > -#define CLK_GOUT_GDC_GDC1 191 > -#define CLK_GOUT_GDC_SCSC 192 > -#define CLK_GOUT_CMU_HPM 193 > -#define CLK_GOUT_HSI0_BUS 194 > -#define CLK_GOUT_HSI0_DPGTC 195 > -#define CLK_GOUT_HSI0_USB31DRD 196 > -#define CLK_GOUT_HSI0_USBDPDGB 197 > -#define CLK_GOUT_HSI1_BUS 198 > -#define CLK_GOUT_HSI1_PCIE 199 > -#define CLK_GOUT_HSI2_BUS 200 > -#define CLK_GOUT_HSI2_MMC_CARD 201 > -#define CLK_GOUT_HSI2_PCIE 202 > -#define CLK_GOUT_HSI2_UFS_EMBD 203 > -#define CLK_GOUT_IPP_BUS 204 > -#define CLK_GOUT_ITP_BUS 205 > -#define CLK_GOUT_MCSC_ITSC 206 > -#define CLK_GOUT_MCSC_MCSC 207 > -#define CLK_GOUT_MFC_MFC 208 > -#define CLK_GOUT_MIF_BUSP 209 > -#define CLK_GOUT_MISC_BUS 210 > -#define CLK_GOUT_MISC_SSS 211 > -#define CLK_GOUT_PDP_BUS 212 > -#define CLK_GOUT_PDP_VRA 213 > -#define CLK_GOUT_G3AA 214 > -#define CLK_GOUT_PERIC0_BUS 215 > -#define CLK_GOUT_PERIC0_IP 216 > -#define CLK_GOUT_PERIC1_BUS 217 > -#define CLK_GOUT_PERIC1_IP 218 > -#define CLK_GOUT_TNR_BUS 219 > -#define CLK_GOUT_TOP_CMUREF 220 > -#define CLK_GOUT_TPU_BUS 221 > -#define CLK_GOUT_TPU_TPU 222 > -#define CLK_GOUT_TPU_TPUCTL 223 > -#define CLK_GOUT_TPU_UART 224 > +#define CLK_GOUT_CIS_CLK2 166 > +#define CLK_GOUT_CIS_CLK3 167 > +#define CLK_GOUT_CIS_CLK4 168 > +#define CLK_GOUT_CIS_CLK5 169 > +#define CLK_GOUT_CIS_CLK6 170 > +#define CLK_GOUT_CIS_CLK7 171 > +#define CLK_GOUT_CMU_BOOST 172 > +#define CLK_GOUT_CORE_BUS 173 > +#define CLK_GOUT_CPUCL0_DBG 174 > +#define CLK_GOUT_CPUCL0_SWITCH 175 > +#define CLK_GOUT_CPUCL1_SWITCH 176 > +#define CLK_GOUT_CPUCL2_SWITCH 177 > +#define CLK_GOUT_CSIS_BUS 178 > +#define CLK_GOUT_DISP_BUS 179 > +#define CLK_GOUT_DNS_BUS 180 > +#define CLK_GOUT_DPU_BUS 181 > +#define CLK_GOUT_EH_BUS 182 > +#define CLK_GOUT_G2D_G2D 183 > +#define CLK_GOUT_G2D_MSCL 184 > +#define CLK_GOUT_G3AA_G3AA 185 > +#define CLK_GOUT_G3D_BUSD 186 > +#define CLK_GOUT_G3D_GLB 187 > +#define CLK_GOUT_G3D_SWITCH 188 > +#define CLK_GOUT_GDC_GDC0 189 > +#define CLK_GOUT_GDC_GDC1 190 > +#define CLK_GOUT_GDC_SCSC 191 > +#define CLK_GOUT_CMU_HPM 192 > +#define CLK_GOUT_HSI0_BUS 193 > +#define CLK_GOUT_HSI0_DPGTC 194 > +#define CLK_GOUT_HSI0_USB31DRD 195 > +#define CLK_GOUT_HSI0_USBDPDBG 196 > +#define CLK_GOUT_HSI1_BUS 197 > +#define CLK_GOUT_HSI1_PCIE 198 > +#define CLK_GOUT_HSI2_BUS 199 > +#define CLK_GOUT_HSI2_MMC_CARD 200 > +#define CLK_GOUT_HSI2_PCIE 201 > +#define CLK_GOUT_HSI2_UFS_EMBD 202 > +#define CLK_GOUT_IPP_BUS 203 > +#define CLK_GOUT_ITP_BUS 204 > +#define CLK_GOUT_MCSC_ITSC 205 > +#define CLK_GOUT_MCSC_MCSC 206 > +#define CLK_GOUT_MFC_MFC 207 > +#define CLK_GOUT_MIF_BUSP 208 > +#define CLK_GOUT_MISC_BUS 209 > +#define CLK_GOUT_MISC_SSS 210 > +#define CLK_GOUT_PDP_BUS 211 > +#define CLK_GOUT_PDP_VRA 212 > +#define CLK_GOUT_G3AA 213 > +#define CLK_GOUT_PERIC0_BUS 214 > +#define CLK_GOUT_PERIC0_IP 215 > +#define CLK_GOUT_PERIC1_BUS 216 > +#define CLK_GOUT_PERIC1_IP 217 > +#define CLK_GOUT_TNR_BUS 218 > +#define CLK_GOUT_TOP_CMUREF 219 > +#define CLK_GOUT_TPU_BUS 220 > +#define CLK_GOUT_TPU_TPU 221 > +#define CLK_GOUT_TPU_TPUCTL 222 > +#define CLK_GOUT_TPU_UART 223 > > /* CMU_APM */ > #define CLK_MOUT_APM_FUNC 1 > -- > 2.43.0.472.g3155946c3a-goog >
diff --git a/include/dt-bindings/clock/google,gs101.h b/include/dt-bindings/clock/google,gs101.h index 5d2c2d907a7b..9761c0b24e66 100644 --- a/include/dt-bindings/clock/google,gs101.h +++ b/include/dt-bindings/clock/google,gs101.h @@ -59,7 +59,7 @@ #define CLK_MOUT_CMU_HSI0_BUS 45 #define CLK_MOUT_CMU_HSI0_DPGTC 46 #define CLK_MOUT_CMU_HSI0_USB31DRD 47 -#define CLK_MOUT_CMU_HSI0_USBDPDGB 48 +#define CLK_MOUT_CMU_HSI0_USBDPDBG 48 #define CLK_MOUT_CMU_HSI1_BUS 49 #define CLK_MOUT_CMU_HSI1_PCIE 50 #define CLK_MOUT_CMU_HSI2_BUS 51 @@ -181,64 +181,64 @@ #define CLK_GOUT_BUS2_BUS 163 #define CLK_GOUT_CIS_CLK0 164 #define CLK_GOUT_CIS_CLK1 165 -#define CLK_GOUT_CIS_CLK2 167 -#define CLK_GOUT_CIS_CLK3 168 -#define CLK_GOUT_CIS_CLK4 169 -#define CLK_GOUT_CIS_CLK5 170 -#define CLK_GOUT_CIS_CLK6 171 -#define CLK_GOUT_CIS_CLK7 172 -#define CLK_GOUT_CMU_BOOST 173 -#define CLK_GOUT_CORE_BUS 174 -#define CLK_GOUT_CPUCL0_DBG 175 -#define CLK_GOUT_CPUCL0_SWITCH 176 -#define CLK_GOUT_CPUCL1_SWITCH 177 -#define CLK_GOUT_CPUCL2_SWITCH 178 -#define CLK_GOUT_CSIS_BUS 179 -#define CLK_GOUT_DISP_BUS 180 -#define CLK_GOUT_DNS_BUS 181 -#define CLK_GOUT_DPU_BUS 182 -#define CLK_GOUT_EH_BUS 183 -#define CLK_GOUT_G2D_G2D 184 -#define CLK_GOUT_G2D_MSCL 185 -#define CLK_GOUT_G3AA_G3AA 186 -#define CLK_GOUT_G3D_BUSD 187 -#define CLK_GOUT_G3D_GLB 188 -#define CLK_GOUT_G3D_SWITCH 189 -#define CLK_GOUT_GDC_GDC0 190 -#define CLK_GOUT_GDC_GDC1 191 -#define CLK_GOUT_GDC_SCSC 192 -#define CLK_GOUT_CMU_HPM 193 -#define CLK_GOUT_HSI0_BUS 194 -#define CLK_GOUT_HSI0_DPGTC 195 -#define CLK_GOUT_HSI0_USB31DRD 196 -#define CLK_GOUT_HSI0_USBDPDGB 197 -#define CLK_GOUT_HSI1_BUS 198 -#define CLK_GOUT_HSI1_PCIE 199 -#define CLK_GOUT_HSI2_BUS 200 -#define CLK_GOUT_HSI2_MMC_CARD 201 -#define CLK_GOUT_HSI2_PCIE 202 -#define CLK_GOUT_HSI2_UFS_EMBD 203 -#define CLK_GOUT_IPP_BUS 204 -#define CLK_GOUT_ITP_BUS 205 -#define CLK_GOUT_MCSC_ITSC 206 -#define CLK_GOUT_MCSC_MCSC 207 -#define CLK_GOUT_MFC_MFC 208 -#define CLK_GOUT_MIF_BUSP 209 -#define CLK_GOUT_MISC_BUS 210 -#define CLK_GOUT_MISC_SSS 211 -#define CLK_GOUT_PDP_BUS 212 -#define CLK_GOUT_PDP_VRA 213 -#define CLK_GOUT_G3AA 214 -#define CLK_GOUT_PERIC0_BUS 215 -#define CLK_GOUT_PERIC0_IP 216 -#define CLK_GOUT_PERIC1_BUS 217 -#define CLK_GOUT_PERIC1_IP 218 -#define CLK_GOUT_TNR_BUS 219 -#define CLK_GOUT_TOP_CMUREF 220 -#define CLK_GOUT_TPU_BUS 221 -#define CLK_GOUT_TPU_TPU 222 -#define CLK_GOUT_TPU_TPUCTL 223 -#define CLK_GOUT_TPU_UART 224 +#define CLK_GOUT_CIS_CLK2 166 +#define CLK_GOUT_CIS_CLK3 167 +#define CLK_GOUT_CIS_CLK4 168 +#define CLK_GOUT_CIS_CLK5 169 +#define CLK_GOUT_CIS_CLK6 170 +#define CLK_GOUT_CIS_CLK7 171 +#define CLK_GOUT_CMU_BOOST 172 +#define CLK_GOUT_CORE_BUS 173 +#define CLK_GOUT_CPUCL0_DBG 174 +#define CLK_GOUT_CPUCL0_SWITCH 175 +#define CLK_GOUT_CPUCL1_SWITCH 176 +#define CLK_GOUT_CPUCL2_SWITCH 177 +#define CLK_GOUT_CSIS_BUS 178 +#define CLK_GOUT_DISP_BUS 179 +#define CLK_GOUT_DNS_BUS 180 +#define CLK_GOUT_DPU_BUS 181 +#define CLK_GOUT_EH_BUS 182 +#define CLK_GOUT_G2D_G2D 183 +#define CLK_GOUT_G2D_MSCL 184 +#define CLK_GOUT_G3AA_G3AA 185 +#define CLK_GOUT_G3D_BUSD 186 +#define CLK_GOUT_G3D_GLB 187 +#define CLK_GOUT_G3D_SWITCH 188 +#define CLK_GOUT_GDC_GDC0 189 +#define CLK_GOUT_GDC_GDC1 190 +#define CLK_GOUT_GDC_SCSC 191 +#define CLK_GOUT_CMU_HPM 192 +#define CLK_GOUT_HSI0_BUS 193 +#define CLK_GOUT_HSI0_DPGTC 194 +#define CLK_GOUT_HSI0_USB31DRD 195 +#define CLK_GOUT_HSI0_USBDPDBG 196 +#define CLK_GOUT_HSI1_BUS 197 +#define CLK_GOUT_HSI1_PCIE 198 +#define CLK_GOUT_HSI2_BUS 199 +#define CLK_GOUT_HSI2_MMC_CARD 200 +#define CLK_GOUT_HSI2_PCIE 201 +#define CLK_GOUT_HSI2_UFS_EMBD 202 +#define CLK_GOUT_IPP_BUS 203 +#define CLK_GOUT_ITP_BUS 204 +#define CLK_GOUT_MCSC_ITSC 205 +#define CLK_GOUT_MCSC_MCSC 206 +#define CLK_GOUT_MFC_MFC 207 +#define CLK_GOUT_MIF_BUSP 208 +#define CLK_GOUT_MISC_BUS 209 +#define CLK_GOUT_MISC_SSS 210 +#define CLK_GOUT_PDP_BUS 211 +#define CLK_GOUT_PDP_VRA 212 +#define CLK_GOUT_G3AA 213 +#define CLK_GOUT_PERIC0_BUS 214 +#define CLK_GOUT_PERIC0_IP 215 +#define CLK_GOUT_PERIC1_BUS 216 +#define CLK_GOUT_PERIC1_IP 217 +#define CLK_GOUT_TNR_BUS 218 +#define CLK_GOUT_TOP_CMUREF 219 +#define CLK_GOUT_TPU_BUS 220 +#define CLK_GOUT_TPU_TPU 221 +#define CLK_GOUT_TPU_TPUCTL 222 +#define CLK_GOUT_TPU_UART 223 /* CMU_APM */ #define CLK_MOUT_APM_FUNC 1
166 was skipped by mistake and two clocks: * CLK_MOUT_CMU_HSI0_USBDPDGB * CLK_GOUT_HSI0_USBDPDGB Have an incorrect DGB ending instead of DBG. This is an ABI break, but as the patch was only applied yesterday this header has never been in an actual release so it seems better to fix this early than ignore it. Fixes: 0a910f160638 ("dt-bindings: clock: Add Google gs101 clock management unit bindings") Signed-off-by: Peter Griffin <peter.griffin@linaro.org> --- include/dt-bindings/clock/google,gs101.h | 118 +++++++++++------------ 1 file changed, 59 insertions(+), 59 deletions(-)