Skip to content

Commit 1092e5c

Browse files
arndbarndb
committed
Merge tag 'stm32-dt-for-v6.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into soc/dt
STM32 DT for v6.20, round 1 Highlights: ---------- - MCU: - Update/add Led support on ST boards. - MPU: - STM32MP13: - Add boot led and red led on ST DK board. - STMP32MP15: - Add boot led and red led on ST DK boards. - Add SPI1 sleep pinctrl group. - STM32MP23: - Add green ,orange and boot leds on ST boards. - Add SPI, I2C, DCMIPP and CSI instances to CLUSTER_PD power domain. - Enable analog-filter to all I2C instances. - STM32MP25: - Add green ,orange and boot leds on ST boards. - Add SPI, I2C, DCMIPP and CSI instances to CLUSTER_PD power domain. - Enable analog-filter to all I2C instances. - Add LPDDR/DDR channels to ST boards. * tag 'stm32-dt-for-v6.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (31 commits) arm/arm64: dts: st: Drop unused .dtsi arm64: STM32: drop an undefined Kconfig symbol arm64: dts: st: Minor whitespace cleanup arm64: dts: st: Use hyphen in node names arm64: dts: st: add power-domain of dcmipp in stm32mp231.dtsi arm64: dts: st: add power-domain of dcmipp in stm32mp251.dtsi dt-bindings: media: st: dcmipp: add 'power-domains' property arm64: dts: st: add power-domain of csi in stm32mp231.dtsi arm64: dts: st: add power-domain of csi in stm32mp251.dtsi dt-bindings: media: st: csi: add 'power-domains' property ARM: dts: stm32: add spi1 sleep state pinctrl on stm32mp157c-ev1 arm64: dts: st: add DDR channel to stm32mp257f-ev1 board arm64: dts: st: add LPDDR channel to stm32mp257f-dk board arm64: dts: st: enable i2c analog-filter in stm32mp231.dtsi arm64: dts: st: enable i2c analog-filter in stm32mp251.dtsi arm64: dts: st: add power-domains in all i2c of stm32mp231.dtsi arm64: dts: st: add power-domains in all i2c of stm32mp251.dtsi dt-bindings: i2c: st,stm32-i2c: add 'power-domains' property arm64: dts: st: add power-domains in all spi of stm32mp231.dtsi arm64: dts: st: add power-domains in all spi of stm32mp251.dtsi ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 2ba042c + 1636348 commit 1092e5c

28 files changed

Lines changed: 365 additions & 228 deletions

‎Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ properties:
127127

128128
wakeup-source: true
129129

130+
power-domains:
131+
maxItems: 1
132+
130133
access-controllers:
131134
minItems: 1
132135
maxItems: 2

‎Documentation/devicetree/bindings/media/st,stm32-dcmipp.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ properties:
3737
resets:
3838
maxItems: 1
3939

40+
power-domains:
41+
maxItems: 1
42+
4043
access-controllers:
4144
minItems: 1
4245
maxItems: 2

‎Documentation/devicetree/bindings/media/st,stm32mp25-csi.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ properties:
4646
minItems: 1
4747
maxItems: 2
4848

49+
power-domains:
50+
maxItems: 1
51+
4952
ports:
5053
$ref: /schemas/graph.yaml#/properties/ports
5154

‎arch/arm/boot/dts/st/spear320s.dtsi‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎arch/arm/boot/dts/st/stm32429i-eval.dts‎

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@
4848
/dts-v1/;
4949
#include "stm32f429.dtsi"
5050
#include "stm32f429-pinctrl.dtsi"
51-
#include <dt-bindings/input/input.h>
5251
#include <dt-bindings/gpio/gpio.h>
52+
#include <dt-bindings/input/input.h>
53+
#include <dt-bindings/leds/common.h>
5354
#include <dt-bindings/media/video-interfaces.h>
5455

5556
/ {
@@ -82,40 +83,24 @@
8283
dma-ranges = <0xc0000000 0x0 0x10000000>;
8384
};
8485

85-
vdda: regulator-vdda {
86-
compatible = "regulator-fixed";
87-
regulator-name = "vdda";
88-
regulator-min-microvolt = <3300000>;
89-
regulator-max-microvolt = <3300000>;
90-
};
91-
92-
vref: regulator-vref {
93-
compatible = "regulator-fixed";
94-
regulator-name = "vref";
95-
regulator-min-microvolt = <3300000>;
96-
regulator-max-microvolt = <3300000>;
97-
};
98-
99-
vdd_panel: vdd-panel {
100-
compatible = "regulator-fixed";
101-
regulator-name = "vdd_panel";
102-
regulator-min-microvolt = <3300000>;
103-
regulator-max-microvolt = <3300000>;
104-
};
105-
10686
leds {
10787
compatible = "gpio-leds";
108-
led-green {
88+
led_green: led-green {
89+
function = LED_FUNCTION_HEARTBEAT;
90+
color = <LED_COLOR_ID_GREEN>;
10991
gpios = <&gpiog 6 1>;
11092
linux,default-trigger = "heartbeat";
11193
};
11294
led-orange {
95+
color = <LED_COLOR_ID_ORANGE>;
11396
gpios = <&gpiog 7 1>;
11497
};
11598
led-red {
99+
color = <LED_COLOR_ID_RED>;
116100
gpios = <&gpiog 10 1>;
117101
};
118102
led-blue {
103+
color = <LED_COLOR_ID_BLUE>;
119104
gpios = <&gpiog 12 1>;
120105
};
121106
};
@@ -135,11 +120,18 @@
135120
};
136121
};
137122

