Hi Dillon

On 4/9/21 9:28 AM, [email protected] wrote:
> From: dillon min <[email protected]>
> 
> This patchset has following changes:
> 
> - introduce stm32h750.dtsi to support stm32h750 value line
> - add pin groups for usart3/uart4/spi1/sdmmc2
> - add stm32h750i-art-pi.dtb (arch/arm/boot/dts/Makefile)
> - add stm32h750i-art-pi.dts to support art-pi board
> - add stm32h750i-art-pi-u-boot.dtsi to support art-pi board (u-boot)
> 
> art-pi board component:
> - 8MiB qspi flash
> - 16MiB spi flash
> - 32MiB sdram
> - ap6212 wifi&bt&fm
> 
> the detail board information can be found at:
> https://art-pi.gitee.io/website/
> 
> Signed-off-by: dillon min <[email protected]>
> Reviewed-by: Patrice Chotard <[email protected]>
> ---
> v5: no changes
> 
>  arch/arm/dts/Makefile                      |   3 +-
>  arch/arm/dts/stm32h7-pinctrl.dtsi          |  89 ++++++++++++++
>  arch/arm/dts/stm32h750.dtsi                |   5 +
>  arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi |  81 +++++++++++++
>  arch/arm/dts/stm32h750i-art-pi.dts         | 188 
> +++++++++++++++++++++++++++++
>  include/dt-bindings/memory/stm32-sdram.h   |   2 +
>  6 files changed, 367 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/dts/stm32h750.dtsi
>  create mode 100644 arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi
>  create mode 100644 arch/arm/dts/stm32h750i-art-pi.dts
> 
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index c671082..0f54801 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -454,7 +454,8 @@ dtb-$(CONFIG_STM32F7) += stm32f746-disco.dtb \
>       stm32f769-disco.dtb \
>       stm32746g-eval.dtb
>  dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \
> -     stm32h743i-eval.dtb
> +     stm32h743i-eval.dtb \
> +     stm32h750i-art-pi.dtb
>  
>  dtb-$(CONFIG_MACH_SUN4I) += \
>       sun4i-a10-a1000.dtb \
> diff --git a/arch/arm/dts/stm32h7-pinctrl.dtsi 
> b/arch/arm/dts/stm32h7-pinctrl.dtsi
> index f6968b5..aefa324 100644
> --- a/arch/arm/dts/stm32h7-pinctrl.dtsi
> +++ b/arch/arm/dts/stm32h7-pinctrl.dtsi
> @@ -137,6 +137,80 @@
>               };
>       };
>  
> +     sdmmc2_b4_pins_a: sdmmc2-b4-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('B', 14, AF9)>, /* SDMMC1_D0 */
> +                              <STM32_PINMUX('B', 15, AF9)>, /* SDMMC1_D1 */
> +                              <STM32_PINMUX('B', 3, AF9)>, /* SDMMC1_D2 */
> +                              <STM32_PINMUX('B', 4, AF9)>, /* SDMMC1_D3 */
> +                              <STM32_PINMUX('D', 6, AF11)>, /* SDMMC1_CK */
> +                              <STM32_PINMUX('D', 7, AF11)>; /* SDMMC1_CMD */
> +                     slew-rate = <3>;
> +                     drive-push-pull;
> +                     bias-disable;
> +             };
> +     };
> +
> +     sdmmc2_b4_od_pins_a: sdmmc2-b4-od-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('B', 14, AF9)>, /* SDMMC2_D0 */
> +                              <STM32_PINMUX('B', 15, AF9)>, /* SDMMC1_D1 */
> +                              <STM32_PINMUX('B', 3, AF9)>, /* SDMMC1_D2 */
> +                              <STM32_PINMUX('B', 4, AF9)>, /* SDMMC1_D3 */
> +                              <STM32_PINMUX('D', 6, AF11)>; /* SDMMC1_CK */
> +                     slew-rate = <3>;
> +                     drive-push-pull;
> +                     bias-disable;
> +             };
> +             pins2{
> +                     pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC1_CMD */
> +                     slew-rate = <3>;
> +                     drive-open-drain;
> +                     bias-disable;
> +             };
> +     };
> +
> +     sdmmc2_b4_sleep_pins_a: sdmmc2-b4-sleep-0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('B', 14, ANALOG)>, /* SDMMC1_D0 
> */
> +                              <STM32_PINMUX('B', 15, ANALOG)>, /* SDMMC1_D1 
> */
> +                              <STM32_PINMUX('B', 3, ANALOG)>, /* SDMMC1_D2 */
> +                              <STM32_PINMUX('B', 4, ANALOG)>, /* SDMMC1_D3 */
> +                              <STM32_PINMUX('D', 6, ANALOG)>, /* SDMMC1_CK */
> +                              <STM32_PINMUX('D', 7, ANALOG)>; /* SDMMC1_CMD 
> */
> +             };
> +     };
> +
> +     spi1_pins: spi1-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('A', 5, AF5)>,
> +                             /* SPI1_CLK */
> +                              <STM32_PINMUX('B', 5, AF5)>;
> +                             /* SPI1_MOSI */
> +                     bias-disable;
> +                     drive-push-pull;
> +                     slew-rate = <2>;
> +             };
> +             pins2 {
> +                     pinmux = <STM32_PINMUX('G', 9, AF5)>;
> +                             /* SPI1_MISO */
> +                     bias-disable;
> +             };
> +     };
> +
> +     uart4_pins: uart4-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('A', 0, AF8)>; /* UART4_TX */
> +                     bias-disable;
> +                     drive-push-pull;
> +                     slew-rate = <0>;
> +             };
> +             pins2 {
> +                     pinmux = <STM32_PINMUX('I', 9, AF8)>; /* UART4_RX */
> +                     bias-disable;
> +             };
> +     };
> +
>       usart1_pins: usart1-0 {
>               pins1 {
>                       pinmux = <STM32_PINMUX('B', 14, AF4)>; /* USART1_TX */
> @@ -163,6 +237,21 @@
>               };
>       };
>  
> +     usart3_pins: usart3-0 {
> +             pins1 {
> +                     pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */
> +                              <STM32_PINMUX('D', 12, AF7)>; /* USART3_RTS_DE 
> */
> +                     bias-disable;
> +                     drive-push-pull;
> +                     slew-rate = <0>;
> +             };
> +             pins2 {
> +                     pinmux = <STM32_PINMUX('B', 11, AF7)>, /* USART3_RX */
> +                              <STM32_PINMUX('D', 11, AF7)>; /* 
> USART3_CTS_NSS */
> +                     bias-disable;
> +             };
> +     };
> +
>       usbotg_hs_pins_a: usbotg-hs-0 {
>               pins {
>                       pinmux = <STM32_PINMUX('H', 4, AF10)>,  /* ULPI_NXT */
> diff --git a/arch/arm/dts/stm32h750.dtsi b/arch/arm/dts/stm32h750.dtsi
> new file mode 100644
> index 0000000..99533f3
> --- /dev/null
> +++ b/arch/arm/dts/stm32h750.dtsi
> @@ -0,0 +1,5 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
> +/* Copyright (C) STMicroelectronics 2021 - All Rights Reserved */
> +
> +#include "stm32h743.dtsi"
> +
> diff --git a/arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi 
> b/arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi
> new file mode 100644
> index 0000000..326a553
> --- /dev/null
> +++ b/arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi
> @@ -0,0 +1,81 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +#include <stm32h7-u-boot.dtsi>
> +
> +&fmc {
> +     /*
> +      * Memory configuration from sdram datasheet W9825G6KH
> +      * first bank is bank@0
> +      * second bank is bank@1
> +      */
> +     bank1: bank@0 {
> +             st,sdram-control = /bits/ 8 <NO_COL_9
> +                                          NO_ROW_13
> +                                          MWIDTH_16
> +                                          BANKS_4
> +                                          CAS_2
> +                                          SDCLK_3
> +                                          RD_BURST_EN
> +                                          RD_PIPE_DL_0>;
> +             st,sdram-timing = /bits/ 8 <TMRD_2
> +                                         TXSR_6
> +                                         TRAS_6
> +                                         TRC_6
> +                                         TRP_2
> +                                         TWR_2
> +                                         TRCD_2>;
> +             st,sdram-refcount = <677>;
> +     };
> +};
> +
> +&pinctrl {
> +     fmc_pins: fmc@0 {
> +             pins {
> +                     pinmux = <STM32_PINMUX('D', 0, AF12)>,
> +                              <STM32_PINMUX('D', 1, AF12)>,
> +                              <STM32_PINMUX('D', 8, AF12)>,
> +                              <STM32_PINMUX('D', 9, AF12)>,
> +                              <STM32_PINMUX('D',10, AF12)>,
> +                              <STM32_PINMUX('D',14, AF12)>,
> +                              <STM32_PINMUX('D',15, AF12)>,
> +
> +                              <STM32_PINMUX('E', 0, AF12)>,
> +                              <STM32_PINMUX('E', 1, AF12)>,
> +                              <STM32_PINMUX('E', 7, AF12)>,
> +                              <STM32_PINMUX('E', 8, AF12)>,
> +                              <STM32_PINMUX('E', 9, AF12)>,
> +                              <STM32_PINMUX('E',10, AF12)>,
> +                              <STM32_PINMUX('E',11, AF12)>,
> +                              <STM32_PINMUX('E',12, AF12)>,
> +                              <STM32_PINMUX('E',13, AF12)>,
> +                              <STM32_PINMUX('E',14, AF12)>,
> +                              <STM32_PINMUX('E',15, AF12)>,
> +
> +                              <STM32_PINMUX('F', 0, AF12)>,
> +                              <STM32_PINMUX('F', 1, AF12)>,
> +                              <STM32_PINMUX('F', 2, AF12)>,
> +                              <STM32_PINMUX('F', 3, AF12)>,
> +                              <STM32_PINMUX('F', 4, AF12)>,
> +                              <STM32_PINMUX('F', 5, AF12)>,
> +                              <STM32_PINMUX('F',11, AF12)>,
> +                              <STM32_PINMUX('F',12, AF12)>,
> +                              <STM32_PINMUX('F',13, AF12)>,
> +                              <STM32_PINMUX('F',14, AF12)>,
> +                              <STM32_PINMUX('F',15, AF12)>,
> +
> +                              <STM32_PINMUX('G', 0, AF12)>,
> +                              <STM32_PINMUX('G', 1, AF12)>,
> +                              <STM32_PINMUX('G', 2, AF12)>,
> +                              <STM32_PINMUX('G', 4, AF12)>,
> +                              <STM32_PINMUX('G', 5, AF12)>,
> +                              <STM32_PINMUX('G', 8, AF12)>,
> +                              <STM32_PINMUX('G',15, AF12)>,
> +
> +                              <STM32_PINMUX('H', 5, AF12)>,
> +                              <STM32_PINMUX('C', 2, AF12)>,
> +                              <STM32_PINMUX('C', 3, AF12)>;
> +
> +                     slew-rate = <3>;
> +             };
> +     };
> +};
> diff --git a/arch/arm/dts/stm32h750i-art-pi.dts 
> b/arch/arm/dts/stm32h750i-art-pi.dts
> new file mode 100644
> index 0000000..2a4d1cb
> --- /dev/null
> +++ b/arch/arm/dts/stm32h750i-art-pi.dts
> @@ -0,0 +1,188 @@
> +// SPDX-License-Identifier: GPL-2.0+ OR X11
> +/*
> + * Copyright 2021 - Dillon Min <[email protected]>
> + *
> + */
> +
> +/dts-v1/;
> +#include "stm32h750.dtsi"
> +#include "stm32h7-pinctrl.dtsi"
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> +     model = "RT-Thread STM32H750i-ART-PI board";
> +     compatible = "st,stm32h750i-art-pi", "st,stm32h750";
> +
> +     chosen {
> +             bootargs = "root=/dev/ram";
> +             stdout-path = "serial0:2000000n8";
> +     };
> +
> +     memory@c0000000 {
> +             device_type = "memory";
> +             reg = <0xc0000000 0x2000000>;
> +     };
> +
> +     reserved-memory {
> +             #address-cells = <1>;
> +             #size-cells = <1>;
> +             ranges;
> +
> +             linux,cma {
> +                     compatible = "shared-dma-pool";
> +                     no-map;
> +                     size = <0x100000>;
> +                     linux,dma-default;
> +             };
> +     };
> +
> +     aliases {
> +             serial0 = &uart4;
> +             serial1 = &usart3;
> +     };
> +
> +     leds {
> +             compatible = "gpio-leds";
> +             led-red {
> +                     gpios = <&gpioi 8 0>;
> +             };
> +             led-green {
> +                     gpios = <&gpioc 15 0>;
> +                     linux,default-trigger = "heartbeat";
> +             };
> +     };
> +
> +     v3v3: regulator-v3v3 {
> +             compatible = "regulator-fixed";
> +             regulator-name = "v3v3";
> +             regulator-min-microvolt = <3300000>;
> +             regulator-max-microvolt = <3300000>;
> +             regulator-always-on;
> +     };
> +
> +     wlan_pwr: regulator-wlan {
> +             compatible = "regulator-fixed";
> +
> +             regulator-name = "wl-reg";
> +             regulator-min-microvolt = <3300000>;
> +             regulator-max-microvolt = <3300000>;
> +
> +             gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
> +             enable-active-high;
> +     };
> +};
> +
> +&clk_hse {
> +     clock-frequency = <25000000>;
> +};
> +
> +&dma1 {
> +     status = "okay";
> +};
> +
> +&dma2 {
> +     status = "okay";
> +};
> +
> +&mac {
> +     status = "disabled";
> +     pinctrl-0       = <&ethernet_rmii>;
> +     pinctrl-names   = "default";
> +     phy-mode        = "rmii";
> +     phy-handle      = <&phy0>;
> +
> +     mdio0 {
> +             #address-cells = <1>;
> +             #size-cells = <0>;
> +             compatible = "snps,dwmac-mdio";
> +             phy0: ethernet-phy@0 {
> +                     reg = <0>;
> +             };
> +     };
> +};
> +
> +&sdmmc1 {
> +     pinctrl-names = "default", "opendrain", "sleep";
> +     pinctrl-0 = <&sdmmc1_b4_pins_a>;
> +     pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
> +     pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
> +     broken-cd;
> +     st,neg-edge;
> +     bus-width = <4>;
> +     vmmc-supply = <&v3v3>;
> +     status = "okay";
> +};
> +
> +&sdmmc2 {
> +     pinctrl-names = "default", "opendrain", "sleep";
> +     pinctrl-0 = <&sdmmc2_b4_pins_a>;
> +     pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
> +     pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
> +     broken-cd;
> +     non-removable;
> +     st,neg-edge;
> +     bus-width = <4>;
> +     vmmc-supply = <&wlan_pwr>;
> +     status = "okay";
> +
> +     #address-cells = <1>;
> +     #size-cells = <0>;
> +     brcmf: bcrmf@1 {
> +             reg = <1>;
> +             compatible = "brcm,bcm4329-fmac";
> +     };
> +};
> +
> +&spi1 {
> +     status = "okay";
> +     pinctrl-0 = <&spi1_pins>;
> +     pinctrl-names = "default";
> +     cs-gpios = <&gpioa 4 GPIO_ACTIVE_LOW>;
> +     dmas = <&dmamux1 37 0x400 0x05>,
> +            <&dmamux1 38 0x400 0x05>;
> +     dma-names = "rx", "tx";
> +
> +     flash@0 {
> +             #address-cells = <1>;
> +             #size-cells = <1>;
> +             compatible = "winbond,w25q128", "jedec,spi-nor";
> +             reg = <0>;
> +             spi-max-frequency = <80000000>;
> +
> +             partition@0 {
> +                     label = "root filesystem";
> +                     reg = <0 0x1000000>;
> +             };
> +     };
> +};
> +
> +&usart2 {
> +     pinctrl-0 = <&usart2_pins>;
> +     pinctrl-names = "default";
> +     status = "disabled";
> +};
> +
> +&usart3 {
> +     pinctrl-names = "default";
> +     pinctrl-0 = <&usart3_pins>;
> +     dmas = <&dmamux1 45 0x400 0x05>,
> +            <&dmamux1 46 0x400 0x05>;
> +     dma-names = "rx", "tx";
> +     st,hw-flow-ctrl;
> +     status = "okay";
> +
> +     bluetooth {
> +             compatible = "brcm,bcm43438-bt";
> +             host-wakeup-gpios = <&gpioc 0 GPIO_ACTIVE_HIGH>;
> +             device-wakeup-gpios = <&gpioi 10 GPIO_ACTIVE_HIGH>;
> +             shutdown-gpios = <&gpioi 11 GPIO_ACTIVE_HIGH>;
> +             max-speed = <115200>;
> +     };
> +};
> +
> +&uart4 {
> +     pinctrl-0 = <&uart4_pins>;
> +     pinctrl-names = "default";
> +     status = "okay";
> +};
> diff --git a/include/dt-bindings/memory/stm32-sdram.h 
> b/include/dt-bindings/memory/stm32-sdram.h
> index ab91d2b..90ef2e1 100644
> --- a/include/dt-bindings/memory/stm32-sdram.h
> +++ b/include/dt-bindings/memory/stm32-sdram.h
> @@ -34,8 +34,10 @@
>  #define TXSR_1               (1 - 1)
>  #define TXSR_6               (6 - 1)
>  #define TXSR_7               (7 - 1)
> +#define TXSR_8               (8 - 1)
>  #define TRAS_1               (1 - 1)
>  #define TRAS_4               (4 - 1)
> +#define TRAS_6               (6 - 1)
>  #define TRC_6                (6 - 1)
>  #define TWR_1                (1 - 1)
>  #define TWR_2                (2 - 1)
> 

Applied to u-boot-stm/master

Thanks
Patrice

Reply via email to