Skip to content

L
linux
Commit ab782206 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

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

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

STM32 DT updates for v5.5, round 1

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

MPU part:
 -Add and enable ADC support on stm32mp157a-dk1
 -Add DAC support on stm32mp157c-ed1
 -Add and enable VREFBUF support on stm32mp157a-dk1
 -Add focaltech touchscreen on stm32mp157c-dk2
 -Add hdmi support on stm32mp157a-dk1
 -Fix issues seen during YAML DT validation
 -Fix regulators issues for all MPU boards

MCU part:
 -Fix issues seen during YAML DT validation

* tag 'stm32-dt-for-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: remove useless dma-ranges property for stm32f469
  ARM: dts: stm32: remove useless dma-ranges property for stm32f429
  ARM: dts: stm32: disable active-discharge for vbus_otg on stm32mp157a-avenger96
  ARM: dts: stm32: Fix active discharge usage on stm32mp157
  ARM: dts: stm32: change default minimal buck1 value on stm32mp157
  ARM: dts: stm32: add PWR regulators support on stm32mp157
  ARM: dts: stm32: remove useless interrupt from dsi node for stm32f469
  ARM: dts: stm32: add hdmi audio support to stm32mp157a-dk1 board
  ARM: dts: stm32: Add DAC support to stm32mp157c-ed1
  ARM: dts: stm32: Add DAC pins used on stm32mp157c-ed1
  ARM: dts: stm32: fix regulator-sd_switch node on stm32mp157c-ed1 board
  ARM: dts: stm32: remove usb phy-names entries on stm32mp157c-ev1
  ARM: dts: stm32: fix joystick node on stm32f746 and stm32mp157c eval boards
  ARM: dts: stm32: fix memory nodes to match with DT validation tool
  ARM: dts: stm32: add focaltech touchscreen on stm32mp157c-dk2 board
  ARM: dts: stm32: enable ADC support on stm32mp157a-dk1
  ARM: dts: stm32: add ADC pins used on stm32mp157a-dk1
  ARM: dts: stm32: Enable VREFBUF on stm32mp157a-dk1
  ARM: dts: stm32: move ltdc pinctrl on stm32mp157a dk1 board

