[GIT PULL] STM32 DT fixes for v5.19 #2

[GIT PULL] STM32 DT fixes for v5.19 #2

[Alexandre TORGUE]

Hi ARM SoC maintainers,

Please consider this second round of STM32 DT fixes for v5.19 cycle. It 
mainly concerns fixes for SCMI version of ST boards introduced in v5.19-rc1.

Thanks
Alex

The following changes since commit ea3414e1249ea35bc02debe28d4cbfeb6261657c:

   ARM: dts: stm32: move SCMI related nodes in a dedicated file for 
stm32mp15 (2022-06-07 17:22:21 +0200)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git 
tags/stm32-dt-for-v5.19-fixes-2

for you to fetch changes up to 779a1e6596a1f88e2a8d88544bb704babd35921f:

   ARM: dts: stm32: add missing usbh clock and fix clk order on 
stm32mp15 (2022-07-01 12:25:11 +0200)

----------------------------------------------------------------
STM32 DT fixes for v5.19, round 2

Highlights:
-----------

  -Fixes STM32MP15:
   - Add missing usbh clock and fix clk order for usbh to avoid PLL
     issue.
   - Fix SCMI version: use scmi regulator and update missing SCMI
     clocks to be able to correcly boot.

----------------------------------------------------------------
Etienne Carriere (1):
       ARM: dts: stm32: fix pwr regulators references to use scmi

Fabrice Gasnier (1):
       ARM: dts: stm32: add missing usbh clock and fix clk order on 
stm32mp15

Gabriel Fernandez (3):
       ARM: dts: stm32: use the correct clock source for CEC on stm32mp151
       ARM: dts: stm32: DSI should use LSE SCMI clock on DK1/ED1 STM32 board
       ARM: dts: stm32: delete fixed clock node on STM32MP15-SCMI

  arch/arm/boot/dts/stm32mp15-scmi.dtsi      | 58 
++++++++++++++++++++++++++++++
  arch/arm/boot/dts/stm32mp151.dtsi          |  6 ++--
  arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts |  4 +++
  arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts |  1 +
  arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts |  4 +++
  arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts |  1 +
  6 files changed, 71 insertions(+), 3 deletions(-)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [GIT PULL] STM32 DT fixes for v5.19 #2

[Arnd Bergmann]

On Fri, Jul 1, 2022 at 2:05 PM Alexandre TORGUE
<alexandre.torgue@foss.st.com> wrote:
>
> Hi ARM SoC maintainers,
>
> Please consider this second round of STM32 DT fixes for v5.19 cycle. It
> mainly concerns fixes for SCMI version of ST boards introduced in v5.19-rc1.
>
> The following changes since commit ea3414e1249ea35bc02debe28d4cbfeb6261657c:
>
>    ARM: dts: stm32: move SCMI related nodes in a dedicated file for
> stm32mp15 (2022-06-07 17:22:21 +0200)
>
> are available in the Git repository at:

Hi Alex,

I get a merge conflict because I had picked up the "ARM: dts: stm32: move SCMI
related nodes in a dedicated file for stm32mp15" commit from the mailing
list, so it now has a different commit ID from the one you are based on.

As far as I can tell, the patches are identical, but since the files
are modified
further in your tree, this confuses the git merge algorithm and leads to a
somewhat ugly git history with two identical commits if I fix it up.

Can you rebase this pull request on top of v5.19-rc4 and resend?
(note: don't rebase the non-fixes pull requests unless you have to).

      Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [GIT PULL] STM32 DT fixes for v5.19 #2

[Alexandre TORGUE]

On 7/1/22 15:25, Arnd Bergmann wrote:
> On Fri, Jul 1, 2022 at 2:05 PM Alexandre TORGUE
> <alexandre.torgue@foss.st.com> wrote:
>>
>> Hi ARM SoC maintainers,
>>
>> Please consider this second round of STM32 DT fixes for v5.19 cycle. It
>> mainly concerns fixes for SCMI version of ST boards introduced in v5.19-rc1.
>>
>> The following changes since commit ea3414e1249ea35bc02debe28d4cbfeb6261657c:
>>
>>     ARM: dts: stm32: move SCMI related nodes in a dedicated file for
>> stm32mp15 (2022-06-07 17:22:21 +0200)
>>
>> are available in the Git repository at:
> 
> Hi Alex,
> 
> I get a merge conflict because I had picked up the "ARM: dts: stm32: move SCMI
> related nodes in a dedicated file for stm32mp15" commit from the mailing
> list, so it now has a different commit ID from the one you are based on.
> 
> As far as I can tell, the patches are identical, but since the files
> are modified
> further in your tree, this confuses the git merge algorithm and leads to a
> somewhat ugly git history with two identical commits if I fix it up.
> 
> Can you rebase this pull request on top of v5.19-rc4 and resend?
> (note: don't rebase the non-fixes pull requests unless you have to).

Hi Arnd,

No pb, I'm going to send a v2. If it is not an issue for you, I would 
prefer to rebase also the stm32-next to avoid conflicts during the merge 
on your side.

Alex

> 
>        Arnd


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [GIT PULL] STM32 DT fixes for v5.19 #2

[Arnd Bergmann]

On Mon, Jul 4, 2022 at 9:52 AM Alexandre TORGUE
<alexandre.torgue@foss.st.com> wrote:
> On 7/1/22 15:25, Arnd Bergmann wrote:
>
> Hi Arnd,
>
> No pb, I'm going to send a v2.

Applied now, thanks!

> If it is not an issue for you, I would
> prefer to rebase also the stm32-next to avoid conflicts during the merge
> on your side.

Yes, I see  the same problem there now, so rebasing that as well is the right
solution. I started my other branches late, so rebasing on top of v5.19-rc4 is
fine, just no later than that.

      Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel