STM32 DT for v6.7, round 1

Highlights:
 ----------
 
 - MCU:
   - Add SDIO  sleep pins for F7 boards.
 
 - MPU:
   - STM32MP13:
     - Add HASH and RNG support.
 
   - STMP32MP15:
     - OCTAVO:
       - Fix regulators (LDO1/2/6 and 3v3_hdmi) by removing "always-on"
         property on OSD32 common file.
       - Add new OS32MP1-RED board. It embeds a STM32157C SoC,
         512 MB of DDR3, CAN-FD, HDMI, USB-C OTG.
 
   - STM32MP25:
     - Add and enable SDCARD support.
     - Add and enable ARM watchdog support and set it to 32 seconds.
 -----BEGIN PGP SIGNATURE-----
 
 iQJRBAABCgA7FiEEctl9+nxzUSUqdELdf5rJavIecIUFAmUs+kAdHGFsZXhhbmRy
 ZS50b3JndWVAZm9zcy5zdC5jb20ACgkQf5rJavIecIUUfA//XYZhH8GOafGcOBfq
 8kuQLbb+vy5J3Dxa67kXwvpeMKMGpOKyhn0f26jG/8BMGVmVtj7W0NF9qt72RKgq
 lP+OwSsfJdOtIUm1b6yEixqgWxh8jcS+Q0OXrTWnjmBRAx82d/cdl4CJuBunR63b
 ZELa12unUCViZl/2+J0b83jLjLElhlwSf8hmeUlkLbKc3OxBm1CsJLzOoosxV+eT
 e7ij1B/PPFn9h4KWDuX2hVPRHDNrUb0QTOv0KhuhF67RET0JfzwpPnHDmu4X6ub5
 tzqRj1QAK6OF9aBXrponTvXOvruw9we4sppjppTusacdWR5kELO1jfmKToC8FYz3
 B5HQwJvEz7YsUFzOk5f1vhR1x7wqzIil+pVoVO02ncD4lt4437lBgegkhrnH7gaI
 /WV89RIdJSW2Kz7B0bxT9rZ+4RKnx5Ei2eaTSPrvL5wkFPwvh/c+jCCI3rBy9FDI
 K/2ik+dOYKVc8mK4RS/Cx7Al9PkLDkMuNh/OBdNnakAiaNS7iPC744isCCqB09PB
 YbyOe32VRvxMP0JKiyyX1Do6hOKVTjButtogWikQcxZj4c6bC6VNumOuu28355KT
 mnIQ15XYOn7sjdRJtBEG0sBZ9IqYM1WwOVUf+kYt8eGuGljSshUxsGjU34LJ5Kn9
 iG7m+hRnMoyP9OxMOMkUHZ9FUyQ=
 =TIS3
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmUtRP8ACgkQYKtH/8kJ
 Uicw6hAAr+ltlqqfbKQ/6fveHbZS8BtUsd15Wyx+LvAI9jWqEpqEygRqSmB4LLKT
 DcnrphkTBc15HtUmKAQhukWTwRBnbGJ0tRL83Wdd/SYtNf3yVaTalDxc+nH/SfAe
 dKnxRNcUP/7E+Y6Nw6R/N0TV7LpglhtmxuXrqBHRf8a30C/VGF9kkgZBu9kr0V9A
 tsVTUE0fjBD28bxuyBlxRnDWT1k1zk59HBy2f+eLu9LvFigyTm8xfTzBeCITpEzb
 X2qEpUQeDAsVUJacZuPTRfqlv0/AzbWi5PcIc6I/y71jOB8Q0p4DKN5siCKhEnRG
 yAviYZpcQtQrrciuQxwjFJRc4blU+NrKzbqNuAuJFedyzet8SZwoq6rKAbCAspFJ
 9s0PA8SGT1ajdL4lxEnm8O19w/4IlupUtlRE3V75xISDVJ3UI+iGI1gU7NDG53jS
 v3RQUx6z9GqM/q7i+srYlvTwfg0pBFjN8m00p/hrTvLgEjZ9PRaJvCE5Gx0n9q1Y
 LEETKUqNKwSOl1pEApJppVEvcMO3NFm26oDmAcObG2mSzsJXeUYs1fEwSysSv2uK
 qiZ7Ei8psZNFvzegY6xnh8q4yWjc8nqvj9NR/feZKMgMhjfWC2gT547YD83PW5K8
 fFfQ9jnzsvRA+KeVnqb/APrJv0qdA1sYa6MtDF0nCcfJdW1rfPo=
 =hwWt
 -----END PGP SIGNATURE-----