138-
usbotg_hs_phy: usbphy {
139-
#phy-cells = <0>;
140-
compatible = "usb-nop-xceiv";
141-
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(OTGHSULPI)>;
142-
clock-names = "main_clk";
123+
mmc_vcard: mmc_vcard {
124+
compatible = "regulator-fixed";
125+
regulator-name = "mmc_vcard";
126+
regulator-min-microvolt = <3300000>;
127+
regulator-max-microvolt = <3300000>;
128+
};
129+
130+
options {
131+
u-boot {
132+
compatible = "u-boot,config";
133+
boot-led = <&led_green>;
134+
};
143135
};
144136

145137
panel_rgb: panel-rgb {
@@ -153,9 +145,30 @@
153145
};
154146
};
155147

156-
mmc_vcard: mmc_vcard {
148+
vdda: regulator-vdda {
157149
compatible = "regulator-fixed";
158-
regulator-name = "mmc_vcard";
150+
regulator-name = "vdda";
151+
regulator-min-microvolt = <3300000>;
152+
regulator-max-microvolt = <3300000>;
153+
};
154+
155+
vref: regulator-vref {
156+
compatible = "regulator-fixed";
157+
regulator-name = "vref";
158+
regulator-min-microvolt = <3300000>;
159+
regulator-max-microvolt = <3300000>;
160+
};
161+
162+
usbotg_hs_phy: usbphy {
163+
#phy-cells = <0>;
164+
compatible = "usb-nop-xceiv";
165+
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(OTGHSULPI)>;
166+
clock-names = "main_clk";
167+
};
168+
169+
vdd_panel: vdd-panel {
170+
compatible = "regulator-fixed";
171+
regulator-name = "vdd_panel";
159172
regulator-min-microvolt = <3300000>;
160173
regulator-max-microvolt = <3300000>;
161174
};

‎arch/arm/boot/dts/st/stm32746g-eval.dts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "stm32f746-pinctrl.dtsi"
4646
#include <dt-bindings/input/input.h>
4747
#include <dt-bindings/interrupt-controller/irq.h>
48+
#include <dt-bindings/leds/common.h>
4849

4950
/ {
5051
model = "STMicroelectronics STM32746g-EVAL board";
@@ -66,17 +67,22 @@
6667

6768
leds {
6869
compatible = "gpio-leds";
69-
led-green {
70+
led_green: led-green {
71+
function = LED_FUNCTION_HEARTBEAT;
72+
color = <LED_COLOR_ID_GREEN>;
7073
gpios = <&gpiof 10 1>;
7174
linux,default-trigger = "heartbeat";
7275
};
7376
led-orange {
77+
color = <LED_COLOR_ID_ORANGE>;
7478
gpios = <&stmfx_pinctrl 17 1>;
7579
};
7680
led-red {
81+
color = <LED_COLOR_ID_RED>;
7782
gpios = <&gpiob 7 1>;
7883
};
7984
led-blue {
85+
color = <LED_COLOR_ID_BLUE>;
8086
gpios = <&stmfx_pinctrl 19 1>;
8187
};
8288
};
@@ -127,6 +133,13 @@
127133
};
128134
};
129135

136+
options {
137+
u-boot {
138+
compatible = "u-boot,config";
139+
boot-led = <&led_green>;
140+
};
141+
};
142+
130143
usbotg_hs_phy: usb-phy {
131144
#phy-cells = <0>;
132145
compatible = "usb-nop-xceiv";

‎arch/arm/boot/dts/st/stm32f429-disco.dts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@
4848
/dts-v1/;
4949
#include "stm32f429.dtsi"
5050
#include "stm32f429-pinctrl.dtsi"
51+
#include <dt-bindings/gpio/gpio.h>
5152
#include <dt-bindings/input/input.h>
5253
#include <dt-bindings/interrupt-controller/irq.h>
53-
#include <dt-bindings/gpio/gpio.h>
54+
#include <dt-bindings/leds/common.h>
5455

5556
/ {
5657
model = "STMicroelectronics STM32F429i-DISCO board";
@@ -73,9 +74,12 @@
7374
leds {
7475
compatible = "gpio-leds";
7576
led-red {
77+
color = <LED_COLOR_ID_RED>;
7678
gpios = <&gpiog 14 0>;
7779
};
78-
led-green {
80+
led_green: led-green {
81+
function = LED_FUNCTION_HEARTBEAT;
82+
color = <LED_COLOR_ID_GREEN>;
7983
gpios = <&gpiog 13 0>;
8084
linux,default-trigger = "heartbeat";
8185
};
@@ -91,6 +95,13 @@
9195
};
9296
};
9397

98+
options {
99+
u-boot {
100+
compatible = "u-boot,config";
101+
boot-led = <&led_green>;
102+
};
103+
};
104+
94105
/* This turns on vbus for otg for host mode (dwc2) */
95106
vcc5v_otg: vcc5v-otg-regulator {
96107
compatible = "regulator-fixed";

‎arch/arm/boot/dts/st/stm32f469-disco.dts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include "stm32f469-pinctrl.dtsi"
5151
#include <dt-bindings/gpio/gpio.h>
5252
#include <dt-bindings/input/input.h>
53+
#include <dt-bindings/leds/common.h>
5354

5455
/ {
5556
model = "STMicroelectronics STM32F469i-DISCO board";
@@ -82,17 +83,22 @@
8283

8384
leds {
8485
compatible = "gpio-leds";
85-
led-green {
86+
led_green: led-green {
87+
function = LED_FUNCTION_HEARTBEAT;
88+
color = <LED_COLOR_ID_GREEN>;
8689
gpios = <&gpiog 6 GPIO_ACTIVE_LOW>;
8790
linux,default-trigger = "heartbeat";
8891
};
8992
led-orange {
93+
color = <LED_COLOR_ID_ORANGE>;
9094
gpios = <&gpiod 4 GPIO_ACTIVE_LOW>;
9195
};
9296
led-red {
97+
color = <LED_COLOR_ID_RED>;
9398
gpios = <&gpiod 5 GPIO_ACTIVE_LOW>;
9499
};
95100
led-blue {
101+
color = <LED_COLOR_ID_BLUE>;
96102
gpios = <&gpiok 3 GPIO_ACTIVE_LOW>;
97103
};
98104
};
@@ -107,6 +113,13 @@
107113
};
108114
};
109115

116+
options {
117+
u-boot {
118+
compatible = "u-boot,config";
119+
boot-led = <&led_green>;
120+
};
121+
};
122+
110123
/* This turns on vbus for otg for host mode (dwc2) */
111124
vcc5v_otg: vcc5v-otg-regulator {
112125
compatible = "regulator-fixed";

‎arch/arm/boot/dts/st/stm32f746-disco.dts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include <dt-bindings/gpio/gpio.h>
4747
#include <dt-bindings/input/input.h>
4848
#include <dt-bindings/interrupt-controller/irq.h>
49+
#include <dt-bindings/leds/common.h>
4950

5051
/ {
5152
model = "STMicroelectronics STM32F746-DISCO board";
@@ -80,7 +81,9 @@
8081

8182
leds {
8283
compatible = "gpio-leds";
83-
led-usr {
84+
led_usr: led-usr {
85+
function = LED_FUNCTION_HEARTBEAT;
86+
color = <LED_COLOR_ID_GREEN>;
8487
gpios = <&gpioi 1 GPIO_ACTIVE_HIGH>;
8588
linux,default-trigger = "heartbeat";
8689
};
@@ -96,6 +99,13 @@
9699
};
97100
};
98101

102+
options {
103+
u-boot {
104+
compatible = "u-boot,config";
105+
boot-led = <&led_usr>;
106+
};
107+
};
108+
99109
usbotg_hs_phy: usb-phy {
100110
#phy-cells = <0>;
101111
compatible = "usb-nop-xceiv";

‎arch/arm/boot/dts/st/stm32f769-disco.dts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "stm32f769-pinctrl.dtsi"
4646
#include <dt-bindings/input/input.h>
4747
#include <dt-bindings/gpio/gpio.h>
48+
#include <dt-bindings/leds/common.h>
4849

4950
/ {
5051
model = "STMicroelectronics STM32F769-DISCO board";
@@ -79,14 +80,18 @@
7980

8081
leds {
8182
compatible = "gpio-leds";
82-
led-usr2 {
83+
led_usr2: led-usr2 {
84+
function = LED_FUNCTION_HEARTBEAT;
85+
color = <LED_COLOR_ID_GREEN>;
8386
gpios = <&gpioj 5 GPIO_ACTIVE_HIGH>;
8487
linux,default-trigger = "heartbeat";
8588
};
8689
led-usr1 {
90+
color = <LED_COLOR_ID_RED>;
8791
gpios = <&gpioj 13 GPIO_ACTIVE_HIGH>;
8892
};
8993
led-usr3 {
94+
color = <LED_COLOR_ID_GREEN>;
9095
gpios = <&gpioa 12 GPIO_ACTIVE_HIGH>;
9196
};
9297
};
@@ -101,6 +106,13 @@
101106
};
102107
};
103108

109+
options {
110+
u-boot {
111+
compatible = "u-boot,config";
112+
boot-led = <&led_usr2>;
113+
};
114+
};
115+
104116
usbotg_hs_phy: usb-phy {
105117
#phy-cells = <0>;
106118
compatible = "usb-nop-xceiv";

0 commit comments

Comments
 (0)