Skip to content

L
linux
Commit f6b43d89 authored by Erwan Le Ray's avatar Erwan Le Ray Committed by Alexandre Torgue
Browse files
Options

ARM: dts: stm32: fix uart nodes ordering in stm32mp15-pinctrl 

Fix usart and uart nodes ordering. Several usart nodes didn't respect
expecting ordering.

Fixes: 077e0638 ("ARM: dts: stm32: Add alternate pinmux for USART2 pins on stm32mp15")
Signed-off-by: default avatarErwan Le Ray <erwan.leray@st.com>
Signed-off-by: default avatarAlexandre Torgue <alexandre.torgue@st.com>
parent a5f8a58c
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 61 deletions
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
View file @ f6b43d89
...@@ -1574,68 +1574,50 @@ pins2 { ...@@ -1574,68 +1574,50 @@ pins2 {
}; };
}; };
usart2_pins_a: usart2-0 { uart4_pins_a: uart4-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */ pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */
<STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */
bias-disable; bias-disable;
drive-push-pull; drive-push-pull;
slew-rate = <0>; slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('D', 6, AF7)>, /* USART2_RX */ pinmux = <STM32_PINMUX('B', 2, AF8)>; /* UART4_RX */
<STM32_PINMUX('D', 3, AF7)>; /* USART2_CTS_NSS */
bias-disable; bias-disable;
}; };
}; };
usart2_sleep_pins_a: usart2-sleep-0 { uart4_idle_pins_a: uart4-idle-0 {
pins {
pinmux = <STM32_PINMUX('F', 5, ANALOG)>, /* USART2_TX */
<STM32_PINMUX('D', 4, ANALOG)>, /* USART2_RTS */
<STM32_PINMUX('D', 6, ANALOG)>, /* USART2_RX */
<STM32_PINMUX('D', 3, ANALOG)>; /* USART2_CTS_NSS */
};
};
usart2_pins_b: usart2-1 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */ pinmux = <STM32_PINMUX('G', 11, ANALOG)>; /* UART4_TX */
<STM32_PINMUX('A', 1, AF7)>; /* USART2_RTS */
bias-disable;
drive-push-pull;
slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('F', 4, AF7)>, /* USART2_RX */ pinmux = <STM32_PINMUX('B', 2, AF8)>; /* UART4_RX */
<STM32_PINMUX('E', 15, AF7)>; /* USART2_CTS_NSS */
bias-disable; bias-disable;
}; };
}; };
usart2_sleep_pins_b: usart2-sleep-1 { uart4_sleep_pins_a: uart4-sleep-0 {
pins { pins {
pinmux = <STM32_PINMUX('F', 5, ANALOG)>, /* USART2_TX */ pinmux = <STM32_PINMUX('G', 11, ANALOG)>, /* UART4_TX */
<STM32_PINMUX('A', 1, ANALOG)>, /* USART2_RTS */ <STM32_PINMUX('B', 2, ANALOG)>; /* UART4_RX */
<STM32_PINMUX('F', 4, ANALOG)>, /* USART2_RX */
<STM32_PINMUX('E', 15, ANALOG)>; /* USART2_CTS_NSS */
}; };
}; };
usart3_pins_a: usart3-0 { uart4_pins_b: uart4-1 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('B', 10, AF7)>; /* USART3_TX */ pinmux = <STM32_PINMUX('D', 1, AF8)>; /* UART4_TX */
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', 2, AF8)>; /* UART4_RX */
bias-disable; bias-disable;
}; };
}; };
uart4_pins_a: uart4-0 { uart4_pins_c: uart4-2 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */ pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */
bias-disable; bias-disable;
...@@ -1648,86 +1630,104 @@ pins2 { ...@@ -1648,86 +1630,104 @@ pins2 {
}; };
}; };
uart4_idle_pins_a: uart4-idle-0 { uart7_pins_a: uart7-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('G', 11, ANALOG)>; /* UART4_TX */ pinmux = <STM32_PINMUX('E', 8, AF7)>; /* UART4_TX */
bias-disable;
drive-push-pull;
slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('B', 2, AF8)>; /* UART4_RX */ pinmux = <STM32_PINMUX('E', 7, AF7)>, /* UART4_RX */
<STM32_PINMUX('E', 10, AF7)>, /* UART4_CTS */
<STM32_PINMUX('E', 9, AF7)>; /* UART4_RTS */
bias-disable; bias-disable;
}; };
}; };
uart4_sleep_pins_a: uart4-sleep-0 { uart7_pins_b: uart7-1 {
pins {
pinmux = <STM32_PINMUX('G', 11, ANALOG)>, /* UART4_TX */
<STM32_PINMUX('B', 2, ANALOG)>; /* UART4_RX */
};
};
uart4_pins_b: uart4-1 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('D', 1, AF8)>; /* UART4_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('B', 2, AF8)>; /* UART4_RX */ pinmux = <STM32_PINMUX('F', 6, AF7)>; /* UART7_RX */
bias-disable; bias-disable;
}; };
}; };
uart4_pins_c: uart4-2 { uart8_pins_a: uart8-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */ pinmux = <STM32_PINMUX('E', 1, AF8)>; /* UART8_TX */
bias-disable; bias-disable;
drive-push-pull; drive-push-pull;
slew-rate = <0>; slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('B', 2, AF8)>; /* UART4_RX */ pinmux = <STM32_PINMUX('E', 0, AF8)>; /* UART8_RX */
bias-disable; bias-disable;
}; };
}; };
uart7_pins_a: uart7-0 { usart2_pins_a: usart2-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('E', 8, AF7)>; /* UART4_TX */ pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
<STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */
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('D', 6, AF7)>, /* USART2_RX */
<STM32_PINMUX('E', 10, AF7)>, /* UART4_CTS */ <STM32_PINMUX('D', 3, AF7)>; /* USART2_CTS_NSS */
<STM32_PINMUX('E', 9, AF7)>; /* UART4_RTS */
bias-disable; bias-disable;
}; };
}; };
uart7_pins_b: uart7-1 { usart2_sleep_pins_a: usart2-sleep-0 {
pins {
pinmux = <STM32_PINMUX('F', 5, ANALOG)>, /* USART2_TX */
<STM32_PINMUX('D', 4, ANALOG)>, /* USART2_RTS */
<STM32_PINMUX('D', 6, ANALOG)>, /* USART2_RX */
<STM32_PINMUX('D', 3, ANALOG)>; /* USART2_CTS_NSS */
};
};
usart2_pins_b: usart2-1 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('F', 7, AF7)>; /* UART7_TX */ pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
<STM32_PINMUX('A', 1, AF7)>; /* USART2_RTS */
bias-disable; bias-disable;
drive-push-pull; drive-push-pull;
slew-rate = <0>; slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('F', 6, AF7)>; /* UART7_RX */ pinmux = <STM32_PINMUX('F', 4, AF7)>, /* USART2_RX */
<STM32_PINMUX('E', 15, AF7)>; /* USART2_CTS_NSS */
bias-disable; bias-disable;
}; };
}; };
uart8_pins_a: uart8-0 { usart2_sleep_pins_b: usart2-sleep-1 {
pins {
pinmux = <STM32_PINMUX('F', 5, ANALOG)>, /* USART2_TX */
<STM32_PINMUX('A', 1, ANALOG)>, /* USART2_RTS */
<STM32_PINMUX('F', 4, ANALOG)>, /* USART2_RX */
<STM32_PINMUX('E', 15, ANALOG)>; /* USART2_CTS_NSS */
};
};
usart3_pins_a: usart3-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('E', 1, AF8)>; /* UART8_TX */ pinmux = <STM32_PINMUX('B', 10, AF7)>; /* USART3_TX */
bias-disable; bias-disable;
drive-push-pull; drive-push-pull;
slew-rate = <0>; slew-rate = <0>;
}; };
pins2 { pins2 {
pinmux = <STM32_PINMUX('E', 0, AF8)>; /* UART8_RX */ pinmux = <STM32_PINMUX('B', 12, AF8)>; /* USART3_RX */
bias-disable; bias-disable;
}; };
}; };
......
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