Merge tag 'stm32-dt-for-v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into soc/dt

STM32 DT for v6.7, round 1

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

- MCU:
  - Add SDIO  sleep pins for F7 boards.

- MPU:
  - STM32MP13:
    - Add HASH and RNG support.

  - STMP32MP15:
    - OCTAVO:
      - Fix regulators (LDO1/2/6 and 3v3_hdmi) by removing "always-on"
        property on OSD32 common file.
      - Add new OS32MP1-RED board. It embeds a STM32157C SoC,
        512 MB of DDR3, CAN-FD, HDMI, USB-C OTG.

  - STM32MP25:
    - Add and enable SDCARD support.
    - Add and enable ARM watchdog support and set it to 32 seconds.

* tag 'stm32-dt-for-v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: add SDIO pinctrl sleep support on stm32f7 boards
  ARM: dts: stm32: add stm32f7 SDIO sleep pins
  ARM: dts: stm32: add RNG node for STM32MP13x platforms
  ARM: dts: stm32: omit unused pinctrl groups from stm32mp15 dtb files
  ARM: dts: stm32: stm32f7-pinctrl: don't use multiple blank lines
  ARM: dts: stm32: add HASH on stm32mp131
  arm64: dts: st: enable secure arm-wdt watchdog on stm32mp257f-ev1
  arm64: dts: st: add arm-wdt node for watchdog support on stm32mp251
  arm64: dts: st: add SD-card support on STM32MP257F-EV1 board
  arm64: dts: st: add sdmmc1 pins for stm32mp25
  arm64: dts: st: add sdmmc1 node in stm32mp251 SoC file
  ARM: dts: stm32: Add Octavo OSD32MP1-RED board
  dt-bindings: arm: stm32: add extra SiP compatible for oct,stm32mp157c-osd32-red
  ARM: dts: stm32: osd32: fix ldo6 not required to be always-on
  ARM: dts: stm32: lxa-tac: remove v3v3_hdmi override
  ARM: dts: stm32: osd32: fix ldo2 not required to be always-on
  ARM: dts: stm32: osd32: fix ldo1 not required to be always-on
  ARM: dts: stm32: Add alternate pinmux for can pins
  ARM: dts: stm32: Add alternate pinmux for ldtc pins
  ARM: dts: stm32: Add alternate pinmux for i2s pins

Link: https://lore.kernel.org/r/8a6b3ca9-f10d-825e-e371-8aeff3289a25@foss.st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-10-16 16:13:19 +02:00
commit 0e70ecbb2b
14 changed files with 716 additions and 14 deletions

View File

@ -146,6 +146,7 @@ properties:
- lxa,stm32mp157c-mc1 # Linux Automation MC-1
- lxa,stm32mp157c-tac-gen1 # Linux Automation TAC (Generation 1)
- lxa,stm32mp157c-tac-gen2 # Linux Automation TAC (Generation 2)
- oct,stm32mp157c-osd32-red # Octavo OSD32MP1 RED board
- const: oct,stm32mp15xx-osd32
- enum:
- st,stm32mp157

View File

@ -59,6 +59,7 @@ dtb-$(CONFIG_ARCH_STM32) += \
stm32mp157c-lxa-tac-gen1.dtb \
stm32mp157c-lxa-tac-gen2.dtb \
stm32mp157c-odyssey.dtb \
stm32mp157c-osd32mp1-red.dtb \
stm32mp157c-phycore-stm32mp1-3.dtb
dtb-$(CONFIG_ARCH_U8500) += \
ste-snowball.dtb \

View File

@ -188,9 +188,10 @@
status = "okay";
vmmc-supply = <&mmc_vcard>;
broken-cd;
pinctrl-names = "default", "opendrain";
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdio_pins_a>;
pinctrl-1 = <&sdio_pins_od_a>;
pinctrl-2 = <&sdio_pins_sleep_a>;
bus-width = <4>;
};

