mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 00:53:34 +02:00
STM32 DT for v6.19, round 1
Highlights:
-----------
- MPU:
- STM32MP13:
- Add and enable the ARM SMC watchdog to use IWDG1 in the secure
world.
- STMP32MP15:
- Phytec SOM: Fix STMPE811 touchscreen
- LXA: drop unnecessary vusb_d/a-supply as already defined by
"phy-supply" and "vdda1v8-supply".
- STM32MP23:
- Use the RIFSC as an access controler (firewall) as it is done
for STM32MP25 and STM32MP23.
- STM32MP25:
- Add OSPI memory region name.
- Add I/O synchronization properties to satisfy RGMII
specification.
-----BEGIN PGP SIGNATURE-----
iQJRBAABCgA7FiEEctl9+nxzUSUqdELdf5rJavIecIUFAmkcLpIdHGFsZXhhbmRy
ZS50b3JndWVAZm9zcy5zdC5jb20ACgkQf5rJavIecIW6nw/6A/PBU5C/oRIRv/ZP
CDbmq9mI0g1pkFiXA8nlPgiKE1VF+1xl8cmqKAfl0ntKg4m3zzeVjaVlnNPKUP9J
6C6SDXWaJrGweLc4rOyrFdBgyv8D6NSZvbC6/8yFOy+Yj5ls9LDVpjDpA+1TUnxz
s6B1YS/mrNcyq1jUpCmCjGdA1vtK2/kPxweENXqjMELpRO/X5bUYj5xxTZtDK0aC
FDwW36CCppoHVGES4Gu/5TKhhNsl/qlEgTLf/f3aDbJh3LsowpYdOcTUilOl2cCE
Ms20Y3cYLOMsTkK9idsOboQgJxalVVuLZ/mGL+BIWxoWp+y/IAdk3WTHvkFcUCqU
N1U4CqDCp+3TYmXNiedcClghQsJb5zmwh6kGGE9gMU1BhOWW873qNN+X6VOXszrl
CTCsx9ybXa0xcsy+ne+YOLKxa0rkKRpCg7SfirmZ5IobhNXLRfw7VpLk9asAr1qk
5aJdek+sdFIgQiuXGY1ZiSmcH1lTiQtWOH6Zy2Hy96lFs6NYvfOihJZn4T9cfMHi
RYyzWN11IdUbh3eaSuYb9bJoxH9SlziboXnln2LruRa73vtxvmw84CFIk2q0pVS/
hARQ9b67l7ktWCWkcGWr65H3tF93YivhOBIKm9SYjxMctoV4rX/gOPRMDV3At6As
sLWxeA/sy5Y4Ul10H+LKYQexFhs=
=iYLR
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmkgw1YACgkQmmx57+YA
GNnLoQ//eRHBSHu1OZ91nDtsGE3G3msy5mrpqVjM6jvanK5TU1KI1h1n/TRUfK4v
n7vCELIAuImjrYUFu0HtbKZ2axdRcnlAS7Jj2KD21SdT8gXG/C4dor5gvdZe7dYH
ArFusLEV0NeG/6kMUs84J1Rh1u77TfnNi7+wQtSuhu9RV/0qL91Mtpom3NlzZOzS
7iIh1IK4RtoiJWbnj+LUFMdTke2kLb6Y+n2IDGyEoSPBWUjmsnyhk7EJtnN/t2JZ
CpjNFYgaqQvtA5dBIwGnaL2V8Trt9v65XfbOorH6dmm1v4BhpU3O/SN3d/nA9/et
NYnQSavU4yr/isrhvJsys2lKTFk34xpbVe4+Derkt5+aONWy0/BBL1D2rmQwAor0
bYpqK2WfoJ6O0XWMLGqHbYi4KsZqIFn/Gak6xRaxsdEMfJDMCqT/v/uu6MjNGioY
8EJTdzn5Y5K2syObQ/XknF2/2WPubY+ftjBFh2WUoL39JIn5nzeDuyH1XXirQ2Sp
2d4/D9uai/SAGVderH/5a1NyOr9B9gTr4gneWIdvTWYFeYQdk49BNwe4+DND40XD
8ey2XLL0aEfpeQNc5Q5P2wuaFMsqMI4lvQF/hCkfVdSmY1am7x9FuWjM8VwuHeg9
w/jv7RB39pQCobr5BhlOOKY+NX76MMf74Hd9iS8RQNQBGpgVFi8=
=dzuB
-----END PGP SIGNATURE-----
Merge tag 'stm32-dt-for-v6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into soc/dt
STM32 DT for v6.19, round 1
Highlights:
-----------
- MPU:
- STM32MP13:
- Add and enable the ARM SMC watchdog to use IWDG1 in the secure
world.
- STMP32MP15:
- Phytec SOM: Fix STMPE811 touchscreen
- LXA: drop unnecessary vusb_d/a-supply as already defined by
"phy-supply" and "vdda1v8-supply".
- STM32MP23:
- Use the RIFSC as an access controler (firewall) as it is done
for STM32MP25 and STM32MP23.
- STM32MP25:
- Add OSPI memory region name.
- Add I/O synchronization properties to satisfy RGMII
specification.
* tag 'stm32-dt-for-v6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
arm64: dts: st: set RIFSC as an access controller on stm32mp21x platforms
ARM: dts: stm32: add the IWDG2 interrupt line in stm32mp131.dtsi
ARM: dts: stm32: enable the ARM SMC watchdog node in stm32mp135f-dk
ARM: dts: stm32: add the ARM SMC watchdog in stm32mp131.dtsi
ARM: dts: stm32: add iwdg1 node in stm32mp131.dtsi
arm64: dts: st: Add I/O sync to eth pinctrl in stm32mp25-pinctrl.dtsi
arm64: dts: st: Add memory-region-names property for stm32mp257f-ev1
ARM: dts: stm32: lxa: drop unnecessary vusb_d/a-supply
ARM: dts: stm32: stm32mp157c-phycore: Fix STMPE811 touchscreen node properties
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
5733ad88a5
|
|
@ -29,6 +29,12 @@ arm-pmu {
|
|||
interrupt-parent = <&intc>;
|
||||
};
|
||||
|
||||
arm_wdt: watchdog {
|
||||
compatible = "arm,smc-wdt";
|
||||
arm,smc-id = <0xbc000000>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
firmware {
|
||||
optee {
|
||||
method = "smc";
|
||||
|
|
@ -1000,6 +1006,7 @@ usbh_ehci: usb@5800d000 {
|
|||
iwdg2: watchdog@5a002000 {
|
||||
compatible = "st,stm32mp1-iwdg";
|
||||
reg = <0x5a002000 0x400>;
|
||||
interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&rcc IWDG2>, <&scmi_clk CK_SCMI_LSI>;
|
||||
clock-names = "pclk", "lsi";
|
||||
status = "disabled";
|
||||
|
|
@ -1657,6 +1664,16 @@ usbphyc_port1: usb-phy@1 {
|
|||
reg = <1>;
|
||||
};
|
||||
};
|
||||
|
||||
iwdg1: watchdog@5c003000 {
|
||||
compatible = "st,stm32mp1-iwdg";
|
||||
reg = <0x5c003000 0x400>;
|
||||
interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&rcc IWDG1>, <&scmi_clk CK_SCMI_LSI>;
|
||||
clock-names = "pclk", "lsi";
|
||||
access-controllers = <&etzpc 12>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -161,6 +161,11 @@ channel@12 {
|
|||
};
|
||||
};
|
||||
|
||||
&arm_wdt {
|
||||
timeout-sec = <32>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&crc1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -374,9 +374,6 @@ &usbotg_hs {
|
|||
phys = <&usbphyc_port1 0>;
|
||||
phy-names = "usb2-phy";
|
||||
|
||||
vusb_d-supply = <&vdd_usb>;
|
||||
vusb_a-supply = <®18>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -185,13 +185,13 @@ touch@44 {
|
|||
interrupt-parent = <&gpioi>;
|
||||
vio-supply = <&v3v3>;
|
||||
vcc-supply = <&v3v3>;
|
||||
st,sample-time = <4>;
|
||||
st,mod-12b = <1>;
|
||||
st,ref-sel = <0>;
|
||||
st,adc-freq = <1>;
|
||||
|
||||
touchscreen {
|
||||
compatible = "st,stmpe-ts";
|
||||
st,sample-time = <4>;
|
||||
st,mod-12b = <1>;
|
||||
st,ref-sel = <0>;
|
||||
st,adc-freq = <1>;
|
||||
st,ave-ctrl = <1>;
|
||||
st,touch-det-delay = <2>;
|
||||
st,settling = <2>;
|
||||
|
|
|
|||
|
|
@ -493,9 +493,6 @@ &usbotg_hs {
|
|||
phys = <&usbphyc_port1 0>;
|
||||
phy-names = "usb2-phy";
|
||||
|
||||
vusb_d-supply = <&vdd_usb>;
|
||||
vusb_a-supply = <®18>;
|
||||
|
||||
g-rx-fifo-size = <512>;
|
||||
g-np-tx-fifo-size = <32>;
|
||||
g-tx-fifo-size = <128 128 64 16 16 16 16 16>;
|
||||
|
|
|
|||
|
|
@ -94,18 +94,20 @@ soc@0 {
|
|||
#size-cells = <2>;
|
||||
|
||||
rifsc: bus@42080000 {
|
||||
compatible = "simple-bus";
|
||||
compatible = "st,stm32mp21-rifsc", "simple-bus";
|
||||
reg = <0x42080000 0x0 0x1000>;
|
||||
ranges;
|
||||
dma-ranges;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <2>;
|
||||
#access-controller-cells = <1>;
|
||||
|
||||
usart2: serial@400e0000 {
|
||||
compatible = "st,stm32h7-uart";
|
||||
reg = <0x400e0000 0x0 0x400>;
|
||||
interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&ck_flexgen_08>;
|
||||
access-controllers = <&rifsc 32>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ pins1 {
|
|||
bias-disable;
|
||||
drive-push-pull;
|
||||
slew-rate = <3>;
|
||||
st,io-sync = "data on both edges";
|
||||
};
|
||||
pins2 {
|
||||
pinmux = <STM32_PINMUX('H', 9, AF10)>, /* ETH_RGMII_CLK125 */
|
||||
|
|
@ -53,6 +54,7 @@ pins3 {
|
|||
<STM32_PINMUX('H', 13, AF10)>, /* ETH_RGMII_RXD3 */
|
||||
<STM32_PINMUX('A', 11, AF10)>; /* ETH_RGMII_RX_CTL */
|
||||
bias-disable;
|
||||
st,io-sync = "data on both edges";
|
||||
};
|
||||
pins4 {
|
||||
pinmux = <STM32_PINMUX('A', 14, AF10)>; /* ETH_RGMII_RX_CLK */
|
||||
|
|
@ -142,6 +144,7 @@ pins1 {
|
|||
bias-disable;
|
||||
drive-push-pull;
|
||||
slew-rate = <3>;
|
||||
st,io-sync = "data on both edges";
|
||||
};
|
||||
pins2 {
|
||||
pinmux = <STM32_PINMUX('F', 8, AF10)>, /* ETH_RGMII_CLK125 */
|
||||
|
|
@ -164,6 +167,7 @@ pins4 {
|
|||
<STM32_PINMUX('C', 11, AF10)>, /* ETH_RGMII_RXD3 */
|
||||
<STM32_PINMUX('C', 3, AF10)>; /* ETH_RGMII_RX_CTL */
|
||||
bias-disable;
|
||||
st,io-sync = "data on both edges";
|
||||
};
|
||||
pins5 {
|
||||
pinmux = <STM32_PINMUX('F', 6, AF10)>; /* ETH_RGMII_RX_CLK */
|
||||
|
|
|
|||
|
|
@ -266,6 +266,7 @@ &i2c8 {
|
|||
|
||||
&ommanager {
|
||||
memory-region = <&mm_ospi1>;
|
||||
memory-region-names = "ospi1";
|
||||
pinctrl-0 = <&ospi_port1_clk_pins_a
|
||||
&ospi_port1_io03_pins_a
|
||||
&ospi_port1_cs0_pins_a>;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user