| Message ID | 20230423172528.1398158-2-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On Sun, 23 Apr 2023, Dario Binacchi wrote: > Add binding definition for CAN3 peripheral. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > > include/dt-bindings/mfd/stm32f7-rcc.h | 1 + > 1 file changed, 1 insertion(+) Applied, thanks
Hey Lee Jones, On 24.04.2023 10:02:29, Lee Jones wrote: > On Sun, 23 Apr 2023, Dario Binacchi wrote: > > > Add binding definition for CAN3 peripheral. > > > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > > --- > > > > include/dt-bindings/mfd/stm32f7-rcc.h | 1 + > > 1 file changed, 1 insertion(+) > > Applied, thanks I upstreamed the v2 of this series (https://lore.kernel.org/all/20230427204540.3126234-1-dario.binacchi@amarulasolutions.com/) that doesn't contain this change to net/main without noticing that the DT changes in that series depend on it. This broke the DT compilation of the stm32f746.dtsi in the net/main tree. I don't see the stm32f7-rcc.h changes in linus/master so I'm afraid this will break mainline too :/ What are the possible solutions? I see: 1) revert the stm32f746.dtsi changes via net/main 2) upstream the stm32f7-rcc.h changes via net/main, too 3) upstream the stm32f7-rcc.h changes via you tree, so that it hits mainline in the v6.4 release cycle. I'm in favor of solution number 1. Thoughts? Sorry for the mess, Marc
On 17/05/2023 16:16, Marc Kleine-Budde wrote: > Hey Lee Jones, > > On 24.04.2023 10:02:29, Lee Jones wrote: >> On Sun, 23 Apr 2023, Dario Binacchi wrote: >> >>> Add binding definition for CAN3 peripheral. >>> >>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> >>> --- >>> >>> include/dt-bindings/mfd/stm32f7-rcc.h | 1 + >>> 1 file changed, 1 insertion(+) >> >> Applied, thanks > > I upstreamed the v2 of this series > (https://lore.kernel.org/all/20230427204540.3126234-1-dario.binacchi@amarulasolutions.com/) > that doesn't contain this change to net/main without noticing that the > DT changes in that series depend on it. > > This broke the DT compilation of the stm32f746.dtsi in the net/main > tree. I don't see the stm32f7-rcc.h changes in linus/master so I'm > afraid this will break mainline too :/ > > What are the possible solutions? I see: > 1) revert the stm32f746.dtsi changes via net/main > 2) upstream the stm32f7-rcc.h changes via net/main, too > 3) upstream the stm32f7-rcc.h changes via you tree, so that it hits > mainline in the v6.4 release cycle. > > I'm in favor of solution number 1. Thoughts? DTS should never go with driver changes or with driver trees, not only because it hides ABI breaks but also for above reasons. The best if you just drop or revert DTS commits, so they can go via platform maintainer. Best regards, Krzysztof
On 17.05.2023 17:23:13, Krzysztof Kozlowski wrote: > On 17/05/2023 16:16, Marc Kleine-Budde wrote: > > Hey Lee Jones, > > > > On 24.04.2023 10:02:29, Lee Jones wrote: > >> On Sun, 23 Apr 2023, Dario Binacchi wrote: > >> > >>> Add binding definition for CAN3 peripheral. > >>> > >>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > >>> --- > >>> > >>> include/dt-bindings/mfd/stm32f7-rcc.h | 1 + > >>> 1 file changed, 1 insertion(+) > >> > >> Applied, thanks > > > > I upstreamed the v2 of this series > > (https://lore.kernel.org/all/20230427204540.3126234-1-dario.binacchi@amarulasolutions.com/) > > that doesn't contain this change to net/main without noticing that the > > DT changes in that series depend on it. > > > > This broke the DT compilation of the stm32f746.dtsi in the net/main > > tree. I don't see the stm32f7-rcc.h changes in linus/master so I'm > > afraid this will break mainline too :/ > > > > What are the possible solutions? I see: > > 1) revert the stm32f746.dtsi changes via net/main > > 2) upstream the stm32f7-rcc.h changes via net/main, too > > 3) upstream the stm32f7-rcc.h changes via you tree, so that it hits > > mainline in the v6.4 release cycle. > > > > I'm in favor of solution number 1. Thoughts? > > DTS should never go with driver changes or with driver trees, not only > because it hides ABI breaks but also for above reasons. The best if you > just drop or revert DTS commits, so they can go via platform maintainer. Reverted: https://lore.kernel.org/20230517181950.1106697-1-mkl@pengutronix.de Thanks, Marc
diff --git a/include/dt-bindings/mfd/stm32f7-rcc.h b/include/dt-bindings/mfd/stm32f7-rcc.h index a90f3613c584..8d73a9c51e2b 100644 --- a/include/dt-bindings/mfd/stm32f7-rcc.h +++ b/include/dt-bindings/mfd/stm32f7-rcc.h @@ -64,6 +64,7 @@ #define STM32F7_RCC_APB1_TIM14 8 #define STM32F7_RCC_APB1_LPTIM1 9 #define STM32F7_RCC_APB1_WWDG 11 +#define STM32F7_RCC_APB1_CAN3 13 #define STM32F7_RCC_APB1_SPI2 14 #define STM32F7_RCC_APB1_SPI3 15 #define STM32F7_RCC_APB1_SPDIFRX 16
Add binding definition for CAN3 peripheral. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- include/dt-bindings/mfd/stm32f7-rcc.h | 1 + 1 file changed, 1 insertion(+)