View File

@ -263,6 +263,17 @@
};
};
sdio_pins_sleep_a: sdio-pins-sleep-a-0 {
pins {
pinmux = <STM32_PINMUX('C', 8, ANALOG)>, /* SDMMC1 D0 */
<STM32_PINMUX('C', 9, ANALOG)>, /* SDMMC1 D1 */
<STM32_PINMUX('C', 10, ANALOG)>, /* SDMMC1 D2 */
<STM32_PINMUX('C', 11, ANALOG)>, /* SDMMC1 D3 */
<STM32_PINMUX('C', 12, ANALOG)>, /* SDMMC1 CLK */
<STM32_PINMUX('D', 2, ANALOG)>; /* SDMMC1 CMD */
};
};
sdio_pins_b: sdio-pins-b-0 {
pins {
pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
@ -294,6 +305,17 @@
};
};
sdio_pins_sleep_b: sdio-pins-sleep-b-0 {
pins {
pinmux = <STM32_PINMUX('G', 9, ANALOG)>, /* SDMMC2 D0 */
<STM32_PINMUX('G', 10, ANALOG)>, /* SDMMC2 D1 */
<STM32_PINMUX('B', 3, ANALOG)>, /* SDMMC2 D2 */
<STM32_PINMUX('B', 4, ANALOG)>, /* SDMMC2 D3 */
<STM32_PINMUX('D', 6, ANALOG)>, /* SDMMC2 CLK */
<STM32_PINMUX('D', 7, ANALOG)>; /* SDMMC2 CMD */
};
};
can1_pins_a: can1-0 {
pins1 {
pinmux = <STM32_PINMUX('A', 12, AF9)>; /* CAN1_TX */
@ -376,7 +398,6 @@
};
};
ltdc_pins_a: ltdc-0 {
pins {
pinmux = <STM32_PINMUX('E', 4, AF14)>, /* LCD_B0 */

View File

@ -164,9 +164,10 @@
status = "okay";
vmmc-supply = <&vcc_3v3>;
cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
pinctrl-names = "default", "opendrain";
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdio_pins_a>;
pinctrl-1 = <&sdio_pins_od_a>;
pinctrl-2 = <&sdio_pins_sleep_a>;
bus-width = <4>;
};

View File

@ -131,9 +131,10 @@
vmmc-supply = <&mmc_vcard>;
cd-gpios = <&gpioi 15 GPIO_ACTIVE_LOW>;
broken-cd;
pinctrl-names = "default", "opendrain";
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdio_pins_b>;
pinctrl-1 = <&sdio_pins_od_b>;
pinctrl-2 = <&sdio_pins_sleep_b>;
bus-width = <4>;
};

View File

