andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(fdts stm32mp1): align DT with latest kernel 

Update STM32MP1 device tree files with kernel 5.15.

Change-Id: Id405a79e18c61e80cd2292a4f87b7b9641df9c82
Signed-off-by: Yann Gautier <yann.gautier@st.com>
This commit is contained in:
Yann Gautier 2021-10-20 17:22:32 +02:00
parent 292bb9a768
commit e8a953a9b8
12 changed files with 110 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdts/stm32mp15-bl2.dtsi
View File

@ -22,10 +22,6 @@
/delete-node/ stgen@5c008000; /delete-node/ stgen@5c008000;
/delete-node/ i2c@5c009000; /delete-node/ i2c@5c009000;
/delete-node/ tamp@5c00a000; /delete-node/ tamp@5c00a000;
pin-controller@50002000 {
/delete-node/ rtc-out2-rmp-pins-0;
};
}; };
#if !STM32MP_USE_STM32IMAGE #if !STM32MP_USE_STM32IMAGE

6
fdts/stm32mp15-bl32.dtsi
View File

@ -20,8 +20,8 @@
/delete-node/ hash@54002000; /delete-node/ hash@54002000;
/delete-node/ memory-controller@58002000; /delete-node/ memory-controller@58002000;
/delete-node/ spi@58003000; /delete-node/ spi@58003000;
/delete-node/ sdmmc@58005000; /delete-node/ mmc@58005000;
/delete-node/ sdmmc@58007000; /delete-node/ mmc@58007000;
/delete-node/ usbphyc@5a006000; /delete-node/ usbphyc@5a006000;
/delete-node/ spi@5c001000; /delete-node/ spi@5c001000;
/delete-node/ stgen@5c008000; /delete-node/ stgen@5c008000;
@ -37,6 +37,8 @@
/delete-node/ sdmmc2-b4-0; /delete-node/ sdmmc2-b4-0;
/delete-node/ sdmmc2-b4-1; /delete-node/ sdmmc2-b4-1;
/delete-node/ sdmmc2-d47-0; /delete-node/ sdmmc2-d47-0;
/delete-node/ sdmmc2-d47-1;
/delete-node/ sdmmc2-d47-3;
/delete-node/ usbotg_hs-0; /delete-node/ usbotg_hs-0;
/delete-node/ usbotg-fs-dp-dm-0; /delete-node/ usbotg-fs-dp-dm-0;
}; };

109
fdts/stm32mp15-pinctrl.dtsi
View File

