[PATCH 1/2] ARM: dts: stm32: Synchronize DHCOR DTs with Linux 5.15.12
Patrice CHOTARD
patrice.chotard at foss.st.com
Mon Jan 24 13:15:38 CET 2022
Hi Marek
On 12/30/21 23:46, Marek Vasut wrote:
> Synchronize DH DHCOR DTs with Linux commit 25960cafa06e ("Linux 5.15.12").
> There is no functional change to the resulting DTs. The eeprom0 alias is
> now reinstated in SoM u-boot dtsi, the PHY reset GPIO is reinstated in AV96
> u-boot dtsi.
>
> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Patrice Chotard <patrice.chotard at foss.st.com>
> Cc: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> arch/arm/dts/Makefile | 1 -
> arch/arm/dts/stm32mp157a-avenger96.dts | 8 -
> arch/arm/dts/stm32mp157a-dhcor-avenger96.dts | 38 ++
> .../stm32mp15xx-dhcor-avenger96-u-boot.dtsi | 2 +
> arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 202 +-------
> arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi | 431 ++++++++++++++++++
> arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi | 7 +-
> ...-io3v3.dtsi => stm32mp15xx-dhcor-som.dtsi} | 30 +-
> arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 8 +
> 9 files changed, 503 insertions(+), 224 deletions(-)
> delete mode 100644 arch/arm/dts/stm32mp157a-avenger96.dts
> create mode 100644 arch/arm/dts/stm32mp157a-dhcor-avenger96.dts
> create mode 100644 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi
> rename arch/arm/dts/{stm32mp15xx-dhcor-io3v3.dtsi => stm32mp15xx-dhcor-som.dtsi} (91%)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index b3e2a9c9d77..03064632999 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1098,7 +1098,6 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
>
> dtb-$(CONFIG_STM32MP15x) += \
> stm32mp157a-dk1.dtb \
> - stm32mp157a-avenger96.dtb \
> stm32mp157a-icore-stm32mp1-ctouch2.dtb \
> stm32mp157a-icore-stm32mp1-edimm2.2.dtb \
> stm32mp157a-microgea-stm32mp1-microdev2.0.dtb \
> diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp157a-avenger96.dts
> deleted file mode 100644
> index 9c165104fbe..00000000000
> --- a/arch/arm/dts/stm32mp157a-avenger96.dts
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
> -/*
> - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved
> - * Author: Manivannan Sadhasivam <manivannan.sadhasivam at linaro.org>
> - */
> -
> -/* This is kept for backward compatibility and will be removed */
> -#include "stm32mp15xx-dhcor-avenger96.dts"
> diff --git a/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts b/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts
> new file mode 100644
> index 00000000000..2e3c9fbb4eb
> --- /dev/null
> +++ b/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts
> @@ -0,0 +1,38 @@
> +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
> +/*
> + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved
> + * Author: Manivannan Sadhasivam <manivannan.sadhasivam at linaro.org>
> + * Copyright (C) 2020 Marek Vasut <marex at denx.de>
> + *
> + * DHCOR STM32MP1 variant:
> + * DHCR-STM32MP157A-C065-R102-V18-SPI-C-01LG
> + * DHCOR PCB number: 586-100 or newer
> + * Avenger96 PCB number: 588-200 or newer
> + */
> +
> +/dts-v1/;
> +
> +#include "stm32mp157.dtsi"
> +#include "stm32mp15xc.dtsi"
> +#include "stm32mp15xx-dhcor-som.dtsi"
> +#include "stm32mp15xx-dhcor-avenger96.dtsi"
> +
> +/ {
> + model = "Arrow Electronics STM32MP157A Avenger96 board";
> + compatible = "arrow,stm32mp157a-avenger96", "dh,stm32mp157a-dhcor-som",
> + "st,stm32mp157";
> +};
> +
> +&m_can1 {
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&m_can1_pins_b>;
> + pinctrl-1 = <&m_can1_sleep_pins_b>;
> + status = "disabled";
> +};
> +
> +&m_can2 {
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&m_can2_pins_a>;
> + pinctrl-1 = <&m_can2_sleep_pins_a>;
> + status = "disabled";
> +};
> diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi
> index c96eba99c5e..6e6543b5e4a 100644
> --- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi
> @@ -21,6 +21,8 @@
>
>
> ðernet0 {
> + phy-reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>;
> +
> mdio0 {
> ethernet-phy at 7 {
> reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>;
> diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
> index 0e860e5cf88..76ac5a873c1 100644
> --- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
> +++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
> @@ -7,206 +7,12 @@
>
> /dts-v1/;
>
> -#include "stm32mp15xx-dhcor-io1v8.dtsi"
> -#include "stm32mp15xx-dhcor-avenger96-u-boot.dtsi"
> +#include "stm32mp151.dtsi"
> +#include "stm32mp15xc.dtsi"
> +#include "stm32mp15xx-dhcor-som.dtsi"
> +#include "stm32mp15xx-dhcor-avenger96.dtsi"
>
> / {
> model = "Arrow Electronics STM32MP15xx Avenger96 board";
> compatible = "arrow,stm32mp15xx-avenger96", "st,stm32mp15x";
> -
> - aliases {
> - eeprom0 = &eeprom0;
> - ethernet0 = ðernet0;
> - mmc0 = &sdmmc1;
> - serial0 = &uart4;
> - serial1 = &uart7;
> - };
> -
> - chosen {
> - stdout-path = "serial0:115200n8";
> - };
> -
> - led {
> - compatible = "gpio-leds";
> - led1 {
> - label = "green:user0";
> - gpios = <&gpioz 7 GPIO_ACTIVE_HIGH>;
> - linux,default-trigger = "heartbeat";
> - default-state = "off";
> - };
> -
> - led2 {
> - label = "green:user1";
> - gpios = <&gpiof 3 GPIO_ACTIVE_HIGH>;
> - linux,default-trigger = "mmc0";
> - default-state = "off";
> - };
> -
> - led3 {
> - label = "green:user2";
> - gpios = <&gpiog 0 GPIO_ACTIVE_HIGH>;
> - linux,default-trigger = "mmc1";
> - default-state = "off";
> - };
> -
> - led4 {
> - label = "green:user3";
> - gpios = <&gpiog 1 GPIO_ACTIVE_HIGH>;
> - linux,default-trigger = "none";
> - default-state = "off";
> - panic-indicator;
> - };
> -
> - led5 {
> - label = "yellow:wifi";
> - gpios = <&gpioz 3 GPIO_ACTIVE_HIGH>;
> - linux,default-trigger = "phy0tx";
> - default-state = "off";
> - };
> -
> - led6 {
> - label = "blue:bt";
> - gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>;
> - linux,default-trigger = "bluetooth-power";
> - default-state = "off";
> - };
> - };
> -
> - sd_switch: regulator-sd_switch {
> - compatible = "regulator-gpio";
> - regulator-name = "sd_switch";
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <2900000>;
> - regulator-type = "voltage";
> - regulator-always-on;
> -
> - gpios = <&gpioi 5 GPIO_ACTIVE_HIGH>;
> - gpios-states = <0>;
> - states = <1800000 0x1>,
> - <2900000 0x0>;
> - };
> -};
> -
> -ðernet0 {
> - status = "okay";
> - pinctrl-0 = <ðernet0_rgmii_pins_c>;
> - pinctrl-1 = <ðernet0_rgmii_sleep_pins_c>;
> - pinctrl-names = "default", "sleep";
> - phy-mode = "rgmii";
> - max-speed = <1000>;
> - phy-handle = <&phy0>;
> - phy-reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>;
> -
> - mdio0 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "snps,dwmac-mdio";
> - phy0: ethernet-phy at 7 {
> - reg = <7>;
> - };
> - };
> -};
> -
> -&i2c1 { /* X6 I2C1 */
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2c1_pins_b>;
> - i2c-scl-rising-time-ns = <185>;
> - i2c-scl-falling-time-ns = <20>;
> - status = "okay";
> - /delete-property/dmas;
> - /delete-property/dma-names;
> -};
> -
> -&i2c2 { /* X6 I2C2 */
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2c2_pins_c>;
> - i2c-scl-rising-time-ns = <185>;
> - i2c-scl-falling-time-ns = <20>;
> - status = "okay";
> - /delete-property/dmas;
> - /delete-property/dma-names;
> -};
> -
> -&i2c4 {
> - eeprom0: eeprom at 53 {
> - compatible = "atmel,24c02";
> - reg = <0x53>;
> - pagesize = <16>;
> - };
> -};
> -
> -&sdmmc1 {
> - pinctrl-names = "default", "opendrain", "sleep";
> - pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>;
> - pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_b>;
> - pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_b>;
> - disable-wp;
> - st,sig-dir;
> - st,neg-edge;
> - st,use-ckin;
> - bus-width = <4>;
> - vmmc-supply = <&vdd_sd>;
> - vqmmc-supply = <&sd_switch>;
> - status = "okay";
> -};
> -
> -&sdmmc2 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_c>;
> - non-removable;
> - no-sd;
> - no-sdio;
> - st,neg-edge;
> - bus-width = <8>;
> - vmmc-supply = <&v3v3>;
> - mmc-ddr-3_3v;
> - status = "okay";
> -};
> -
> -&spi2 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&spi2_pins_a>;
> - status = "okay";
> -};
> -
> -&uart4 {
> - /* On Low speed expansion header */
> - label = "LS-UART1";
> - pinctrl-names = "default";
> - pinctrl-0 = <&uart4_pins_b>;
> - status = "okay";
> -};
> -
> -&uart7 {
> - /* On Low speed expansion header */
> - label = "LS-UART0";
> - pinctrl-names = "default";
> - pinctrl-0 = <&uart7_pins_a>;
> - status = "okay";
> -};
> -
> -&usbh_ehci {
> - phys = <&usbphyc_port0>;
> - phy-names = "usb";
> - status = "okay";
> -};
> -
> -&usbotg_hs {
> - pinctrl-0 = <&usbotg_hs_pins_a>;
> - pinctrl-names = "default";
> - phys = <&usbphyc_port1 0>;
> - phy-names = "usb2-phy";
> - status = "okay";
> -};
> -
> -&usbphyc {
> - status = "okay";
> -};
> -
> -&usbphyc_port0 {
> - phy-supply = <&vdd_usb>;
> -};
> -
> -&usbphyc_port1 {
> - phy-supply = <&vdd_usb>;
> };
> diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi
> new file mode 100644
> index 00000000000..6885948f302
> --- /dev/null
> +++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi
> @@ -0,0 +1,431 @@
> +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
> +/*
> + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved
> + * Author: Manivannan Sadhasivam <manivannan.sadhasivam at linaro.org>
> + * Copyright (C) 2020 Marek Vasut <marex at denx.de>
> + */
> +
> +/* Avenger96 uses DHCOR SoM configured for 1V8 IO operation */
> +#include "stm32mp15xx-dhcor-io1v8.dtsi"
> +
> +/ {
> + aliases {
> + ethernet0 = ðernet0;
> + mmc0 = &sdmmc1;
> + serial0 = &uart4;
> + serial1 = &uart7;
> + serial2 = &usart2;
> + spi0 = &qspi;
> + };
> +
> + /* XTal Q1 */
> + cec_clock: clk-cec-fixed {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + clock-frequency = <24000000>;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + hdmi-out {
> + compatible = "hdmi-connector";
> + type = "a";
> +
> + port {
> + hdmi_con: endpoint {
> + remote-endpoint = <&adv7513_out>;
> + };
> + };
> + };
> +
> + led {
> + compatible = "gpio-leds";
> + led1 {
> + label = "green:user0";
> + gpios = <&gpioz 7 GPIO_ACTIVE_HIGH>;
> + linux,default-trigger = "heartbeat";
> + default-state = "off";
> + };
> +
> + led2 {
> + label = "green:user1";
> + gpios = <&gpiof 3 GPIO_ACTIVE_HIGH>;
> + linux,default-trigger = "mmc0";
> + default-state = "off";
> + };
> +
> + led3 {
> + label = "green:user2";
> + gpios = <&gpiog 0 GPIO_ACTIVE_HIGH>;
> + linux,default-trigger = "mmc1";
> + default-state = "off";
> + };
> +
> + led4 {
> + label = "green:user3";
> + gpios = <&gpiog 1 GPIO_ACTIVE_HIGH>;
> + linux,default-trigger = "none";
> + default-state = "off";
> + panic-indicator;
> + };
> + };
> +
> + sd_switch: regulator-sd_switch {
> + compatible = "regulator-gpio";
> + regulator-name = "sd_switch";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <2900000>;
> + regulator-type = "voltage";
> + regulator-always-on;
> +
> + gpios = <&gpioi 5 GPIO_ACTIVE_HIGH>;
> + gpios-states = <0>;
> + states = <1800000 0x1>,
> + <2900000 0x0>;
> + };
> +
> + sound {
> + compatible = "audio-graph-card";
> + label = "STM32MP1-AV96-HDMI";
> + dais = <&sai2a_port>;
> + status = "okay";
> + };
> +
> + wlan_pwr: regulator-wlan {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "wl-reg";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> +
> + gpios = <&gpioz 3 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + };
> +};
> +
> +&adc {
> + pinctrl-names = "default";
> + pinctrl-0 = <&adc12_ain_pins_b>;
> + vdd-supply = <&vdd>;
> + vdda-supply = <&vdda>;
> + vref-supply = <&vdda>;
> + status = "okay";
> +
> + adc1: adc at 0 {
> + st,adc-channels = <0 1 6>;
> + st,min-sample-time-nsecs = <5000>;
> + status = "okay";
> + };
> +
> + adc2: adc at 100 {
> + st,adc-channels = <0 1 2>;
> + st,min-sample-time-nsecs = <5000>;
> + status = "okay";
> + };
> +};
> +
> +ðernet0 {
> + status = "okay";
> + pinctrl-0 = <ðernet0_rgmii_pins_c>;
> + pinctrl-1 = <ðernet0_rgmii_sleep_pins_c>;
> + pinctrl-names = "default", "sleep";
> + phy-mode = "rgmii";
> + max-speed = <1000>;
> + phy-handle = <&phy0>;
> +
> + mdio0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "snps,dwmac-mdio";
> + reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>;
> + reset-delay-us = <1000>;
> +
> + phy0: ethernet-phy at 7 {
> + reg = <7>;
> +
> + rxc-skew-ps = <1500>;
> + rxdv-skew-ps = <540>;
> + rxd0-skew-ps = <420>;
> + rxd1-skew-ps = <420>;
> + rxd2-skew-ps = <420>;
> + rxd3-skew-ps = <420>;
> +
> + txc-skew-ps = <1440>;
> + txen-skew-ps = <540>;
> + txd0-skew-ps = <420>;
> + txd1-skew-ps = <420>;
> + txd2-skew-ps = <420>;
> + txd3-skew-ps = <420>;
> + };
> + };
> +};
> +
> +&gpioa {
> + gpio-line-names = "", "", "", "",
> + "", "", "", "",
> + "", "", "", "AV96-K",
> + "AV96-I", "", "AV96-A", "";
> +};
> +
> +&gpiob {
> + gpio-line-names = "", "", "", "",
> + "", "AV96-J", "", "",
> + "", "", "", "AV96-B",
> + "", "AV96-L", "", "";
> +};
> +
> +&gpioc {
> + gpio-line-names = "", "", "", "AV96-C",
> + "", "", "", "",
> + "", "", "", "",
> + "", "", "", "";
> +};
> +
> +&gpiod {
> + gpio-line-names = "", "", "", "",
> + "", "", "", "",
> + "AV96-D", "", "", "",
> + "", "", "AV96-E", "AV96-F";
> +};
> +
> +&gpiof {
> + gpio-line-names = "", "", "", "",
> + "", "", "", "",
> + "", "", "", "",
> + "AV96-G", "AV96-H", "", "";
> +};
> +
> +&i2c1 { /* X6 I2C1 */
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c1_pins_b>;
> + i2c-scl-rising-time-ns = <185>;
> + i2c-scl-falling-time-ns = <20>;
> + status = "okay";
> + /delete-property/dmas;
> + /delete-property/dma-names;
> +};
> +
> +&i2c2 { /* X6 I2C2 */
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2c2_pins_c>;
> + i2c-scl-rising-time-ns = <185>;
> + i2c-scl-falling-time-ns = <20>;
> + status = "okay";
> + /delete-property/dmas;
> + /delete-property/dma-names;
> +};
> +
> +&i2c4 {
> + hdmi-transmitter at 3d {
> + compatible = "adi,adv7513";
> + reg = <0x3d>, <0x4d>, <0x2d>, <0x5d>;
> + reg-names = "main", "edid", "cec", "packet";
> + clocks = <&cec_clock>;
> + clock-names = "cec";
> +
> + avdd-supply = <&v3v3>;
> + dvdd-supply = <&v3v3>;
> + pvdd-supply = <&v3v3>;
> + dvdd-3v-supply = <&v3v3>;
> + bgvdd-supply = <&v3v3>;
> +
> + interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
> + interrupt-parent = <&gpiog>;
> +
> + status = "okay";
> +
> + adi,input-depth = <8>;
> + adi,input-colorspace = "rgb";
> + adi,input-clock = "1x";
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port at 0 {
> + reg = <0>;
> + adv7513_in: endpoint {
> + remote-endpoint = <<dc_ep0_out>;
> + };
> + };
> +
> + port at 1 {
> + reg = <1>;
> + adv7513_out: endpoint {
> + remote-endpoint = <&hdmi_con>;
> + };
> + };
> +
> + port at 2 {
> + reg = <2>;
> + adv7513_i2s0: endpoint {
> + remote-endpoint = <&sai2a_endpoint>;
> + };
> + };
> + };
> + };
> +};
> +
> +<dc {
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <<dc_pins_d>;
> + pinctrl-1 = <<dc_sleep_pins_d>;
> + status = "okay";
> +
> + port {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + ltdc_ep0_out: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&adv7513_in>;
> + };
> + };
> +};
> +
> +&sai2 {
> + clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>;
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&sai2a_pins_c>;
> + pinctrl-1 = <&sai2a_sleep_pins_c>;
> + clock-names = "pclk", "x8k", "x11k";
> + status = "okay";
> +
> + sai2a: audio-controller at 4400b004 {
> + #clock-cells = <0>;
> + dma-names = "tx";
> + clocks = <&rcc SAI2_K>;
> + clock-names = "sai_ck";
> + status = "okay";
> +
> + sai2a_port: port {
> + sai2a_endpoint: endpoint {
> + remote-endpoint = <&adv7513_i2s0>;
> + format = "i2s";
> + mclk-fs = <256>;
> + };
> + };
> + };
> +};
> +
> +&sdmmc1 {
> + pinctrl-names = "default", "opendrain", "sleep";
> + pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>;
> + pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_b>;
> + pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_b>;
> + cd-gpios = <&gpioi 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
> + disable-wp;
> + st,sig-dir;
> + st,neg-edge;
> + st,use-ckin;
> + bus-width = <4>;
> + vmmc-supply = <&vdd_sd>;
> + vqmmc-supply = <&sd_switch>;
> + status = "okay";
> +};
> +
> +&sdmmc2 {
> + pinctrl-names = "default", "opendrain", "sleep";
> + pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_c>;
> + pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_c>;
> + pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_c>;
> + bus-width = <8>;
> + mmc-ddr-1_8v;
> + no-sd;
> + no-sdio;
> + non-removable;
> + st,neg-edge;
> + vmmc-supply = <&v3v3>;
> + vqmmc-supply = <&vdd_io>;
> + status = "okay";
> +};
> +
> +&sdmmc3 {
> + pinctrl-names = "default", "opendrain", "sleep";
> + pinctrl-0 = <&sdmmc3_b4_pins_b>;
> + pinctrl-1 = <&sdmmc3_b4_od_pins_b>;
> + pinctrl-2 = <&sdmmc3_b4_sleep_pins_b>;
> + broken-cd;
> + non-removable;
> + st,neg-edge;
> + bus-width = <4>;
> + vmmc-supply = <&wlan_pwr>;
> + status = "okay";
> +
> + #address-cells = <1>;
> + #size-cells = <0>;
> + brcmf: bcrmf at 1 {
> + reg = <1>;
> + compatible = "brcm,bcm4329-fmac";
> + };
> +};
> +
> +&spi2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&spi2_pins_a>;
> + cs-gpios = <&gpioi 0 0>;
> + status = "disabled";
> + /delete-property/dmas;
> + /delete-property/dma-names;
> +};
> +
> +&uart4 {
> + /* On Low speed expansion header */
> + label = "LS-UART1";
> + pinctrl-names = "default";
> + pinctrl-0 = <&uart4_pins_b>;
> + status = "okay";
> +};
> +
> +&uart7 {
> + /* On Low speed expansion header */
> + label = "LS-UART0";
> + pinctrl-names = "default";
> + pinctrl-0 = <&uart7_pins_a>;
> + uart-has-rtscts;
> + status = "okay";
> +};
> +
> +/* Bluetooth */
> +&usart2 {
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&usart2_pins_a>;
> + pinctrl-1 = <&usart2_sleep_pins_a>;
> + st,hw-flow-ctrl;
> + status = "okay";
> +
> + bluetooth {
> + compatible = "brcm,bcm43438-bt";
> + max-speed = <3000000>;
> + shutdown-gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>;
> + };
> +};
> +
> +&usbh_ehci {
> + phys = <&usbphyc_port0>;
> + phy-names = "usb";
> + status = "okay";
> +};
> +
> +&usbotg_hs {
> + pinctrl-0 = <&usbotg_hs_pins_a>;
> + pinctrl-names = "default";
> + phy-names = "usb2-phy";
> + phys = <&usbphyc_port1 0>;
> + status = "okay";
> + vbus-supply = <&vbus_otg>;
> +};
> +
> +&usbphyc {
> + status = "okay";
> +};
> +
> +&usbphyc_port0 {
> + phy-supply = <&vdd_usb>;
> +};
> +
> +&usbphyc_port1 {
> + phy-supply = <&vdd_usb>;
> +};
> diff --git a/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
> index 75435424d67..75172314d7a 100644
> --- a/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
> +++ b/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
> @@ -1,12 +1,12 @@
> // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
> /*
> + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved
> + * Author: Manivannan Sadhasivam <manivannan.sadhasivam at linaro.org>
> * Copyright (C) 2020 Marek Vasut <marex at denx.de>
> */
>
> -#include "stm32mp15xx-dhcor-io3v3.dtsi"
> -
> / {
> - /* Enpirion EP3A8LQI U2 on the 1V8 IO DHCOR */
> + /* Enpirion EP3A8LQI U2 on the DHCOR */
> vdd_io: regulator-buck-io {
> compatible = "regulator-fixed";
> regulator-name = "buck-io";
> @@ -20,5 +20,4 @@
>
> &pwr_regulators {
> vdd-supply = <&vdd_io>;
> - vdd_3v3_usbfs-supply = <&vdd_usb>;
> };
> diff --git a/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-som.dtsi
> similarity index 91%
> rename from arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi
> rename to arch/arm/dts/stm32mp15xx-dhcor-som.dtsi
> index 94cf80dbede..44ecc470858 100644
> --- a/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi
> +++ b/arch/arm/dts/stm32mp15xx-dhcor-som.dtsi
> @@ -4,9 +4,7 @@
> * Author: Manivannan Sadhasivam <manivannan.sadhasivam at linaro.org>
> * Copyright (C) 2020 Marek Vasut <marex at denx.de>
> */
> -/dts-v1/;
>
> -#include "stm32mp157.dtsi"
> #include "stm32mp15-pinctrl.dtsi"
> #include "stm32mp15xxac-pinctrl.dtsi"
> #include <dt-bindings/gpio/gpio.h>
> @@ -23,6 +21,14 @@
> };
> };
>
> +&crc1 {
> + status = "okay";
> +};
> +
> +&dts {
> + status = "okay";
> +};
> +
> &i2c4 {
> pinctrl-names = "default";
> pinctrl-0 = <&i2c4_pins_a>;
> @@ -35,7 +41,7 @@
> pmic: stpmic at 33 {
> compatible = "st,stpmic1";
> reg = <0x33>;
> - interrupts-extended = <&exti 55 IRQ_TYPE_EDGE_FALLING>;
> + interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>;
> interrupt-controller;
> #interrupt-cells = <2>;
> status = "okay";
> @@ -53,7 +59,7 @@
>
> vddcore: buck1 {
> regulator-name = "vddcore";
> - regulator-min-microvolt = <800000>;
> + regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1350000>;
> regulator-always-on;
> regulator-initial-mode = <0>;
> @@ -92,7 +98,6 @@
> regulator-min-microvolt = <2900000>;
> regulator-max-microvolt = <2900000>;
> interrupts = <IT_CURLIM_LDO1 0>;
> - interrupt-parent = <&pmic>;
> };
>
> v2v8: ldo2 {
> @@ -100,7 +105,6 @@
> regulator-min-microvolt = <2800000>;
> regulator-max-microvolt = <2800000>;
> interrupts = <IT_CURLIM_LDO2 0>;
> - interrupt-parent = <&pmic>;
> };
>
> vtt_ddr: ldo3 {
> @@ -114,7 +118,6 @@
> vdd_usb: ldo4 {
> regulator-name = "vdd_usb";
> interrupts = <IT_CURLIM_LDO4 0>;
> - interrupt-parent = <&pmic>;
> };
>
> vdd_sd: ldo5 {
> @@ -122,7 +125,6 @@
> regulator-min-microvolt = <2900000>;
> regulator-max-microvolt = <2900000>;
> interrupts = <IT_CURLIM_LDO5 0>;
> - interrupt-parent = <&pmic>;
> regulator-boot-on;
> };
>
> @@ -131,7 +133,6 @@
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> interrupts = <IT_CURLIM_LDO6 0>;
> - interrupt-parent = <&pmic>;
> regulator-enable-ramp-delay = <300000>;
> };
>
> @@ -143,20 +144,17 @@
> bst_out: boost {
> regulator-name = "bst_out";
> interrupts = <IT_OCP_BOOST 0>;
> - interrupt-parent = <&pmic>;
> };
>
> vbus_otg: pwr_sw1 {
> regulator-name = "vbus_otg";
> interrupts = <IT_OCP_OTG 0>;
> - interrupt-parent = <&pmic>;
> regulator-active-discharge = <1>;
> };
>
> vbus_sw: pwr_sw2 {
> regulator-name = "vbus_sw";
> interrupts = <IT_OCP_SWOUT 0>;
> - interrupt-parent = <&pmic>;
> regulator-active-discharge = <1>;
> };
> };
> @@ -173,6 +171,12 @@
> status = "disabled";
> };
> };
> +
> + eeprom at 53 {
> + compatible = "atmel,24c02";
> + reg = <0x53>;
> + pagesize = <16>;
> + };
> };
>
> &iwdg2 {
> @@ -194,7 +198,7 @@
> #size-cells = <0>;
> status = "okay";
>
> - flash0: spi-flash at 0 {
> + flash0: flash at 0 {
> compatible = "jedec,spi-nor";
> reg = <0>;
> spi-rx-bus-width = <4>;
> diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
> index 71375510b4a..338b674368a 100644
> --- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
> @@ -15,6 +15,11 @@
>
> / {
> u-boot,dm-pre-reloc;
> +
> + aliases {
> + eeprom0 = &eeprom0;
> + };
> +
> config {
> dh,ddr3-coding-gpios = <&gpiog 0 0>, <&gpiog 1 0>;
> dh,som-coding-gpios = <&gpioz 7 0>, <&gpiof 3 0>;
> @@ -28,6 +33,9 @@
> &i2c4 {
> u-boot,dm-pre-reloc;
> u-boot,dm-spl;
> +
> + eeprom0: eeprom at 53 {
> + };
> };
>
> &i2c4_pins_a {
Applied to u-boot-stm/master
Thanks
Patrice
More information about the U-Boot
mailing list