@ -1210,6 +1210,25 @@
};
};
hash: hash@54003000 {
compatible = "st,stm32mp13-hash";
reg = <0x54003000 0x400>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc HASH1>;
resets = <&rcc HASH1_R>;
dmas = <&mdma 30 0x2 0x1000a02 0x0 0x0>;
dma-names = "in";
status = "disabled";
};
rng: rng@54004000 {
compatible = "st,stm32mp13-rng";
reg = <0x54004000 0x400>;
clocks = <&rcc RNG1_K>;
resets = <&rcc RNG1_R>;
status = "disabled";
};
mdma: dma-controller@58000000 {
compatible = "st,stm32h7-mdma";
reg = <0x58000000 0x1000>;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,225 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* Copyright (C) Geanix ApS 2023 - All Rights Reserved
* Author: Sean Nyekjaer <sean@geanix.com>
*/
/dts-v1/;
#include "stm32mp157.dtsi"
#include "stm32mp15xc.dtsi"
#include "stm32mp15xx-osd32.dtsi"
#include "stm32mp15xxac-pinctrl.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
/ {
model = "Octavo OSD32MP1 RED board";
compatible = "oct,stm32mp157c-osd32-red", "oct,stm32mp15xx-osd32", "st,stm32mp157";
aliases {
serial0 = &uart4;
};
chosen {
stdout-path = "serial0:115200n8";
};
led-controller-0 {
compatible = "gpio-leds";
led-0 {
label = "heartbeat";
gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
};
};
&crc1 {
status = "okay";
};
&dts {
status = "okay";
};
&ethernet0 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&ethernet0_rgmii_pins_a>;
pinctrl-1 = <&ethernet0_rgmii_sleep_pins_a>;
phy-mode = "rgmii-id";
max-speed = <1000>;
phy-handle = <&phy0>;
st,eth-clk-sel;
status = "okay";
mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
phy0: ethernet-phy@3 {
reg = <3>;
};
};
};
&iwdg2 {
timeout-sec = <32>;
status = "okay";
};
&i2c1 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-1 = <&i2c1_sleep_pins_a>;
status = "okay";
i2c-scl-rising-time-ns = <100>;
i2c-scl-falling-time-ns = <7>;
/* spare dmas for other usage */
/delete-property/dmas;
/delete-property/dma-names;
hdmi-transmitter@39 {
compatible = "sil,sii9022";
reg = <0x39>;
reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>;
interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
interrupt-parent = <&gpiog>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&ltdc_pins_e>;
pinctrl-1 = <&ltdc_sleep_pins_e>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
sii9022_in: endpoint {
remote-endpoint = <&ltdc_ep0_out>;
};
};
port@3 {
reg = <3>;
sii9022_tx_endpoint: endpoint {
remote-endpoint = <&i2s2_endpoint>;
};
};
};
};
};
&i2s2 {
clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc CK_PER>, <&rcc PLL3_R>;
clock-names = "pclk", "i2sclk", "x8k", "x11k";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2s2_pins_b>;
pinctrl-1 = <&i2s2_sleep_pins_b>;
status = "okay";
i2s2_port: port {
i2s2_endpoint: endpoint {
remote-endpoint = <&sii9022_tx_endpoint>;
dai-format = "i2s";
mclk-fs = <256>;
};
};
};
&ltdc {
status = "okay";
port {
ltdc_ep0_out: endpoint {
remote-endpoint = <&sii9022_in>;
};
};
};
&m_can1 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&m_can1_pins_d>;
pinctrl-1 = <&m_can1_sleep_pins_d>;
status = "okay";
};
&pwr_regulators {
vdd-supply = <&vdd>;
vdd_3v3_usbfs-supply = <&vdd_usb>;
};
&rtc {
status = "okay";
};
&sdmmc1 {
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdmmc1_b4_pins_a>;
pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
cd-gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
disable-wp;
st,neg-edge;
bus-width = <4>;
vmmc-supply = <&v3v3>;
status = "okay";
};
&sdmmc2 {
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_d>;
pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_d>;
non-removable;
no-sd;
no-sdio;
st,neg-edge;
bus-width = <8>;
vmmc-supply = <&v3v3>;
vqmmc-supply = <&vdd>;
mmc-ddr-3_3v;
status = "okay";
};
&uart4 {
pinctrl-names = "default", "sleep", "idle";
pinctrl-0 = <&uart4_pins_a>;
pinctrl-1 = <&uart4_sleep_pins_a>;
pinctrl-2 = <&uart4_idle_pins_a>;
/* spare dmas for other usage */
/delete-property/dmas;
/delete-property/dma-names;
status = "okay";
};
&usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay";
};
&usbh_ohci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay";
};
&usbotg_hs {
vbus-supply = <&vbus_otg>;
};
&usbphyc {
status = "okay";
};
&usbphyc_port0 {
phy-supply = <&vdd_usb>;
};
&usbphyc_port1 {
phy-supply = <&vdd_usb>;
};

View File