Link: https://lore.kernel.org/r/02c39510-f36d-abbb-c76f-49aff07c0a08@st.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 49067a8a c34cbe24
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 50 deletions
arch/arm/boot/dts/stm32429i-eval.dts
View file @ ab782206
...@@ -60,7 +60,7 @@ chosen { ...@@ -60,7 +60,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@00000000 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x2000000>; reg = <0x00000000 0x2000000>;
}; };
...@@ -234,7 +234,6 @@ &ltdc { ...@@ -234,7 +234,6 @@ &ltdc {
status = "okay"; status = "okay";
pinctrl-0 = <&ltdc_pins>; pinctrl-0 = <&ltdc_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
dma-ranges;
port { port {
ltdc_out_rgb: endpoint { ltdc_out_rgb: endpoint {
......
arch/arm/boot/dts/stm32746g-eval.dts
View file @ ab782206
...@@ -55,7 +55,7 @@ chosen { ...@@ -55,7 +55,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@c0000000 {
device_type = "memory"; device_type = "memory";
reg = <0xc0000000 0x2000000>; reg = <0xc0000000 0x2000000>;
}; };
...@@ -95,7 +95,6 @@ button@0 { ...@@ -95,7 +95,6 @@ button@0 {
joystick { joystick {
compatible = "gpio-keys"; compatible = "gpio-keys";
#size-cells = <0>;
pinctrl-0 = <&joystick_pins>; pinctrl-0 = <&joystick_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
button-0 { button-0 {
......
arch/arm/boot/dts/stm32f429-disco.dts
View file @ ab782206
...@@ -59,7 +59,7 @@ chosen { ...@@ -59,7 +59,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@90000000 {
device_type = "memory"; device_type = "memory";
reg = <0x90000000 0x800000>; reg = <0x90000000 0x800000>;
}; };
......
arch/arm/boot/dts/stm32f469-disco.dts
View file @ ab782206
...@@ -60,7 +60,7 @@ chosen { ...@@ -60,7 +60,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@00000000 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x1000000>; reg = <0x00000000 0x1000000>;
}; };
...@@ -166,7 +166,6 @@ dsi_panel_in: endpoint { ...@@ -166,7 +166,6 @@ dsi_panel_in: endpoint {
}; };
&ltdc { &ltdc {
dma-ranges;
status = "okay"; status = "okay";
port { port {
......
arch/arm/boot/dts/stm32f469.dtsi
View file @ ab782206
...@@ -8,7 +8,6 @@ soc { ...@@ -8,7 +8,6 @@ soc {
dsi: dsi@40016c00 { dsi: dsi@40016c00 {
compatible = "st,stm32-dsi"; compatible = "st,stm32-dsi";
reg = <0x40016c00 0x800>; reg = <0x40016c00 0x800>;
interrupts = <92>;
resets = <&rcc STM32F4_APB2_RESET(DSI)>; resets = <&rcc STM32F4_APB2_RESET(DSI)>;
reset-names = "apb"; reset-names = "apb";
clocks = <&rcc 1 CLK_F469_DSI>, <&clk_hse>; clocks = <&rcc 1 CLK_F469_DSI>, <&clk_hse>;
......
arch/arm/boot/dts/stm32f746-disco.dts
View file @ ab782206
...@@ -55,7 +55,7 @@ chosen { ...@@ -55,7 +55,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@c0000000 {
device_type = "memory"; device_type = "memory";
reg = <0xC0000000 0x800000>; reg = <0xC0000000 0x800000>;
}; };
......
arch/arm/boot/dts/stm32f769-disco.dts
View file @ ab782206
...@@ -55,7 +55,7 @@ chosen { ...@@ -55,7 +55,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@c0000000 {
device_type = "memory"; device_type = "memory";
reg = <0xC0000000 0x1000000>; reg = <0xC0000000 0x1000000>;
}; };
......
arch/arm/boot/dts/stm32h743i-disco.dts
View file @ ab782206
...@@ -53,7 +53,7 @@ chosen { ...@@ -53,7 +53,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@d0000000 {
device_type = "memory"; device_type = "memory";
reg = <0xd0000000 0x2000000>; reg = <0xd0000000 0x2000000>;
}; };
......
arch/arm/boot/dts/stm32h743i-eval.dts
View file @ ab782206
...@@ -53,7 +53,7 @@ chosen { ...@@ -53,7 +53,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@d0000000 {
device_type = "memory"; device_type = "memory";
reg = <0xd0000000 0x2000000>; reg = <0xd0000000 0x2000000>;
}; };
......
arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
View file @ ab782206
...@@ -137,6 +137,22 @@ gpiok: gpio@5000c000 { ...@@ -137,6 +137,22 @@ gpiok: gpio@5000c000 {
status = "disabled"; status = "disabled";
}; };
adc12_ain_pins_a: adc12-ain-0 {
pins {
pinmux = <STM32_PINMUX('C', 3, ANALOG)>, /* ADC1 in13 */
<STM32_PINMUX('F', 12, ANALOG)>, /* ADC1 in6 */
<STM32_PINMUX('F', 13, ANALOG)>, /* ADC2 in2 */
<STM32_PINMUX('F', 14, ANALOG)>; /* ADC2 in6 */
};
};
adc12_usb_cc_pins_a: adc12-usb-cc-pins-0 {
pins {
pinmux = <STM32_PINMUX('A', 4, ANALOG)>, /* ADC12 in18 */
<STM32_PINMUX('A', 5, ANALOG)>; /* ADC12 in19 */
};
};
cec_pins_a: cec-0 { cec_pins_a: cec-0 {
pins { pins {
pinmux = <STM32_PINMUX('A', 15, AF4)>; pinmux = <STM32_PINMUX('A', 15, AF4)>;
...@@ -167,6 +183,18 @@ pins { ...@@ -167,6 +183,18 @@ pins {
}; };
}; };
dac_ch1_pins_a: dac-ch1 {
pins {
pinmux = <STM32_PINMUX('A', 4, ANALOG)>;
};
};
dac_ch2_pins_a: dac-ch2 {
pins {
pinmux = <STM32_PINMUX('A', 5, ANALOG)>;
};
};
dcmi_pins_a: dcmi-0 { dcmi_pins_a: dcmi-0 {
pins { pins {
pinmux = <STM32_PINMUX('H', 8, AF13)>,/* DCMI_HSYNC */ pinmux = <STM32_PINMUX('H', 8, AF13)>,/* DCMI_HSYNC */
......
arch/arm/boot/dts/stm32mp157a-avenger96.dts
View file @ ab782206
...@@ -252,14 +252,13 @@ vbus_otg: pwr_sw1 { ...@@ -252,14 +252,13 @@ vbus_otg: pwr_sw1 {
regulator-name = "vbus_otg"; regulator-name = "vbus_otg";
interrupts = <IT_OCP_OTG 0>; interrupts = <IT_OCP_OTG 0>;
interrupt-parent = <&pmic>; interrupt-parent = <&pmic>;
regulator-active-discharge;
}; };
vbus_sw: pwr_sw2 { vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw"; regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>; interrupts = <IT_OCP_SWOUT 0>;
interrupt-parent = <&pmic>; interrupt-parent = <&pmic>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
}; };
...@@ -282,6 +281,11 @@ &iwdg2 { ...@@ -282,6 +281,11 @@ &iwdg2 {
status = "okay"; status = "okay";
}; };
&pwr_regulators {
vdd-supply = <&vdd>;
vdd_3v3_usbfs-supply = <&vdd_usb>;
};
&rng1 { &rng1 {
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/stm32mp157a-dk1.dts
View file @ ab782206
...@@ -25,6 +25,7 @@ chosen { ...@@ -25,6 +25,7 @@ chosen {
}; };
memory@c0000000 { memory@c0000000 {
device_type = "memory";
reg = <0xc0000000 0x20000000>; reg = <0xc0000000 0x20000000>;
}; };
...@@ -92,7 +93,34 @@ sound { ...@@ -92,7 +93,34 @@ sound {
"Playback" , "MCLK", "Playback" , "MCLK",
"Capture" , "MCLK", "Capture" , "MCLK",
"MICL" , "Mic Bias"; "MICL" , "Mic Bias";
dais = <&sai2a_port &sai2b_port>; dais = <&sai2a_port &sai2b_port &i2s2_port>;
status = "okay";
};
};
&adc {
pinctrl-names = "default";
pinctrl-0 = <&adc12_ain_pins_a>, <&adc12_usb_cc_pins_a>;
vdd-supply = <&vdd>;
vdda-supply = <&vdd>;
vref-supply = <&vrefbuf>;
status = "disabled";
adc1: adc@0 {
/*
* Type-C USB_PWR_CC1 & USB_PWR_CC2 on in18 & in19.
* Use at least 5 * RC time, e.g. 5 * (Rp + Rd) * C:
* 5 * (56 + 47kOhms) * 5pF => 2.5us.
* Use arbitrary margin here (e.g. 5us).
*/
st,min-sample-time-nsecs = <5000>;
/* AIN connector, USB Type-C CC1 & CC2 */
st,adc-channels = <0 1 6 13 18 19>;
status = "okay";
};
adc2: adc@100 {
/* AIN connector, USB Type-C CC1 & CC2 */
st,adc-channels = <0 1 2 6 18 19>;
st,min-sample-time-nsecs = <5000>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -146,9 +174,7 @@ hdmi-transmitter@39 { ...@@ -146,9 +174,7 @@ hdmi-transmitter@39 {
reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>; reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>;
interrupts = <1 IRQ_TYPE_EDGE_FALLING>; interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
interrupt-parent = <&gpiog>; interrupt-parent = <&gpiog>;
pinctrl-names = "default", "sleep"; #sound-dai-cells = <0>;
pinctrl-0 = <&ltdc_pins_a>;
pinctrl-1 = <&ltdc_pins_sleep_a>;
status = "okay"; status = "okay";
ports { ports {
...@@ -161,6 +187,13 @@ sii9022_in: endpoint { ...@@ -161,6 +187,13 @@ sii9022_in: endpoint {
remote-endpoint = <&ltdc_ep0_out>; remote-endpoint = <&ltdc_ep0_out>;
}; };
}; };
port@3 {
reg = <3>;
sii9022_tx_endpoint: endpoint {
remote-endpoint = <&i2s2_endpoint>;
};
};
}; };
}; };
...@@ -226,7 +259,7 @@ regulators { ...@@ -226,7 +259,7 @@ regulators {
vddcore: buck1 { vddcore: buck1 {
regulator-name = "vddcore"; regulator-name = "vddcore";
regulator-min-microvolt = <800000>; regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1350000>; regulator-max-microvolt = <1350000>;
regulator-always-on; regulator-always-on;
regulator-initial-mode = <0>; regulator-initial-mode = <0>;
...@@ -327,7 +360,7 @@ vbus_otg: pwr_sw1 { ...@@ -327,7 +360,7 @@ vbus_otg: pwr_sw1 {
vbus_sw: pwr_sw2 { vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw"; regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>; interrupts = <IT_OCP_SWOUT 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
}; };
...@@ -346,6 +379,23 @@ watchdog { ...@@ -346,6 +379,23 @@ watchdog {
}; };
}; };
&i2s2 {
clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>;
clock-names = "pclk", "i2sclk", "x8k", "x11k";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2s2_pins_a>;
pinctrl-1 = <&i2s2_pins_sleep_a>;
status = "okay";
i2s2_port: port {
i2s2_endpoint: endpoint {
remote-endpoint = <&sii9022_tx_endpoint>;
format = "i2s";
mclk-fs = <256>;
};
};
};
&ipcc { &ipcc {
status = "okay"; status = "okay";
}; };
...@@ -356,6 +406,9 @@ &iwdg2 { ...@@ -356,6 +406,9 @@ &iwdg2 {
}; };
&ltdc { &ltdc {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&ltdc_pins_a>;
pinctrl-1 = <&ltdc_pins_sleep_a>;
status = "okay"; status = "okay";
port { port {
...@@ -379,6 +432,11 @@ &m4_rproc { ...@@ -379,6 +432,11 @@ &m4_rproc {
status = "okay"; status = "okay";
}; };
&pwr_regulators {
vdd-supply = <&vdd>;
vdd_3v3_usbfs-supply = <&vdd_usb>;
};
&rng1 { &rng1 {
status = "okay"; status = "okay";
}; };
...@@ -449,3 +507,10 @@ &uart4 { ...@@ -449,3 +507,10 @@ &uart4 {
pinctrl-0 = <&uart4_pins_a>; pinctrl-0 = <&uart4_pins_a>;
status = "okay"; status = "okay";
}; };
&vrefbuf {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
vdda-supply = <&vdd>;
status = "okay";
};
arch/arm/boot/dts/stm32mp157c-dk2.dts
View file @ ab782206
...@@ -11,14 +11,6 @@ ...@@ -11,14 +11,6 @@
/ { / {
model = "STMicroelectronics STM32MP157C-DK2 Discovery Board"; model = "STMicroelectronics STM32MP157C-DK2 Discovery Board";
compatible = "st,stm32mp157c-dk2", "st,stm32mp157"; compatible = "st,stm32mp157c-dk2", "st,stm32mp157";
reg18: reg18 {
compatible = "regulator-fixed";
regulator-name = "reg18";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
}; };
&dsi { &dsi {
...@@ -61,6 +53,19 @@ panel_in: endpoint { ...@@ -61,6 +53,19 @@ panel_in: endpoint {
}; };
}; };
&i2c1 {
touchscreen@38 {
compatible = "focaltech,ft6236";
reg = <0x38>;
interrupts = <2 2>;
interrupt-parent = <&gpiof>;
interrupt-controller;
touchscreen-size-x = <480>;
touchscreen-size-y = <800>;
status = "okay";
};
};
&ltdc { &ltdc {
status = "okay"; status = "okay";
......
arch/arm/boot/dts/stm32mp157c-ed1.dts
View file @ ab782206
...@@ -74,22 +74,6 @@ aliases { ...@@ -74,22 +74,6 @@ aliases {
serial0 = &uart4; serial0 = &uart4;
}; };
reg11: reg11 {
compatible = "regulator-fixed";
regulator-name = "reg11";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
regulator-always-on;
};
reg18: reg18 {
compatible = "regulator-fixed";
regulator-name = "reg18";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
sd_switch: regulator-sd_switch { sd_switch: regulator-sd_switch {
compatible = "regulator-gpio"; compatible = "regulator-gpio";
regulator-name = "sd_switch"; regulator-name = "sd_switch";
...@@ -100,7 +84,21 @@ sd_switch: regulator-sd_switch { ...@@ -100,7 +84,21 @@ sd_switch: regulator-sd_switch {
gpios = <&gpiof 14 GPIO_ACTIVE_HIGH>; gpios = <&gpiof 14 GPIO_ACTIVE_HIGH>;
gpios-states = <0>; gpios-states = <0>;
states = <1800000 0x1 2900000 0x0>; states = <1800000 0x1>,
<2900000 0x0>;
};
};
&dac {
pinctrl-names = "default";
pinctrl-0 = <&dac_ch1_pins_a &dac_ch2_pins_a>;
vref-supply = <&vdda>;
status = "disabled";
dac1: dac@1 {
status = "okay";
};
dac2: dac@2 {
status = "okay";
}; };
}; };
...@@ -143,7 +141,7 @@ regulators { ...@@ -143,7 +141,7 @@ regulators {
vddcore: buck1 { vddcore: buck1 {
regulator-name = "vddcore"; regulator-name = "vddcore";
regulator-min-microvolt = <800000>; regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1350000>; regulator-max-microvolt = <1350000>;
regulator-always-on; regulator-always-on;
regulator-initial-mode = <0>; regulator-initial-mode = <0>;
...@@ -241,7 +239,7 @@ vbus_otg: pwr_sw1 { ...@@ -241,7 +239,7 @@ vbus_otg: pwr_sw1 {
vbus_sw: pwr_sw2 { vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw"; regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>; interrupts = <IT_OCP_SWOUT 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
}; };
...@@ -279,6 +277,11 @@ &m4_rproc { ...@@ -279,6 +277,11 @@ &m4_rproc {
status = "okay"; status = "okay";
}; };
&pwr_regulators {
vdd-supply = <&vdd>;
vdd_3v3_usbfs-supply = <&vdd_usb>;
};
&rng1 { &rng1 {
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/stm32mp157c-ev1.dts
View file @ ab782206
...@@ -32,7 +32,6 @@ clk_ext_camera: clk-ext-camera { ...@@ -32,7 +32,6 @@ clk_ext_camera: clk-ext-camera {
joystick { joystick {
compatible = "gpio-keys"; compatible = "gpio-keys";
#size-cells = <0>;
pinctrl-0 = <&joystick_pins>; pinctrl-0 = <&joystick_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
button-0 { button-0 {
...@@ -344,14 +343,12 @@ timer@11 { ...@@ -344,14 +343,12 @@ timer@11 {
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>; phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
&usbotg_hs { &usbotg_hs {
dr_mode = "peripheral"; dr_mode = "peripheral";
phys = <&usbphyc_port1 0>; phys = <&usbphyc_port1 0>;
phy-names = "usb2-phy";
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/stm32mp157c.dtsi
View file @ ab782206
...@@ -1079,6 +1079,29 @@ rcc: rcc@50000000 { ...@@ -1079,6 +1079,29 @@ rcc: rcc@50000000 {
#reset-cells = <1>; #reset-cells = <1>;
}; };
pwr_regulators: pwr@50001000 {
compatible = "st,stm32mp1,pwr-reg";
reg = <0x50001000 0x10>;
reg11: reg11 {
regulator-name = "reg11";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
};
reg18: reg18 {
regulator-name = "reg18";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
usb33: usb33 {
regulator-name = "usb33";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
};
exti: interrupt-controller@5000d000 { exti: interrupt-controller@5000d000 {
compatible = "st,stm32mp1-exti", "syscon"; compatible = "st,stm32mp1-exti", "syscon";
interrupt-controller; interrupt-controller;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7