diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-06 09:56:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-06 09:56:53 -0700 |
| commit | 9f57c13f7ed70a94ecc135645bc764efdd378acd (patch) | |
| tree | eb1f4b7c9fbfd228c38d00e42914f1871371e0bd /arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi | |
| parent | Merge tag 'dmaengine-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | bus: ixp4xx: fix IXP4XX_EXP_T1_MASK (diff) | |
| download | linux-9f57c13f7ed70a94ecc135645bc764efdd378acd.tar.gz linux-9f57c13f7ed70a94ecc135645bc764efdd378acd.zip | |
Merge tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"There are three small fixes that came up sincie the past week:
- an incorrect bit offset in ixp4xx bus driver
- a riscv randconfig regression in the thead platform I merged
- whitespace fixes for some dts files"
* tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
bus: ixp4xx: fix IXP4XX_EXP_T1_MASK
ARM: dts: st: add missing space before {
RISC-V: make ARCH_THEAD preclude XIP_KERNEL
Diffstat (limited to 'arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi b/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi index fb4600a59869..a75f50cf7123 100644 --- a/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi +++ b/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi @@ -117,12 +117,12 @@ status = "okay"; }; -&iwdg2{ +&iwdg2 { timeout-sec = <32>; status = "okay"; }; -&m4_rproc{ +&m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; @@ -136,7 +136,7 @@ status = "okay"; }; -&rtc{ +&rtc { status = "okay"; }; |