@ -597,10 +597,6 @@ baseboard_eeprom: &sip_eeprom {
phy-supply = <&vdd_usb>;
};
&v3v3_hdmi {
/delete-property/regulator-always-on;
};
&vrefbuf {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;

View File

@ -117,18 +117,14 @@
regulator-name = "v1v8_audio";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
interrupts = <IT_CURLIM_LDO1 0>;
};
v3v3_hdmi: ldo2 {
regulator-name = "v3v3_hdmi";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
interrupts = <IT_CURLIM_LDO2 0>;
};
vtt_ddr: ldo3 {
@ -156,9 +152,7 @@
regulator-name = "v1v2_hdmi";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on;
interrupts = <IT_CURLIM_LDO6 0>;
};
vref_ddr: vref_ddr {

View File

@ -6,6 +6,60 @@
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
&pinctrl {
sdmmc1_b4_pins_a: sdmmc1-b4-0 {
pins1 {
pinmux = <STM32_PINMUX('E', 4, AF10)>, /* SDMMC1_D0 */
<STM32_PINMUX('E', 5, AF10)>, /* SDMMC1_D1 */
<STM32_PINMUX('E', 0, AF10)>, /* SDMMC1_D2 */
<STM32_PINMUX('E', 1, AF10)>, /* SDMMC1_D3 */
<STM32_PINMUX('E', 2, AF10)>; /* SDMMC1_CMD */
slew-rate = <2>;
drive-push-pull;
bias-disable;
};
pins2 {
pinmux = <STM32_PINMUX('E', 3, AF10)>; /* SDMMC1_CK */
slew-rate = <3>;
drive-push-pull;
bias-disable;
};
};
sdmmc1_b4_od_pins_a: sdmmc1-b4-od-0 {
pins1 {
pinmux = <STM32_PINMUX('E', 4, AF10)>, /* SDMMC1_D0 */
<STM32_PINMUX('E', 5, AF10)>, /* SDMMC1_D1 */
<STM32_PINMUX('E', 0, AF10)>, /* SDMMC1_D2 */
<STM32_PINMUX('E', 1, AF10)>; /* SDMMC1_D3 */
slew-rate = <2>;
drive-push-pull;
bias-disable;
};
pins2 {
pinmux = <STM32_PINMUX('E', 3, AF10)>; /* SDMMC1_CK */
slew-rate = <3>;
drive-push-pull;
bias-disable;
};
pins3 {
pinmux = <STM32_PINMUX('E', 2, AF10)>; /* SDMMC1_CMD */
slew-rate = <2>;
drive-open-drain;
bias-disable;
};
};
sdmmc1_b4_sleep_pins_a: sdmmc1-b4-sleep-0 {
pins {
pinmux = <STM32_PINMUX('E', 4, ANALOG)>, /* SDMMC1_D0 */
<STM32_PINMUX('E', 5, ANALOG)>, /* SDMMC1_D1 */
<STM32_PINMUX('E', 0, ANALOG)>, /* SDMMC1_D2 */
<STM32_PINMUX('E', 1, ANALOG)>, /* SDMMC1_D3 */
<STM32_PINMUX('E', 3, ANALOG)>, /* SDMMC1_CK */
<STM32_PINMUX('E', 2, ANALOG)>; /* SDMMC1_CMD */
};
};
usart2_pins_a: usart2-0 {
pins1 {
pinmux = <STM32_PINMUX('A', 4, AF6)>; /* USART2_TX */

View File

@ -28,6 +28,12 @@
interrupt-parent = <&intc>;
};
arm_wdt: watchdog {
compatible = "arm,smc-wdt";
arm,smc-id = <0xb200005a>;
status = "disabled";
};
clocks {
ck_flexgen_08: ck-flexgen-08 {
#clock-cells = <0>;
@ -119,6 +125,19 @@
clocks = <&ck_flexgen_08>;
status = "disabled";
};
sdmmc1: mmc@48220000 {
compatible = "st,stm32mp25-sdmmc2", "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00353180>;
reg = <0x48220000 0x400>, <0x44230400 0x8>;
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ck_flexgen_51>;
clock-names = "apb_pclk";
cap-sd-highspeed;
cap-mmc-highspeed;
max-frequency = <120000000>;
status = "disabled";
};
};
syscfg: syscon@44230000 {

View File

@ -6,6 +6,7 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "stm32mp257.dtsi"
#include "stm32mp25xf.dtsi"
#include "stm32mp25-pinctrl.dtsi"
@ -39,6 +40,32 @@
no-map;
};
};
vdd_sdcard: vdd-sdcard {
compatible = "regulator-fixed";
regulator-name = "vdd_sdcard";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
};
&arm_wdt {
timeout-sec = <32>;
status = "okay";
};
&sdmmc1 {
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdmmc1_b4_pins_a>;
pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
cd-gpios = <&gpiod 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
disable-wp;
st,neg-edge;
bus-width = <4>;
vmmc-supply = <&vdd_sdcard>;
status = "okay";
};
&usart2 {