Commit aff195d0 authored May 21, 2020 by Arnd Bergmann

Merge tag 'stm32-dt-for-v5.8-1' of...

Merge tag 'stm32-dt-for-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/dt

STM32 DT updates for v5.8, round 1

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

MCU part:
 -fix a typo for DAC io-channel-cells on f429 and h743

MPU part:
 -Generic:
  -Bump tp PSCI 1.0
  -Fix a typo for DAC io-channel-cells
  -Add M4 pdds for deep sleep mode
  -Add I2C fatmode plus support

 -Add new Octavio lxa-mc1 board based on OSDMP15x SiP

 -Add new Stinger96 board support. It is a 96Boards IoT Extended board
  based on stm32mp157a SoC. Some figures: 256MB DDR, 125MB and flash,
  Onboard BG96 modem...

 -Add IoT Box board support based on stinger96 board + Wifi/BT, CCS811
  VOC sensor, 2 digitals microphones ...

 -DH:
  -Adapt dhcom-som and dhcom-pdk2 dts(i) files to STM32MP15 SoC diversity
  -Add GPIO led and GPIO keys support on PDK2 board

 -AV96:
  -Major rework to support official avenger96 board based on DHCOR SOM.
  -Prototype board is no more supported

* tag 'stm32-dt-for-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (58 commits)
  ARM: dts: stm32: Split Avenger96 into DHCOR SoM and Avenger96 board
  ARM: dts: stm32: Split SoC-independent parts of DHCOM SOM and PDK2
  ARM: dts: stm32: Add GPIO LEDs for STM32MP1 DHCOM PDK2
  ARM: dts: stm32: Add GPIO keys for STM32MP1 DHCOM PDK2
  ARM: dts: stm32: Add IoT Box board support
  dt-bindings: arm: stm32: Document IoT Box compatible
  ARM: dts: stm32: Add Stinger96 board support
  dt-bindings: arm: stm32: Document Stinger96 compatible
  ARM: dts: stm32: Add missing pinctrl entries for STM32MP15
  dt-bindings: Add vendor prefix for Shiratech Solutions
  ARM: dts: stm32: Add bindings for SPI2 on AV96
  ARM: dts: stm32: Add alternate pinmux for SPI2 pins
  ARM: dts: stm32: Add bindings for ADC on AV96
  ARM: dts: stm32: Add alternate pinmux for ADC pins
  ARM: dts: stm32: Add bindings for FDCAN2 on AV96
  ARM: dts: stm32: Add alternate pinmux for FDCAN2 pins
  ARM: dts: stm32: Add bindings for FDCAN1 on AV96
  ARM: dts: stm32: Add alternate pinmux for FDCAN1 pins
  ARM: dts: stm32: Repair I2C2 operation on AV96
  ARM: dts: stm32: Add alternate pinmux for I2C2 pins
  ...

Link: https://lore.kernel.org/r/19160355-364d-170c-7ae2-5ba7f714103f@st.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents ca6bc7a1 7e76f82a

Documentation/devicetree/bindings/arm/stm32/stm32.yaml

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,9 @@ properties:
		- items:
		- enum:
		- arrow,stm32mp157a-avenger96 # Avenger96
		- lxa,stm32mp157c-mc1
		- shiratech,stm32mp157a-iot-box # IoT Box
		- shiratech,stm32mp157a-stinger96 # Stinger96
		- st,stm32mp157c-ed1
		- st,stm32mp157a-dk1
		- st,stm32mp157c-dk2

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0

Original line number	Diff line number	Diff line
		@@ -585,6 +585,8 @@ patternProperties:
		description: LSI Corp. (LSI Logic)
		"^lwn,.*":
		description: Liebherr-Werk Nenzing GmbH
		"^lxa,.*":
		description: Linux Automation GmbH
		"^macnica,.*":
		description: Macnica Americas
		"^mapleboard,.*":
		@@ -900,6 +902,8 @@ patternProperties:
		description: Sharp Corporation
		"^shimafuji,.*":
		description: Shimafuji Electric, Inc.
		"^shiratech,.*":
		description: Shiratech Solutions
		"^si-en,.*":
		description: Si-En Technology Ltd.
		"^si-linux,.*":

arch/arm/boot/dts/Makefile

+5 −1

Original line number	Diff line number	Diff line
		@@ -1035,11 +1035,15 @@ dtb-$(CONFIG_ARCH_STM32) += \
		stm32h743i-eval.dtb \
		stm32h743i-disco.dtb \
		stm32mp157a-avenger96.dtb \
		stm32mp157a-dhcor-avenger96.dtb \
		stm32mp157a-dk1.dtb \
		stm32mp157a-iot-box.dtb \
		stm32mp157a-stinger96.dtb \
		stm32mp157c-dhcom-pdk2.dtb \
		stm32mp157c-dk2.dtb \
		stm32mp157c-ed1.dtb \
		stm32mp157c-ev1.dtb
		stm32mp157c-ev1.dtb \
		stm32mp157c-lxa-mc1.dtb
		dtb-$(CONFIG_MACH_SUN4I) += \
		sun4i-a10-a1000.dtb \
		sun4i-a10-ba10-tvbox.dtb \

arch/arm/boot/dts/stm32f429.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -414,14 +414,14 @@

		dac1: dac@1 {
		compatible = "st,stm32-dac";
		#io-channels-cells = <1>;
		#io-channel-cells = <1>;
		reg = <1>;
		status = "disabled";
		};

		dac2: dac@2 {
		compatible = "st,stm32-dac";
		#io-channels-cells = <1>;
		#io-channel-cells = <1>;
		reg = <2>;
		status = "disabled";
		};

arch/arm/boot/dts/stm32h743.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -180,14 +180,14 @@

		dac1: dac@1 {
		compatible = "st,stm32-dac";
		#io-channels-cells = <1>;
		#io-channel-cells = <1>;
		reg = <1>;
		status = "disabled";
		};

		dac2: dac@2 {
		compatible = "st,stm32-dac";
		#io-channels-cells = <1>;
		#io-channel-cells = <1>;
		reg = <2>;
		status = "disabled";
		};

Admin message