[PATCH] ARM: dts: stm32: use right compatible for stm32f469

[Alexandre Torgue]

Hi Arnd,

On 08/16/2017 11:00 PM, Arnd Bergmann wrote:
> On Thu, Jul 27, 2017 at 6:27 PM, Alexandre Torgue
> <alexandre.torgue at st.com> wrote:
>> Currently, same stm32f429-pinctrl driver is used for stm32f429 and
>> stm32f469. As pin map is different between those 2 MCUs,
>> a stm32f469-pinctrl driver has been recently added.
>> This patch
>>   -allows to use stm32f469-pinctrl driver for stm32f469 boards
>>   -reworks stm32 devicetree files to fit with stm32f429 / stm32f469
>>
>> In the same time it fixes an issue when only MACH_STM32F469 flag is
>> selected in menuconfig.
>>
>> Fixes: d28bcd53fa90 ("ARM: stm32: Introduce MACH_STM32F469 flag")
>> Reported-by: Nicolas Pitre <nicolas.pitre at linaro.org>
>> Signed-off-by: Alexandre Torgue <alexandre.torgue at st.com>
>> ---
>>
>> Hi Arnd, Kevin and Olof,
>>
>> I send this series in 4.13-rcx cycle to fix d28bcd53fa90
>> ("ARM: stm32: Introduce MACH_STM32F469 flag").
>> This patch could look "huge" to fix the issue but I prefer to send
>> a clean patch now that send a quick fix first and a DT rework in 4.14
>> cycle.
>> Let me know, if tou disagree with that.
> 
> Unfortunately I did not have this one on my radar for the 4.13 fixes,
> as the subject looked rather innocent. My feeling is that we could have
> done it earlier, but by now it's a bit late, and I'd rather have a quick
> fix to merge for 4.13.

Sorry for this late answer, I just returned for vacation.
As you said title was not enough clear to take it as a fix, my fault.

Some words about the initial issue:
It concerns stm32f469-board. This board used stm32f429-pinctrl driver 
(under MACH_STM32F429 flag) and used "st,stm32f429-pinctrl" compatible 
in devicetree.
Recently I added a dedicated stm32f469-pinctrl driver (under 
MACH_STM32F469 flag) without changing devicetree.

In stm32_defconfig all pinctrl drivers (all MACH_STM32Fxx flags)  are 
enabled , so stm32f469-board boots with stm32f429-pinctrl driver. But 
users have possibility to change defconfig through menuconfig to select 
ONLY stm32f469-pinctrl driver (MACH_STM32F469 flag). In this case the 
board will not boot (as in device tree only "st,stm32f429-pinctrl" 
compatible is used).

As we are in -rc7, either we could consider that issue is minor (as it 
doesn't occur in default stm32 defconfig or I could send a fix like below:

-	compatible = "st,stm32f429-pinctrl";
+	compatible = "st,stm32f429-pinctrl", "st,stm32f469-pinctrl";

> 
> Doing this without merge conflicts unfortunately means that you have
> to send two pull requests, with the 4.14 one based on the quick fix
> for 4.13.

I checked that patch above doesn't impact my pull request 4.14 #1

Sorry for the inconvenience.

Alex


> 
>          Arnd
>