Skip to content

Commit

Permalink
dts/arm/st: Fix dtc warning in stm32 *-pinctrl.dtsi files
Browse files Browse the repository at this point in the history 
This change aims at fixing 'unit_address_vs_reg' warning in
stm32 *-pinctrl.dtsi files.
This warning pops up when a node name is made up with an address
(node_name@xx) but does not contain a reg property.
This case was encountered for led nodes for instance,
where a reg property has no meaning.
Fix this by changing node_name@xx to node_name_xx which removes the
guilty '@XX' syntax but preserves node_name uniqueness.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
  • Loading branch information
@erwango @galak
erwango authored and galak committed Sep 18, 2018
1 parent 48dbffd commit ca26a4b
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 72 deletions.
14 changes: 7 additions & 7 deletions dts/arm/st/stm32f0-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,43 @@
/ {
soc {
pinctrl: pin-controller@48000000 {
usart1_pins_a: usart1@0 {
usart1_pins_a: usart1_a {
rx_tx {
rx = <STM32_PIN_PB7 (STM32_PINMUX_ALT_FUNC_0 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB6 (STM32_PINMUX_ALT_FUNC_0 | STM32_PUSHPULL_NOPULL)>;
};
};
usart1_pins_b: usart1@1 {
usart1_pins_b: usart1_b {
rx_tx {
rx = <STM32_PIN_PA10 (STM32_PINMUX_ALT_FUNC_1 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA9 (STM32_PINMUX_ALT_FUNC_1 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_a: usart2@0 {
usart2_pins_a: usart2_a {
rx_tx {
rx = <STM32_PIN_PA3 (STM32_PINMUX_ALT_FUNC_1 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA2 (STM32_PINMUX_ALT_FUNC_1 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_b: usart2@1 {
usart2_pins_b: usart2_b {
rx_tx {
rx = <STM32_PIN_PA15 (STM32_PINMUX_ALT_FUNC_1 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA14 (STM32_PINMUX_ALT_FUNC_1 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_d: usart2@2 {
usart2_pins_d: usart2_d {
rx_tx {
rx = <STM32_PIN_PD6 (STM32_PINMUX_ALT_FUNC_0 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PD5 (STM32_PINMUX_ALT_FUNC_0 | STM32_PUSHPULL_NOPULL)>;
};
};
can_pins_a: can@0 {
can_pins_a: can_a {
rx_tx {
rx = <STM32_PIN_PB8 (STM32_PINMUX_ALT_FUNC_4 | STM32_PUPDR_PULL_UP)>;
tx = <STM32_PIN_PB9 (STM32_PINMUX_ALT_FUNC_4 | STM32_PUPDR_NO_PULL)>;
};
};
can_pins_b: can@1 {
can_pins_b: can_b {
rx_tx {
rx = <STM32_PIN_PD0 (STM32_PINMUX_ALT_FUNC_0 | STM32_PUPDR_PULL_UP)>;
tx = <STM32_PIN_PD1 (STM32_PINMUX_ALT_FUNC_0 | STM32_PUPDR_NO_PULL)>;
Expand Down
10 changes: 5 additions & 5 deletions dts/arm/st/stm32f1-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@
/ {
soc {
pinctrl: pin-controller@40010800 {
usart1_pins_a: usart1@0 {
usart1_pins_a: usart1_a {
rx_tx {
rx = <STM32_PIN_PA10 STM32_PIN_USART_RX>;
tx = <STM32_PIN_PA9 STM32_PIN_USART_TX>;
};
};
usart2_pins_a: usart2@0 {
usart2_pins_a: usart2_a {
rx_tx {
rx = <STM32_PIN_PA3 STM32_PIN_USART_RX>;
tx = <STM32_PIN_PA2 STM32_PIN_USART_TX>;
};
};
usart2_pins_b: usart2@1 {
usart2_pins_b: usart2_b {
rx_tx {
rx = <STM32_PIN_PD6 STM32_PIN_USART_RX>;
tx = <STM32_PIN_PD5 STM32_PIN_USART_TX>;
};
};
usart3_pins_a: usart3@0 {
usart3_pins_a: usart3_a {
rx_tx {
rx = <STM32_PIN_PB11 STM32_PIN_USART_RX>;
tx = <STM32_PIN_PB10 STM32_PIN_USART_TX>;
};
};
uart4_pins_a: uart4@0 {
uart4_pins_a: uart4_a {
rx_tx {
rx = <STM32_PIN_PC11 STM32_PIN_USART_RX>;
tx = <STM32_PIN_PC10 STM32_PIN_USART_TX>;
Expand Down
12 changes: 6 additions & 6 deletions dts/arm/st/stm32f2-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@
/ {
soc {
pinctrl: pin-controller@40020000 {
usart1_pins_a: usart1@0 {
usart1_pins_a: usart1_a {
rx_tx {
rx = <STM32_PIN_PB7 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart1_pins_b: usart1@1 {
usart1_pins_b: usart1_b {
rx_tx {
rx = <STM32_PIN_PA10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_a: usart2@0 {
usart2_pins_a: usart2_a {
rx_tx {
rx = <STM32_PIN_PA3 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA2 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_b: usart2@1 {
usart2_pins_b: usart2_b {
rx_tx {
rx = <STM32_PIN_PD5 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PD6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart3_pins_a: usart3@0 {
usart3_pins_a: usart3_a {
rx_tx {
rx = <STM32_PIN_PB11 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart3_pins_b: usart3@1 {
usart3_pins_b: usart3_b {
rx_tx {
rx = <STM32_PIN_PD9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
Expand Down
20 changes: 10 additions & 10 deletions dts/arm/st/stm32f3-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,61 +9,61 @@
/ {
soc {
pinctrl: pin-controller@48000000 {
usart1_pins_a: usart1@0 {
usart1_pins_a: usart1_a {
rx_tx {
rx = <STM32_PIN_PB6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB7 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart1_pins_b: usart1@1 {
usart1_pins_b: usart1_b {
rx_tx {
rx = <STM32_PIN_PA10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart1_pins_c: usart1@2 {
usart1_pins_c: usart1_c {
rx_tx {
rx = <STM32_PIN_PG10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart1_pins_d: usart1@3 {
usart1_pins_d: usart1_d {
rx_tx {
rx = <STM32_PIN_PC5 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PC4 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_a: usart2@0 {
usart2_pins_a: usart2_a {
rx_tx {
rx = <STM32_PIN_PA3 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA2 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_b: usart2@1 {
usart2_pins_b: usart2_b {
rx_tx {
rx = <STM32_PIN_PA15 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA2 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_c: usart2@2 {
usart2_pins_c: usart2_c {
rx_tx {
rx = <STM32_PIN_PD6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA2 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_d: usart2@3 {
usart2_pins_d: usart2_d {
rx_tx {
rx = <STM32_PIN_PD6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PD5 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart3_pins_a: usart3@0 {
usart3_pins_a: usart3_a {
rx_tx {
rx = <STM32_PIN_PB11 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart3_pins_b: usart3@1 {
usart3_pins_b: usart3_b {
rx_tx {
rx = <STM32_PIN_PD9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
Expand Down
14 changes: 7 additions & 7 deletions dts/arm/st/stm32f4-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,43 @@
/ {
soc {
pinctrl: pin-controller@40020000 {
usart1_pins_a: usart1@0 {
usart1_pins_a: usart1_a {
rx_tx {
rx = <STM32_PIN_PB7 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart1_pins_b: usart1@1 {
usart1_pins_b: usart1_b {
rx_tx {
rx = <STM32_PIN_PA10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart1_pins_c: usart1@2 {
usart1_pins_c: usart1_c {
rx_tx {
rx = <STM32_PIN_PG10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart2_pins_a: usart2@0 {
usart2_pins_a: usart2_a {
rx_tx {
rx = <STM32_PIN_PA3 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PA2 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart3_pins_a: usart3@0 {
usart3_pins_a: usart3_a {
rx_tx {
rx = <STM32_PIN_PB11 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PB10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart3_pins_b: usart3@1 {
usart3_pins_b: usart3_b {
rx_tx {
rx = <STM32_PIN_PD9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
usart6_pins_a: usart6@0 {
usart6_pins_a: usart6_a {
rx_tx {
rx = <STM32_PIN_PC7 (STM32_PINMUX_ALT_FUNC_8 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PC6 (STM32_PINMUX_ALT_FUNC_8 | STM32_PUSHPULL_NOPULL)>;
Expand Down
8 changes: 4 additions & 4 deletions dts/arm/st/stm32f405-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@
/ {
soc {
pinctrl: pin-controller@40020000 {
usart3_pins_a: usart3@0 {
usart3_pins_a: usart3_a {
rx_tx {
rx = <STM32_PIN_PB11 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PB10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
};
};
usart3_pins_b: usart3@1 {
usart3_pins_b: usart3_b {
rx_tx {
rx = <STM32_PIN_PD9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
};
};
usart6_pins_a: usart6@0 {
usart6_pins_a: usart6_a {
rx_tx {
rx = <STM32_PIN_PG14 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PG9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
};
};
usart6_pins_b: usart6@1 {
usart6_pins_b: usart6_b {
rx_tx {
rx = <STM32_PIN_PC7 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PC6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
Expand Down
8 changes: 4 additions & 4 deletions dts/arm/st/stm32f412-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@
/ {
soc {
pinctrl: pin-controller@40020000 {
usart3_pins_a: usart3@0 {
usart3_pins_a: usart3_a {
rx_tx {
rx = <STM32_PIN_PB11 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PB10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
};
};
usart3_pins_b: usart3@1 {
usart3_pins_b: usart3_b {
rx_tx {
rx = <STM32_PIN_PD9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
};
};

usart2_pins_a: usart2@0 {
usart2_pins_a: usart2_a {
rx_tx {
rx = <STM32_PIN_PA3 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PA2 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
};
};
usart2_pins_b: usart2@1 {
usart2_pins_b: usart2_b {
rx_tx {
rx = <STM32_PIN_PD6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PD5 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
Expand Down
4 changes: 2 additions & 2 deletions dts/arm/st/stm32f413-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
/ {
soc {
pinctrl: pin-controller@40020000 {
usart3_pins_a: usart3@0 {
usart3_pins_a: usart3_a {
rx_tx {
rx = <STM32_PIN_PB11 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PB10 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
};
};
usart3_pins_b: usart3@1 {
usart3_pins_b: usart3_b {
rx_tx {
rx = <STM32_PIN_PD9 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_PULLUP)>;
Expand Down
Loading

0 comments on commit ca26a4b

Please sign in to comment.