Hi Dillon

On 4/9/21 9:28 AM, [email protected] wrote:
> From: dillon min <[email protected]>
> 
> This patch is intend to add support stm32h750 value line,
> just add stm32h7-pinctrl.dtsi for extending, with following changes:
> 
> - rename stm32h743-pinctrl.dtsi to stm32h7-pinctrl.dtsi
> - move 'pin-controller' from stm32h7-pinctrl.dtsi to stm32h743.dtsi
> - update stm32h743i-{disco, eval}.dts to include stm32h7-pinctrl.dtsi
> 
> Signed-off-by: dillon min <[email protected]>
> Reviewed-by: Patrice Chotard <[email protected]>
> ---
> v5: no changes
> 
>  arch/arm/dts/stm32h7-pinctrl.dtsi   | 185 ++++++++++++++++++++++
>  arch/arm/dts/stm32h743-pinctrl.dtsi | 306 
> ------------------------------------
>  arch/arm/dts/stm32h743.dtsi         | 142 +++++++++++++++++
>  arch/arm/dts/stm32h743i-disco.dts   |   2 +-
>  arch/arm/dts/stm32h743i-eval.dts    |   2 +-
>  5 files changed, 329 insertions(+), 308 deletions(-)
>  create mode 100644 arch/arm/dts/stm32h7-pinctrl.dtsi
>  delete mode 100644 arch/arm/dts/stm32h743-pinctrl.dtsi
> 
> diff --git a/arch/arm/dts/stm32h7-pinctrl.dtsi 
> b/arch/arm/dts/stm32h7-pinctrl.dtsi
> new file mode 100644
> index 0000000..f6968b5
> --- /dev/null
> +++ b/arch/arm/dts/stm32h7-pinctrl.dtsi
> @@ -0,0 +1,185 @@
> +/*
> + * Copyright 2017 - Alexandre Torgue <[email protected]>
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + *  a) This file is free software; you can redistribute it and/or
> + *     modify it under the terms of the GNU General Public License as
> + *     published by the Free Software Foundation; either version 2 of the
> + *     License, or (at your option) any later version.
> + *
> + *     This file is distributed in the hope that it will be useful,
> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *     GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + *  b) Permission is hereby granted, free of charge, to any person
> + *     obtaining a copy of this software and associated documentation
> + *     files (the "Software"), to deal in the Software without
> + *     restriction, including without limitation the rights to use,
> + *     copy, modify, merge, publish, distribute, sublicense, and/or
> + *     sell copies of the Software, and to permit persons to whom the
> + *     Software is furnished to do so, subject to the following
> + *     conditions:
> + *
> + *     The above copyright notice and this permission notice shall be
> + *     included in all copies or substantial portions of the Software.
> + *
> + *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + *     OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +#include <dt-bindings/pinctrl/stm32-pinfunc.h>
> +
> +&pinctrl {
> +
> +     i2c1_pins_a: i2c1-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('B', 6, AF4)>, /* I2C1_SCL */
> +                              <STM32_PINMUX('B', 7, AF4)>; /* I2C1_SDA */
> +                     bias-disable;
> +                     drive-open-drain;
> +                     slew-rate = <0>;
> +             };
> +     };
> +
> +     ethernet_rmii: rmii-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('G', 11, AF11)>,
> +                              <STM32_PINMUX('G', 13, AF11)>,
> +                              <STM32_PINMUX('G', 12, AF11)>,
> +                              <STM32_PINMUX('C', 4, AF11)>,
> +                              <STM32_PINMUX('C', 5, AF11)>,
> +                              <STM32_PINMUX('A', 7, AF11)>,
> +                              <STM32_PINMUX('C', 1, AF11)>,
> +                              <STM32_PINMUX('A', 2, AF11)>,
> +                              <STM32_PINMUX('A', 1, AF11)>;
> +                     slew-rate = <2>;
> +             };
> +     };
> +
> +     sdmmc1_b4_pins_a: sdmmc1-b4-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
> +                              <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */
> +                              <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1_D2 */
> +                              <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1_D3 */
> +                              <STM32_PINMUX('C', 12, AF12)>, /* SDMMC1_CK */
> +                              <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */
> +                     slew-rate = <3>;
> +                     drive-push-pull;
> +                     bias-disable;
> +             };
> +     };
> +
> +     sdmmc1_b4_od_pins_a: sdmmc1-b4-od-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
> +                              <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */
> +                              <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1_D2 */
> +                              <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1_D3 */
> +                              <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1_CK */
> +                     slew-rate = <3>;
> +                     drive-push-pull;
> +                     bias-disable;
> +             };
> +             pins2{
> +                     pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */
> +                     slew-rate = <3>;
> +                     drive-open-drain;
> +                     bias-disable;
> +             };
> +     };
> +
> +     sdmmc1_b4_sleep_pins_a: sdmmc1-b4-sleep-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('C', 8, ANALOG)>, /* SDMMC1_D0 */
> +                              <STM32_PINMUX('C', 9, ANALOG)>, /* SDMMC1_D1 */
> +                              <STM32_PINMUX('C', 10, ANALOG)>, /* SDMMC1_D2 
> */
> +                              <STM32_PINMUX('C', 11, ANALOG)>, /* SDMMC1_D3 
> */
> +                              <STM32_PINMUX('C', 12, ANALOG)>, /* SDMMC1_CK 
> */
> +                              <STM32_PINMUX('D', 2, ANALOG)>; /* SDMMC1_CMD 
> */
> +             };
> +     };
> +
> +     sdmmc1_dir_pins_a: sdmmc1-dir-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('C', 6, AF8)>, /* SDMMC1_D0DIR */
> +                              <STM32_PINMUX('C', 7, AF8)>, /* SDMMC1_D123DIR 
> */
> +                              <STM32_PINMUX('B', 9, AF7)>; /* SDMMC1_CDIR */
> +                     slew-rate = <3>;
> +                     drive-push-pull;
> +                     bias-pull-up;
> +             };
> +             pins2{
> +                     pinmux = <STM32_PINMUX('B', 8, AF7)>; /* SDMMC1_CKIN */
> +                     bias-pull-up;
> +             };
> +     };
> +
> +     sdmmc1_dir_sleep_pins_a: sdmmc1-dir-sleep-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('C', 6, ANALOG)>, /* 
> SDMMC1_D0DIR */
> +                              <STM32_PINMUX('C', 7, ANALOG)>, /* 
> SDMMC1_D123DIR */
> +                              <STM32_PINMUX('B', 9, ANALOG)>, /* SDMMC1_CDIR 
> */
> +                              <STM32_PINMUX('B', 8, ANALOG)>; /* SDMMC1_CKIN 
> */
> +             };
> +     };
> +
> +     usart1_pins: usart1-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('B', 14, AF4)>; /* USART1_TX */
> +                     bias-disable;
> +                     drive-push-pull;
> +                     slew-rate = <0>;
> +             };
> +             pins2 {
> +                     pinmux = <STM32_PINMUX('B', 15, AF4)>; /* USART1_RX */
> +                     bias-disable;
> +             };
> +     };
> +
> +     usart2_pins: usart2-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('D', 5, AF7)>; /* USART2_TX */
> +                     bias-disable;
> +                     drive-push-pull;
> +                     slew-rate = <0>;
> +             };
> +             pins2 {
> +                     pinmux = <STM32_PINMUX('D', 6, AF7)>; /* USART2_RX */
> +                     bias-disable;
> +             };
> +     };
> +
> +     usbotg_hs_pins_a: usbotg-hs-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('H', 4, AF10)>,  /* ULPI_NXT */
> +                                      <STM32_PINMUX('I', 11, AF10)>, /* 
> ULPI_DIR> */
> +                                      <STM32_PINMUX('C', 0, AF10)>,  /* 
> ULPI_STP> */
> +                                      <STM32_PINMUX('A', 5, AF10)>,  /* 
> ULPI_CK> */
> +                                      <STM32_PINMUX('A', 3, AF10)>,  /* 
> ULPI_D0> */
> +                                      <STM32_PINMUX('B', 0, AF10)>,  /* 
> ULPI_D1> */
> +                                      <STM32_PINMUX('B', 1, AF10)>,  /* 
> ULPI_D2> */
> +                                      <STM32_PINMUX('B', 10, AF10)>, /* 
> ULPI_D3> */
> +                                      <STM32_PINMUX('B', 11, AF10)>, /* 
> ULPI_D4> */
> +                                      <STM32_PINMUX('B', 12, AF10)>, /* 
> ULPI_D5> */
> +                                      <STM32_PINMUX('B', 13, AF10)>, /* 
> ULPI_D6> */
> +                                      <STM32_PINMUX('B', 5, AF10)>;  /* 
> ULPI_D7> */
> +                     bias-disable;
> +                     drive-push-pull;
> +                     slew-rate = <2>;
> +             };
> +     };
> +};
> diff --git a/arch/arm/dts/stm32h743-pinctrl.dtsi 
> b/arch/arm/dts/stm32h743-pinctrl.dtsi
> deleted file mode 100644
> index 141083f..0000000
> --- a/arch/arm/dts/stm32h743-pinctrl.dtsi
> +++ /dev/null
> @@ -1,306 +0,0 @@
> -/*
> - * Copyright 2017 - Alexandre Torgue <[email protected]>
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
> - *
> - *  a) This file is free software; you can redistribute it and/or
> - *     modify it under the terms of the GNU General Public License as
> - *     published by the Free Software Foundation; either version 2 of the
> - *     License, or (at your option) any later version.
> - *
> - *     This file is distributed in the hope that it will be useful,
> - *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *     GNU General Public License for more details.
> - *
> - * Or, alternatively,
> - *
> - *  b) Permission is hereby granted, free of charge, to any person
> - *     obtaining a copy of this software and associated documentation
> - *     files (the "Software"), to deal in the Software without
> - *     restriction, including without limitation the rights to use,
> - *     copy, modify, merge, publish, distribute, sublicense, and/or
> - *     sell copies of the Software, and to permit persons to whom the
> - *     Software is furnished to do so, subject to the following
> - *     conditions:
> - *
> - *     The above copyright notice and this permission notice shall be
> - *     included in all copies or substantial portions of the Software.
> - *
> - *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> - *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> - *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> - *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - *     OTHER DEALINGS IN THE SOFTWARE.
> - */
> -
> -#include <dt-bindings/pinctrl/stm32-pinfunc.h>
> -
> -/ {
> -     soc {
> -             pinctrl: pin-controller {
> -                     #address-cells = <1>;
> -                     #size-cells = <1>;
> -                     compatible = "st,stm32h743-pinctrl";
> -                     ranges = <0 0x58020000 0x3000>;
> -                     interrupt-parent = <&exti>;
> -                     st,syscfg = <&syscfg 0x8>;
> -                     pins-are-numbered;
> -
> -                     gpioa: gpio@58020000 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x0 0x400>;
> -                             clocks = <&rcc GPIOA_CK>;
> -                             st,bank-name = "GPIOA";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpiob: gpio@58020400 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x400 0x400>;
> -                             clocks = <&rcc GPIOB_CK>;
> -                             st,bank-name = "GPIOB";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpioc: gpio@58020800 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x800 0x400>;
> -                             clocks = <&rcc GPIOC_CK>;
> -                             st,bank-name = "GPIOC";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpiod: gpio@58020c00 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0xc00 0x400>;
> -                             clocks = <&rcc GPIOD_CK>;
> -                             st,bank-name = "GPIOD";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpioe: gpio@58021000 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x1000 0x400>;
> -                             clocks = <&rcc GPIOE_CK>;
> -                             st,bank-name = "GPIOE";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpiof: gpio@58021400 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x1400 0x400>;
> -                             clocks = <&rcc GPIOF_CK>;
> -                             st,bank-name = "GPIOF";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpiog: gpio@58021800 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x1800 0x400>;
> -                             clocks = <&rcc GPIOG_CK>;
> -                             st,bank-name = "GPIOG";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpioh: gpio@58021c00 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x1c00 0x400>;
> -                             clocks = <&rcc GPIOH_CK>;
> -                             st,bank-name = "GPIOH";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpioi: gpio@58022000 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x2000 0x400>;
> -                             clocks = <&rcc GPIOI_CK>;
> -                             st,bank-name = "GPIOI";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpioj: gpio@58022400 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x2400 0x400>;
> -                             clocks = <&rcc GPIOJ_CK>;
> -                             st,bank-name = "GPIOJ";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     gpiok: gpio@58022800 {
> -                             gpio-controller;
> -                             #gpio-cells = <2>;
> -                             reg = <0x2800 0x400>;
> -                             clocks = <&rcc GPIOK_CK>;
> -                             st,bank-name = "GPIOK";
> -                             interrupt-controller;
> -                             #interrupt-cells = <2>;
> -                     };
> -
> -                     i2c1_pins_a: i2c1-0 {
> -                             pins {
> -                                     pinmux = <STM32_PINMUX('B', 6, AF4)>, 
> /* I2C1_SCL */
> -                                              <STM32_PINMUX('B', 7, AF4)>; 
> /* I2C1_SDA */
> -                                     bias-disable;
> -                                     drive-open-drain;
> -                                     slew-rate = <0>;
> -                             };
> -                     };
> -
> -                     ethernet_rmii: rmii-0 {
> -                             pins {
> -                                     pinmux = <STM32_PINMUX('G', 11, AF11)>,
> -                                              <STM32_PINMUX('G', 13, AF11)>,
> -                                              <STM32_PINMUX('G', 12, AF11)>,
> -                                              <STM32_PINMUX('C', 4, AF11)>,
> -                                              <STM32_PINMUX('C', 5, AF11)>,
> -                                              <STM32_PINMUX('A', 7, AF11)>,
> -                                              <STM32_PINMUX('C', 1, AF11)>,
> -                                              <STM32_PINMUX('A', 2, AF11)>,
> -                                              <STM32_PINMUX('A', 1, AF11)>;
> -                                     slew-rate = <2>;
> -                             };
> -                     };
> -
> -                     sdmmc1_b4_pins_a: sdmmc1-b4-0 {
> -                             pins {
> -                                     pinmux = <STM32_PINMUX('C', 8, AF12)>, 
> /* SDMMC1_D0 */
> -                                              <STM32_PINMUX('C', 9, AF12)>, 
> /* SDMMC1_D1 */
> -                                              <STM32_PINMUX('C', 10, AF12)>, 
> /* SDMMC1_D2 */
> -                                              <STM32_PINMUX('C', 11, AF12)>, 
> /* SDMMC1_D3 */
> -                                              <STM32_PINMUX('C', 12, AF12)>, 
> /* SDMMC1_CK */
> -                                              <STM32_PINMUX('D', 2, AF12)>; 
> /* SDMMC1_CMD */
> -                                     slew-rate = <3>;
> -                                     drive-push-pull;
> -                                     bias-disable;
> -                             };
> -                     };
> -
> -                     sdmmc1_b4_od_pins_a: sdmmc1-b4-od-0 {
> -                             pins1 {
> -                                     pinmux = <STM32_PINMUX('C', 8, AF12)>, 
> /* SDMMC1_D0 */
> -                                              <STM32_PINMUX('C', 9, AF12)>, 
> /* SDMMC1_D1 */
> -                                              <STM32_PINMUX('C', 10, AF12)>, 
> /* SDMMC1_D2 */
> -                                              <STM32_PINMUX('C', 11, AF12)>, 
> /* SDMMC1_D3 */
> -                                              <STM32_PINMUX('C', 12, AF12)>; 
> /* SDMMC1_CK */
> -                                     slew-rate = <3>;
> -                                     drive-push-pull;
> -                                     bias-disable;
> -                             };
> -                             pins2{
> -                                     pinmux = <STM32_PINMUX('D', 2, AF12)>; 
> /* SDMMC1_CMD */
> -                                     slew-rate = <3>;
> -                                     drive-open-drain;
> -                                     bias-disable;
> -                             };
> -                     };
> -
> -                     sdmmc1_b4_sleep_pins_a: sdmmc1-b4-sleep-0 {
> -                             pins {
> -                                     pinmux = <STM32_PINMUX('C', 8, 
> ANALOG)>, /* SDMMC1_D0 */
> -                                              <STM32_PINMUX('C', 9, 
> ANALOG)>, /* SDMMC1_D1 */
> -                                              <STM32_PINMUX('C', 10, 
> ANALOG)>, /* SDMMC1_D2 */
> -                                              <STM32_PINMUX('C', 11, 
> ANALOG)>, /* SDMMC1_D3 */
> -                                              <STM32_PINMUX('C', 12, 
> ANALOG)>, /* SDMMC1_CK */
> -                                              <STM32_PINMUX('D', 2, 
> ANALOG)>; /* SDMMC1_CMD */
> -                             };
> -                     };
> -
> -                     sdmmc1_dir_pins_a: sdmmc1-dir-0 {
> -                             pins1 {
> -                                     pinmux = <STM32_PINMUX('C', 6, AF8)>, 
> /* SDMMC1_D0DIR */
> -                                              <STM32_PINMUX('C', 7, AF8)>, 
> /* SDMMC1_D123DIR */
> -                                              <STM32_PINMUX('B', 9, AF7)>; 
> /* SDMMC1_CDIR */
> -                                     slew-rate = <3>;
> -                                     drive-push-pull;
> -                                     bias-pull-up;
> -                             };
> -                             pins2{
> -                                     pinmux = <STM32_PINMUX('B', 8, AF7)>; 
> /* SDMMC1_CKIN */
> -                                     bias-pull-up;
> -                             };
> -                     };
> -
> -                     sdmmc1_dir_sleep_pins_a: sdmmc1-dir-sleep-0 {
> -                             pins {
> -                                     pinmux = <STM32_PINMUX('C', 6, 
> ANALOG)>, /* SDMMC1_D0DIR */
> -                                              <STM32_PINMUX('C', 7, 
> ANALOG)>, /* SDMMC1_D123DIR */
> -                                              <STM32_PINMUX('B', 9, 
> ANALOG)>, /* SDMMC1_CDIR */
> -                                              <STM32_PINMUX('B', 8, 
> ANALOG)>; /* SDMMC1_CKIN */
> -                             };
> -                     };
> -
> -                     usart1_pins: usart1-0 {
> -                             pins1 {
> -                                     pinmux = <STM32_PINMUX('B', 14, AF4)>; 
> /* USART1_TX */
> -                                     bias-disable;
> -                                     drive-push-pull;
> -                                     slew-rate = <0>;
> -                             };
> -                             pins2 {
> -                                     pinmux = <STM32_PINMUX('B', 15, AF4)>; 
> /* USART1_RX */
> -                                     bias-disable;
> -                             };
> -                     };
> -
> -                     usart2_pins: usart2-0 {
> -                             pins1 {
> -                                     pinmux = <STM32_PINMUX('D', 5, AF7)>; 
> /* USART2_TX */
> -                                     bias-disable;
> -                                     drive-push-pull;
> -                                     slew-rate = <0>;
> -                             };
> -                             pins2 {
> -                                     pinmux = <STM32_PINMUX('D', 6, AF7)>; 
> /* USART2_RX */
> -                                     bias-disable;
> -                             };
> -                     };
> -
> -                     usbotg_hs_pins_a: usbotg-hs-0 {
> -                             pins {
> -                                     pinmux = <STM32_PINMUX('H', 4, AF10)>,  
> /* ULPI_NXT */
> -                                                      <STM32_PINMUX('I', 11, 
> AF10)>, /* ULPI_DIR> */
> -                                                      <STM32_PINMUX('C', 0, 
> AF10)>,  /* ULPI_STP> */
> -                                                      <STM32_PINMUX('A', 5, 
> AF10)>,  /* ULPI_CK> */
> -                                                      <STM32_PINMUX('A', 3, 
> AF10)>,  /* ULPI_D0> */
> -                                                      <STM32_PINMUX('B', 0, 
> AF10)>,  /* ULPI_D1> */
> -                                                      <STM32_PINMUX('B', 1, 
> AF10)>,  /* ULPI_D2> */
> -                                                      <STM32_PINMUX('B', 10, 
> AF10)>, /* ULPI_D3> */
> -                                                      <STM32_PINMUX('B', 11, 
> AF10)>, /* ULPI_D4> */
> -                                                      <STM32_PINMUX('B', 12, 
> AF10)>, /* ULPI_D5> */
> -                                                      <STM32_PINMUX('B', 13, 
> AF10)>, /* ULPI_D6> */
> -                                                      <STM32_PINMUX('B', 5, 
> AF10)>;  /* ULPI_D7> */
> -                                     bias-disable;
> -                                     drive-push-pull;
> -                                     slew-rate = <2>;
> -                             };
> -                     };
> -             };
> -     };
> -};
> diff --git a/arch/arm/dts/stm32h743.dtsi b/arch/arm/dts/stm32h743.dtsi
> index e4e4723..8c96698 100644
> --- a/arch/arm/dts/stm32h743.dtsi
> +++ b/arch/arm/dts/stm32h743.dtsi
> @@ -519,6 +519,148 @@
>                       snps,pbl = <8>;
>                       status = "disabled";
>               };
> +
> +             pinctrl: pin-controller@58020000 {
> +                     #address-cells = <1>;
> +                     #size-cells = <1>;
> +                     compatible = "st,stm32h743-pinctrl";
> +                     ranges = <0 0x58020000 0x3000>;
> +                     interrupt-parent = <&exti>;
> +                     st,syscfg = <&syscfg 0x8>;
> +                     pins-are-numbered;
> +
> +                     gpioa: gpio@58020000 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x0 0x400>;
> +                             clocks = <&rcc GPIOA_CK>;
> +                             st,bank-name = "GPIOA";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 0 16>;
> +                     };
> +
> +                     gpiob: gpio@58020400 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x400 0x400>;
> +                             clocks = <&rcc GPIOB_CK>;
> +                             st,bank-name = "GPIOB";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 16 16>;
> +                     };
> +
> +                     gpioc: gpio@58020800 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x800 0x400>;
> +                             clocks = <&rcc GPIOC_CK>;
> +                             st,bank-name = "GPIOC";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 32 16>;
> +                     };
> +
> +                     gpiod: gpio@58020c00 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0xc00 0x400>;
> +                             clocks = <&rcc GPIOD_CK>;
> +                             st,bank-name = "GPIOD";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 48 16>;
> +                     };
> +
> +                     gpioe: gpio@58021000 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x1000 0x400>;
> +                             clocks = <&rcc GPIOE_CK>;
> +                             st,bank-name = "GPIOE";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 64 16>;
> +                     };
> +
> +                     gpiof: gpio@58021400 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x1400 0x400>;
> +                             clocks = <&rcc GPIOF_CK>;
> +                             st,bank-name = "GPIOF";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 80 16>;
> +                     };
> +
> +                     gpiog: gpio@58021800 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x1800 0x400>;
> +                             clocks = <&rcc GPIOG_CK>;
> +                             st,bank-name = "GPIOG";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 96 16>;
> +                     };
> +
> +                     gpioh: gpio@58021c00 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x1c00 0x400>;
> +                             clocks = <&rcc GPIOH_CK>;
> +                             st,bank-name = "GPIOH";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 112 16>;
> +                     };
> +
> +                     gpioi: gpio@58022000 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x2000 0x400>;
> +                             clocks = <&rcc GPIOI_CK>;
> +                             st,bank-name = "GPIOI";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 128 16>;
> +                     };
> +
> +                     gpioj: gpio@58022400 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x2400 0x400>;
> +                             clocks = <&rcc GPIOJ_CK>;
> +                             st,bank-name = "GPIOJ";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <16>;
> +                             gpio-ranges = <&pinctrl 0 144 16>;
> +                     };
> +
> +                     gpiok: gpio@58022800 {
> +                             gpio-controller;
> +                             #gpio-cells = <2>;
> +                             reg = <0x2800 0x400>;
> +                             clocks = <&rcc GPIOK_CK>;
> +                             st,bank-name = "GPIOK";
> +                             interrupt-controller;
> +                             #interrupt-cells = <2>;
> +                             ngpios = <8>;
> +                             gpio-ranges = <&pinctrl 0 160 8>;
> +                     };
> +             };
>       };
>  };
>  
> diff --git a/arch/arm/dts/stm32h743i-disco.dts 
> b/arch/arm/dts/stm32h743i-disco.dts
> index 7927310..3a01ebd 100644
> --- a/arch/arm/dts/stm32h743i-disco.dts
> +++ b/arch/arm/dts/stm32h743i-disco.dts
> @@ -6,7 +6,7 @@
>  
>  /dts-v1/;
>  #include "stm32h743.dtsi"
> -#include "stm32h743-pinctrl.dtsi"
> +#include "stm32h7-pinctrl.dtsi"
>  
>  / {
>       model = "STMicroelectronics STM32H743i-Discovery board";
> diff --git a/arch/arm/dts/stm32h743i-eval.dts 
> b/arch/arm/dts/stm32h743i-eval.dts
> index 8f39817..38cc7fa 100644
> --- a/arch/arm/dts/stm32h743i-eval.dts
> +++ b/arch/arm/dts/stm32h743i-eval.dts
> @@ -42,7 +42,7 @@
>  
>  /dts-v1/;
>  #include "stm32h743.dtsi"
> -#include "stm32h743-pinctrl.dtsi"
> +#include "stm32h7-pinctrl.dtsi"
>  
>  / {
>       model = "STMicroelectronics STM32H743i-EVAL board";
> 

Applied to u-boot-stm/master

Thanks
Patrice

Reply via email to