@ -86,12 +86,6 @@
}; };
}; };
rtc_out2_rmp_pins_a: rtc-out2-rmp-pins-0 {
pins {
pinmux = <STM32_PINMUX('I', 8, ANALOG)>; /* RTC_OUT2_RMP */
};
};
sdmmc1_b4_pins_a: sdmmc1-b4-0 { sdmmc1_b4_pins_a: sdmmc1-b4-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */ pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
@ -176,6 +170,18 @@
}; };
}; };
sdmmc2_d47_pins_b: sdmmc2-d47-1 {
pins {
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
<STM32_PINMUX('A', 9, AF10)>, /* SDMMC2_D5 */
<STM32_PINMUX('C', 6, AF10)>, /* SDMMC2_D6 */
<STM32_PINMUX('C', 7, AF10)>; /* SDMMC2_D7 */
slew-rate = <1>;
drive-push-pull;
bias-disable;
};
};
sdmmc2_d47_pins_d: sdmmc2-d47-3 { sdmmc2_d47_pins_d: sdmmc2-d47-3 {
pins { pins {
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */ pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
@ -213,33 +219,89 @@
uart7_pins_a: uart7-0 { uart7_pins_a: uart7-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('E', 8, AF7)>; /* UART4_TX */ pinmux = <STM32_PINMUX('E', 8, AF7)>; /* UART7_TX */
bias-disable; bias-disable;
drive-push-pull; drive-push-pull;
slew-rate = <0>; slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('E', 7, AF7)>, /* UART4_RX */ pinmux = <STM32_PINMUX('E', 7, AF7)>, /* UART7_RX */
<STM32_PINMUX('E', 10, AF7)>, /* UART4_CTS */ <STM32_PINMUX('E', 10, AF7)>, /* UART7_CTS */
<STM32_PINMUX('E', 9, AF7)>; /* UART4_RTS */ <STM32_PINMUX('E', 9, AF7)>; /* UART7_RTS */
bias-disable; bias-disable;
}; };
}; };
uart7_pins_b: uart7-1 { uart7_pins_b: uart7-1 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('E', 8, AF7)>; /* USART7_TX */ pinmux = <STM32_PINMUX('F', 7, AF7)>; /* UART7_TX */
bias-disable; bias-disable;
drive-push-pull; drive-push-pull;
slew-rate = <0>; slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('E', 7, AF7)>; /* USART7_RX */ pinmux = <STM32_PINMUX('F', 6, AF7)>; /* UART7_RX */
bias-disable;
};
};
uart7_pins_c: uart7-2 {
pins1 {
pinmux = <STM32_PINMUX('E', 8, AF7)>; /* UART7_TX */
bias-disable;
drive-push-pull;
slew-rate = <0>;
};
pins2 {
pinmux = <STM32_PINMUX('E', 7, AF7)>; /* UART7_RX */
bias-disable;
};
};
uart8_pins_a: uart8-0 {
pins1 {
pinmux = <STM32_PINMUX('E', 1, AF8)>; /* UART8_TX */
bias-disable;
drive-push-pull;
slew-rate = <0>;
};
pins2 {
pinmux = <STM32_PINMUX('E', 0, AF8)>; /* UART8_RX */
bias-disable; bias-disable;
}; };
}; };
usart2_pins_a: usart2-0 { usart2_pins_a: usart2-0 {
pins1 {
pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
<STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */
bias-disable;
drive-push-pull;
slew-rate = <0>;
};
pins2 {
pinmux = <STM32_PINMUX('D', 6, AF7)>, /* USART2_RX */
<STM32_PINMUX('D', 3, AF7)>; /* USART2_CTS_NSS */
bias-disable;
};
};
usart2_pins_b: usart2-1 {
pins1 {
pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
<STM32_PINMUX('A', 1, AF7)>; /* USART2_RTS */
bias-disable;
drive-push-pull;
slew-rate = <0>;
};
pins2 {
pinmux = <STM32_PINMUX('F', 4, AF7)>, /* USART2_RX */
<STM32_PINMUX('E', 15, AF7)>; /* USART2_CTS_NSS */
bias-disable;
};
};
usart2_pins_c: usart2-2 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('D', 5, AF7)>, /* USART2_TX */ pinmux = <STM32_PINMUX('D', 5, AF7)>, /* USART2_TX */
<STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */ <STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */
@ -256,20 +318,33 @@
usart3_pins_a: usart3-0 { usart3_pins_a: usart3-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */ pinmux = <STM32_PINMUX('B', 10, AF7)>; /* USART3_TX */
<STM32_PINMUX('G', 8, AF8)>; /* USART3_RTS */
bias-disable; bias-disable;
drive-push-pull; drive-push-pull;
slew-rate = <0>; slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('B', 12, AF8)>, /* USART3_RX */ pinmux = <STM32_PINMUX('B', 12, AF8)>; /* USART3_RX */
<STM32_PINMUX('I', 10, AF8)>; /* USART3_CTS_NSS */
bias-disable; bias-disable;
}; };
}; };
usart3_pins_b: usart3-1 { usart3_pins_b: usart3-1 {
pins1 {
pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */
<STM32_PINMUX('G', 8, AF8)>; /* USART3_RTS */
bias-disable;
drive-push-pull;
slew-rate = <0>;
};
pins2 {
pinmux = <STM32_PINMUX('B', 12, AF8)>, /* USART3_RX */
<STM32_PINMUX('I', 10, AF8)>; /* USART3_CTS_NSS */
bias-disable;
};
};
usart3_pins_c: usart3-2 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */ pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */
<STM32_PINMUX('G', 8, AF8)>; /* USART3_RTS */ <STM32_PINMUX('G', 8, AF8)>; /* USART3_RTS */
@ -284,7 +359,7 @@
}; };
}; };
usbotg_hs_pins_a: usbotg_hs-0 { usbotg_hs_pins_a: usbotg-hs-0 {
pins { pins {
pinmux = <STM32_PINMUX('A', 10, ANALOG)>; /* OTG_ID */ pinmux = <STM32_PINMUX('A', 10, ANALOG)>; /* OTG_ID */
}; };

8
fdts/stm32mp151.dtsi
View File

@ -174,7 +174,7 @@
}; };
usbotg_hs: usb-otg@49000000 { usbotg_hs: usb-otg@49000000 {
compatible = "st,stm32mp1-hsotg", "snps,dwc2"; compatible = "st,stm32mp15-hsotg", "snps,dwc2";
reg = <0x49000000 0x10000>; reg = <0x49000000 0x10000>;
clocks = <&rcc USBO_K>; clocks = <&rcc USBO_K>;
clock-names = "otg"; clock-names = "otg";
@ -319,7 +319,7 @@
status = "disabled"; status = "disabled";
}; };
sdmmc1: sdmmc@58005000 { sdmmc1: mmc@58005000 {
compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell"; compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00253180>; arm,primecell-periphid = <0x00253180>;
reg = <0x58005000 0x1000>, <0x58006000 0x1000>; reg = <0x58005000 0x1000>, <0x58006000 0x1000>;
@ -334,7 +334,7 @@
status = "disabled"; status = "disabled";
}; };
sdmmc2: sdmmc@58007000 { sdmmc2: mmc@58007000 {
compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell"; compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00253180>; arm,primecell-periphid = <0x00253180>;
reg = <0x58007000 0x1000>, <0x58008000 0x1000>; reg = <0x58007000 0x1000>, <0x58008000 0x1000>;
@ -434,7 +434,7 @@
status = "disabled"; status = "disabled";
}; };
bsec: nvmem@5c005000 { bsec: efuse@5c005000 {
compatible = "st,stm32mp15-bsec"; compatible = "st,stm32mp15-bsec";
reg = <0x5c005000 0x400>; reg = <0x5c005000 0x400>;
#address-cells = <1>; #address-cells = <1>;

3
fdts/stm32mp157c-ed1.dts
View File

@ -20,7 +20,6 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory@c0000000 { memory@c0000000 {
device_type = "memory"; device_type = "memory";
reg = <0xC0000000 0x40000000>; reg = <0xC0000000 0x40000000>;
@ -52,7 +51,7 @@
}; };
&cryp1 { &cryp1 {
status="okay"; status = "okay";
}; };
&hash1 { &hash1 {

3
fdts/stm32mp157c-ev1.dts
View File

@ -57,6 +57,7 @@
&usart3 { &usart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usart3_pins_a>; pinctrl-0 = <&usart3_pins_b>;
uart-has-rtscts;
status = "disabled"; status = "disabled";
}; };

16
fdts/stm32mp157c-lxa-mc1.dts
View File

@ -75,7 +75,7 @@
&sdmmc2 { &sdmmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc2_b4_pins_a &mc1_sdmmc2_d47_pins_b>; pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_b>;
bus-width = <8>; bus-width = <8>;
no-1-8-v; no-1-8-v;
no-sd; no-sd;
@ -91,17 +91,3 @@
pinctrl-0 = <&uart4_pins_a>; pinctrl-0 = <&uart4_pins_a>;
status = "okay"; status = "okay";
}; };
&pinctrl {
mc1_sdmmc2_d47_pins_b: mc1-sdmmc2-d47-1 {
pins {
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
<STM32_PINMUX('A', 9, AF10)>, /* SDMMC2_D5 */
<STM32_PINMUX('C', 6, AF10)>, /* SDMMC2_D6 */
<STM32_PINMUX('C', 7, AF10)>; /* SDMMC2_D7 */
slew-rate = <1>;
drive-push-pull;
bias-disable;
};
};
};

5
fdts/stm32mp15xx-dkx.dtsi
View File

@ -141,7 +141,6 @@
regulator-name = "vdd_usb"; regulator-name = "vdd_usb";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on;
}; };
vdda: ldo5 { vdda: ldo5 {
@ -319,13 +318,13 @@
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_b>; pinctrl-0 = <&uart7_pins_c>;
status = "disabled"; status = "disabled";
}; };
&usart3 { &usart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usart3_pins_b>; pinctrl-0 = <&usart3_pins_c>;
uart-has-rtscts; uart-has-rtscts;
status = "disabled"; status = "disabled";
}; };

2
fdts/stm32mp15xxaa-pinctrl.dtsi
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/* /*
* Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@st.com> * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
*/ */
&pinctrl { &pinctrl {

2
fdts/stm32mp15xxab-pinctrl.dtsi
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/* /*
* Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@st.com> * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
*/ */
&pinctrl { &pinctrl {

2
fdts/stm32mp15xxac-pinctrl.dtsi
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/* /*
* Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@st.com> * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
*/ */
&pinctrl { &pinctrl {

2
fdts/stm32mp15xxad-pinctrl.dtsi
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/* /*
* Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (C) STMicroelectronics 2019 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@st.com> * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
*/ */
&pinctrl { &pinctrl {