| Message ID | 20200429163743.67854-12-marex@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/12] ARM: dts: stm32: Add alternate pinmux for I2C2 pins | expand |
Hi, On Wed, Apr 29, 2020 at 06:37:43PM +0200, Marek Vasut wrote: > The Avenger96 can be populated with DH Electronics DHCOR SoM with any > STM32MP15xA variant. Add the DTs describing the remaining combinations. > Since the board is a combination of carrier board and SoM, update the > DT name, however keep the old DT for backward compatibility. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Alexandre Torgue <alexandre.torgue@st.com> > Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Patrice Chotard <patrice.chotard@st.com> > Cc: Patrick Delaunay <patrick.delaunay@st.com> > Cc: linux-stm32@st-md-mailman.stormreply.com > To: linux-arm-kernel@lists.infradead.org > --- > arch/arm/boot/dts/Makefile | 3 + > .../boot/dts/stm32mp151a-dhcor-avenger96.dts | 9 + > arch/arm/boot/dts/stm32mp151a-dhcor-som.dtsi | 8 + > .../boot/dts/stm32mp153a-dhcor-avenger96.dts | 23 + > arch/arm/boot/dts/stm32mp153a-dhcor-som.dtsi | 8 + > arch/arm/boot/dts/stm32mp157a-avenger96.dts | 416 +----------------- > .../boot/dts/stm32mp157a-dhcor-avenger96.dts | 23 + > arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi | 206 +-------- > .../boot/dts/stm32mp15xa-dhcor-avenger96.dtsi | 405 +++++++++++++++++ > ...o1v8.dtsi => stm32mp15xa-dhcor-io1v8.dtsi} | 0 > arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 209 +++++++++ > 11 files changed, 692 insertions(+), 618 deletions(-) > create mode 100644 arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts > create mode 100644 arch/arm/boot/dts/stm32mp151a-dhcor-som.dtsi > create mode 100644 arch/arm/boot/dts/stm32mp153a-dhcor-avenger96.dts > create mode 100644 arch/arm/boot/dts/stm32mp153a-dhcor-som.dtsi > create mode 100644 arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts > create mode 100644 arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi > rename arch/arm/boot/dts/{stm32mp157a-dhcor-io1v8.dtsi => stm32mp15xa-dhcor-io1v8.dtsi} (100%) > create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index f43467b02bcd..b4a4d2b0f18e 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -1029,6 +1029,9 @@ dtb-$(CONFIG_ARCH_STM32) += \ > stm32h743i-eval.dtb \ > stm32h743i-disco.dtb \ > stm32mp157a-avenger96.dtb \ > + stm32mp151a-dhcor-avenger96.dtb \ > + stm32mp153a-dhcor-avenger96.dtb \ > + stm32mp157a-dhcor-avenger96.dtb \ I'm not really sure if keeping SoM name is a good practice here. Since the board is sold as "Avenger96" alone, why do you want to prepend SoM name to it? When you say, "stm32mp157a-avenger96.dtb" it obviously means that Avenger96 board uses the stm32mp157a SoC and that comes from SoM. > stm32mp157a-dk1.dtb \ > stm32mp157c-dhcom-pdk2.dtb \ > stm32mp157c-dk2.dtb \ > diff --git a/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts > new file mode 100644 > index 000000000000..0f3875fbdd73 > --- /dev/null > +++ b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts > @@ -0,0 +1,9 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > +/* > + * Copyright (C) 2020 Marek Vasut <marex@denx.de> > + */ > + > +/dts-v1/; > + > +#include "stm32mp151a-dhcor-som.dtsi" > +#include "stm32mp15xa-dhcor-avenger96.dtsi" [...] > diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts > index 10f11ca53c7d..dc3bbd576756 100644 > --- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts > +++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts > @@ -1,421 +1,9 @@ > // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > /* > - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved > - * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> I'd still keep the copyright here. Rest looks fine to me. Thanks, Mani > * Copyright (C) 2020 Marek Vasut <marex@denx.de> > */ > > /dts-v1/; > > -#include "stm32mp157a-dhcor-som.dtsi" > -/* Avenger96 uses DHCOR SoM configured for 1V8 IO operation */ > -#include "stm32mp157a-dhcor-io1v8.dtsi" > - > -/ { > - model = "Arrow Electronics STM32MP157A Avenger96 board"; > - compatible = "arrow,stm32mp157a-avenger96", "st,stm32mp157"; > - > - 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@0 { > - st,adc-channels = <0 1 6>; > - st,min-sample-time-nsecs = <5000>; > - status = "okay"; > - }; > - > - adc2: adc@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@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>; > - }; > - }; > -}; > - > -&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@3d { > - compatible = "adi,adv7513"; > - reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>; > - reg-names = "main", "cec", "edid", "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"; > - adi,input-style = <1>; > - adi,input-justification = "evenly"; > - > - ports { > - #address-cells = <1>; > - #size-cells = <0>; > - > - port@0 { > - reg = <0>; > - adv7513_in: endpoint { > - remote-endpoint = <<dc_ep0_out>; > - }; > - }; > - > - port@1 { > - reg = <1>; > - adv7513_out: endpoint { > - remote-endpoint = <&hdmi_con>; > - }; > - }; > - > - port@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@0 { > - reg = <0>; > - remote-endpoint = <&adv7513_in>; > - }; > - }; > -}; > - > -&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"; > -}; > - > -&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@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_b>; > - pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_b>; > - pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_b>; > - 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@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>; > - 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>; > - vdda1v1-supply = <®11>; > - vdda1v8-supply = <®18>; > -}; > - > -&usbphyc_port1 { > - phy-supply = <&vdd_usb>; > - vdda1v1-supply = <®11>; > - vdda1v8-supply = <®18>; > -}; > +/* This DT is here only for backward compatibility */ > +#include "stm32mp157a-dhcor-avenger96.dts" > diff --git a/arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts > new file mode 100644 > index 000000000000..7355af3d14f6 > --- /dev/null > +++ b/arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts > @@ -0,0 +1,23 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > +/* > + * Copyright (C) 2020 Marek Vasut <marex@denx.de> > + */ > + > +/dts-v1/; > + > +#include "stm32mp157a-dhcor-som.dtsi" > +#include "stm32mp15xa-dhcor-avenger96.dtsi" > + > +&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/boot/dts/stm32mp157a-dhcor-som.dtsi b/arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi > index 7144afeab6ca..7dac547e7996 100644 > --- a/arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi > +++ b/arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi > @@ -1,210 +1,8 @@ > // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > /* > - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved > - * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > * Copyright (C) 2020 Marek Vasut <marex@denx.de> > */ > > #include "stm32mp157.dtsi" > -#include "stm32mp15-pinctrl.dtsi" > -#include "stm32mp15xxac-pinctrl.dtsi" > -#include <dt-bindings/gpio/gpio.h> > -#include <dt-bindings/mfd/st,stpmic1.h> > - > -/ { > - aliases { > - spi0 = &qspi; > - }; > - > - memory@c0000000 { > - device_type = "memory"; > - reg = <0xc0000000 0x40000000>; > - }; > -}; > - > -&i2c4 { > - pinctrl-names = "default"; > - pinctrl-0 = <&i2c4_pins_a>; > - i2c-scl-rising-time-ns = <185>; > - i2c-scl-falling-time-ns = <20>; > - status = "okay"; > - /delete-property/dmas; > - /delete-property/dma-names; > - > - pmic: stpmic@33 { > - compatible = "st,stpmic1"; > - reg = <0x33>; > - interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>; > - interrupt-controller; > - #interrupt-cells = <2>; > - status = "okay"; > - > - regulators { > - compatible = "st,stpmic1-regulators"; > - > - ldo1-supply = <&v3v3>; > - ldo2-supply = <&v3v3>; > - ldo3-supply = <&vdd_ddr>; > - ldo5-supply = <&v3v3>; > - ldo6-supply = <&v3v3>; > - pwr_sw1-supply = <&bst_out>; > - pwr_sw2-supply = <&bst_out>; > - > - vddcore: buck1 { > - regulator-name = "vddcore"; > - regulator-min-microvolt = <1200000>; > - regulator-max-microvolt = <1350000>; > - regulator-always-on; > - regulator-initial-mode = <0>; > - regulator-over-current-protection; > - }; > - > - vdd_ddr: buck2 { > - regulator-name = "vdd_ddr"; > - regulator-min-microvolt = <1350000>; > - regulator-max-microvolt = <1350000>; > - regulator-always-on; > - regulator-initial-mode = <0>; > - regulator-over-current-protection; > - }; > - > - vdd: buck3 { > - regulator-name = "vdd"; > - regulator-min-microvolt = <2900000>; > - regulator-max-microvolt = <2900000>; > - regulator-always-on; > - regulator-initial-mode = <0>; > - regulator-over-current-protection; > - }; > - > - v3v3: buck4 { > - regulator-name = "v3v3"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-always-on; > - regulator-over-current-protection; > - regulator-initial-mode = <0>; > - }; > - > - vdda: ldo1 { > - regulator-name = "vdda"; > - regulator-min-microvolt = <2900000>; > - regulator-max-microvolt = <2900000>; > - interrupts = <IT_CURLIM_LDO1 0>; > - }; > - > - v2v8: ldo2 { > - regulator-name = "v2v8"; > - regulator-min-microvolt = <2800000>; > - regulator-max-microvolt = <2800000>; > - interrupts = <IT_CURLIM_LDO2 0>; > - }; > - > - vtt_ddr: ldo3 { > - regulator-name = "vtt_ddr"; > - regulator-min-microvolt = <500000>; > - regulator-max-microvolt = <750000>; > - regulator-always-on; > - regulator-over-current-protection; > - }; > - > - vdd_usb: ldo4 { > - regulator-name = "vdd_usb"; > - interrupts = <IT_CURLIM_LDO4 0>; > - }; > - > - vdd_sd: ldo5 { > - regulator-name = "vdd_sd"; > - regulator-min-microvolt = <2900000>; > - regulator-max-microvolt = <2900000>; > - interrupts = <IT_CURLIM_LDO5 0>; > - regulator-boot-on; > - }; > - > - v1v8: ldo6 { > - regulator-name = "v1v8"; > - regulator-min-microvolt = <1800000>; > - regulator-max-microvolt = <1800000>; > - interrupts = <IT_CURLIM_LDO6 0>; > - regulator-enable-ramp-delay = <300000>; > - }; > - > - vref_ddr: vref_ddr { > - regulator-name = "vref_ddr"; > - regulator-always-on; > - }; > - > - bst_out: boost { > - regulator-name = "bst_out"; > - interrupts = <IT_OCP_BOOST 0>; > - }; > - > - vbus_otg: pwr_sw1 { > - regulator-name = "vbus_otg"; > - interrupts = <IT_OCP_OTG 0>; > - regulator-active-discharge = <1>; > - }; > - > - vbus_sw: pwr_sw2 { > - regulator-name = "vbus_sw"; > - interrupts = <IT_OCP_SWOUT 0>; > - regulator-active-discharge = <1>; > - }; > - }; > - > - onkey { > - compatible = "st,stpmic1-onkey"; > - interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 1>; > - interrupt-names = "onkey-falling", "onkey-rising"; > - status = "okay"; > - }; > - > - watchdog { > - compatible = "st,stpmic1-wdt"; > - status = "disabled"; > - }; > - }; > - > - eeprom@53 { > - compatible = "atmel,24c02"; > - reg = <0x53>; > - pagesize = <16>; > - }; > -}; > - > -&iwdg2 { > - timeout-sec = <32>; > - status = "okay"; > -}; > - > -&pwr_regulators { > - vdd-supply = <&vdd>; > - vdd_3v3_usbfs-supply = <&vdd_usb>; > -}; > - > -&qspi { > - pinctrl-names = "default", "sleep"; > - pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; > - pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; > - reg = <0x58003000 0x1000>, <0x70000000 0x200000>; > - #address-cells = <1>; > - #size-cells = <0>; > - status = "okay"; > - > - flash0: spi-flash@0 { > - compatible = "jedec,spi-nor"; > - reg = <0>; > - spi-rx-bus-width = <4>; > - spi-max-frequency = <108000000>; > - #address-cells = <1>; > - #size-cells = <1>; > - }; > -}; > - > -&rng1 { > - status = "okay"; > -}; > - > -&rtc { > - status = "okay"; > -}; > +#include "stm32mp15xc.dtsi" > +#include "stm32mp15xx-dhcor-som.dtsi" > diff --git a/arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi > new file mode 100644 > index 000000000000..baec592aee13 > --- /dev/null > +++ b/arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi > @@ -0,0 +1,405 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > +/* > + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved > + * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > + * Copyright (C) 2020 Marek Vasut <marex@denx.de> > + */ > + > +#include "stm32mp157a-dhcor-som.dtsi" > +/* Avenger96 uses DHCOR SoM configured for 1V8 IO operation */ > +#include "stm32mp15xa-dhcor-io1v8.dtsi" > + > +/ { > + model = "Arrow Electronics STM32MP157A Avenger96 board"; > + compatible = "arrow,stm32mp157a-avenger96", "st,stm32mp157"; > + > + 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@0 { > + st,adc-channels = <0 1 6>; > + st,min-sample-time-nsecs = <5000>; > + status = "okay"; > + }; > + > + adc2: adc@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@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>; > + }; > + }; > +}; > + > +&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@3d { > + compatible = "adi,adv7513"; > + reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>; > + reg-names = "main", "cec", "edid", "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"; > + adi,input-style = <1>; > + adi,input-justification = "evenly"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + adv7513_in: endpoint { > + remote-endpoint = <<dc_ep0_out>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + adv7513_out: endpoint { > + remote-endpoint = <&hdmi_con>; > + }; > + }; > + > + port@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@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@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_b>; > + pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_b>; > + pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_b>; > + 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@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>; > + 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>; > + vdda1v1-supply = <®11>; > + vdda1v8-supply = <®18>; > +}; > + > +&usbphyc_port1 { > + phy-supply = <&vdd_usb>; > + vdda1v1-supply = <®11>; > + vdda1v8-supply = <®18>; > +}; > diff --git a/arch/arm/boot/dts/stm32mp157a-dhcor-io1v8.dtsi b/arch/arm/boot/dts/stm32mp15xa-dhcor-io1v8.dtsi > similarity index 100% > rename from arch/arm/boot/dts/stm32mp157a-dhcor-io1v8.dtsi > rename to arch/arm/boot/dts/stm32mp15xa-dhcor-io1v8.dtsi > diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi > new file mode 100644 > index 000000000000..04fbb324a541 > --- /dev/null > +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi > @@ -0,0 +1,209 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > +/* > + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved > + * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > + * Copyright (C) 2020 Marek Vasut <marex@denx.de> > + */ > + > +#include "stm32mp15-pinctrl.dtsi" > +#include "stm32mp15xxac-pinctrl.dtsi" > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/mfd/st,stpmic1.h> > + > +/ { > + aliases { > + spi0 = &qspi; > + }; > + > + memory@c0000000 { > + device_type = "memory"; > + reg = <0xc0000000 0x40000000>; > + }; > +}; > + > +&i2c4 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c4_pins_a>; > + i2c-scl-rising-time-ns = <185>; > + i2c-scl-falling-time-ns = <20>; > + status = "okay"; > + /delete-property/dmas; > + /delete-property/dma-names; > + > + pmic: stpmic@33 { > + compatible = "st,stpmic1"; > + reg = <0x33>; > + interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>; > + interrupt-controller; > + #interrupt-cells = <2>; > + status = "okay"; > + > + regulators { > + compatible = "st,stpmic1-regulators"; > + > + ldo1-supply = <&v3v3>; > + ldo2-supply = <&v3v3>; > + ldo3-supply = <&vdd_ddr>; > + ldo5-supply = <&v3v3>; > + ldo6-supply = <&v3v3>; > + pwr_sw1-supply = <&bst_out>; > + pwr_sw2-supply = <&bst_out>; > + > + vddcore: buck1 { > + regulator-name = "vddcore"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1350000>; > + regulator-always-on; > + regulator-initial-mode = <0>; > + regulator-over-current-protection; > + }; > + > + vdd_ddr: buck2 { > + regulator-name = "vdd_ddr"; > + regulator-min-microvolt = <1350000>; > + regulator-max-microvolt = <1350000>; > + regulator-always-on; > + regulator-initial-mode = <0>; > + regulator-over-current-protection; > + }; > + > + vdd: buck3 { > + regulator-name = "vdd"; > + regulator-min-microvolt = <2900000>; > + regulator-max-microvolt = <2900000>; > + regulator-always-on; > + regulator-initial-mode = <0>; > + regulator-over-current-protection; > + }; > + > + v3v3: buck4 { > + regulator-name = "v3v3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + regulator-over-current-protection; > + regulator-initial-mode = <0>; > + }; > + > + vdda: ldo1 { > + regulator-name = "vdda"; > + regulator-min-microvolt = <2900000>; > + regulator-max-microvolt = <2900000>; > + interrupts = <IT_CURLIM_LDO1 0>; > + }; > + > + v2v8: ldo2 { > + regulator-name = "v2v8"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + interrupts = <IT_CURLIM_LDO2 0>; > + }; > + > + vtt_ddr: ldo3 { > + regulator-name = "vtt_ddr"; > + regulator-min-microvolt = <500000>; > + regulator-max-microvolt = <750000>; > + regulator-always-on; > + regulator-over-current-protection; > + }; > + > + vdd_usb: ldo4 { > + regulator-name = "vdd_usb"; > + interrupts = <IT_CURLIM_LDO4 0>; > + }; > + > + vdd_sd: ldo5 { > + regulator-name = "vdd_sd"; > + regulator-min-microvolt = <2900000>; > + regulator-max-microvolt = <2900000>; > + interrupts = <IT_CURLIM_LDO5 0>; > + regulator-boot-on; > + }; > + > + v1v8: ldo6 { > + regulator-name = "v1v8"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + interrupts = <IT_CURLIM_LDO6 0>; > + regulator-enable-ramp-delay = <300000>; > + }; > + > + vref_ddr: vref_ddr { > + regulator-name = "vref_ddr"; > + regulator-always-on; > + }; > + > + bst_out: boost { > + regulator-name = "bst_out"; > + interrupts = <IT_OCP_BOOST 0>; > + }; > + > + vbus_otg: pwr_sw1 { > + regulator-name = "vbus_otg"; > + interrupts = <IT_OCP_OTG 0>; > + regulator-active-discharge = <1>; > + }; > + > + vbus_sw: pwr_sw2 { > + regulator-name = "vbus_sw"; > + interrupts = <IT_OCP_SWOUT 0>; > + regulator-active-discharge = <1>; > + }; > + }; > + > + onkey { > + compatible = "st,stpmic1-onkey"; > + interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 1>; > + interrupt-names = "onkey-falling", "onkey-rising"; > + status = "okay"; > + }; > + > + watchdog { > + compatible = "st,stpmic1-wdt"; > + status = "disabled"; > + }; > + }; > + > + eeprom@53 { > + compatible = "atmel,24c02"; > + reg = <0x53>; > + pagesize = <16>; > + }; > +}; > + > +&iwdg2 { > + timeout-sec = <32>; > + status = "okay"; > +}; > + > +&pwr_regulators { > + vdd-supply = <&vdd>; > + vdd_3v3_usbfs-supply = <&vdd_usb>; > +}; > + > +&qspi { > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; > + pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; > + reg = <0x58003000 0x1000>, <0x70000000 0x200000>; > + #address-cells = <1>; > + #size-cells = <0>; > + status = "okay"; > + > + flash0: spi-flash@0 { > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-rx-bus-width = <4>; > + spi-max-frequency = <108000000>; > + #address-cells = <1>; > + #size-cells = <1>; > + }; > +}; > + > +&rng1 { > + status = "okay"; > +}; > + > +&rtc { > + status = "okay"; > +}; > -- > 2.25.1 >
On 5/7/20 5:26 PM, Manivannan Sadhasivam wrote: Hi, [...] >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index f43467b02bcd..b4a4d2b0f18e 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -1029,6 +1029,9 @@ dtb-$(CONFIG_ARCH_STM32) += \ >> stm32h743i-eval.dtb \ >> stm32h743i-disco.dtb \ >> stm32mp157a-avenger96.dtb \ >> + stm32mp151a-dhcor-avenger96.dtb \ >> + stm32mp153a-dhcor-avenger96.dtb \ >> + stm32mp157a-dhcor-avenger96.dtb \ > > I'm not really sure if keeping SoM name is a good practice here. Since the > board is sold as "Avenger96" alone, why do you want to prepend SoM name to it? > When you say, "stm32mp157a-avenger96.dtb" it obviously means that Avenger96 > board uses the stm32mp157a SoC and that comes from SoM. That's because if you look at the other side of the AV96, you will notice there is this other piece of PCB on it, that's the DHCOR SoM. The SoM is soldered on the AV96 carrier board. And only on that SoM is the STM32MP15xx SoC. >> stm32mp157a-dk1.dtb \ >> stm32mp157c-dhcom-pdk2.dtb \ >> stm32mp157c-dk2.dtb \ >> diff --git a/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts >> new file mode 100644 >> index 000000000000..0f3875fbdd73 >> --- /dev/null >> +++ b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts >> @@ -0,0 +1,9 @@ >> +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) >> +/* >> + * Copyright (C) 2020 Marek Vasut <marex@denx.de> >> + */ >> + >> +/dts-v1/; >> + >> +#include "stm32mp151a-dhcor-som.dtsi" >> +#include "stm32mp15xa-dhcor-avenger96.dtsi" > > [...] > >> diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts >> index 10f11ca53c7d..dc3bbd576756 100644 >> --- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts >> +++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts >> @@ -1,421 +1,9 @@ >> // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) >> /* >> - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved >> - * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> That's fixed in the other submission, sorry.
On 7 May 2020 9:03:08 PM IST, Marek Vasut <marex@denx.de> wrote: >On 5/7/20 5:26 PM, Manivannan Sadhasivam wrote: > >Hi, > >[...] > >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >>> index f43467b02bcd..b4a4d2b0f18e 100644 >>> --- a/arch/arm/boot/dts/Makefile >>> +++ b/arch/arm/boot/dts/Makefile >>> @@ -1029,6 +1029,9 @@ dtb-$(CONFIG_ARCH_STM32) += \ >>> stm32h743i-eval.dtb \ >>> stm32h743i-disco.dtb \ >>> stm32mp157a-avenger96.dtb \ >>> + stm32mp151a-dhcor-avenger96.dtb \ >>> + stm32mp153a-dhcor-avenger96.dtb \ >>> + stm32mp157a-dhcor-avenger96.dtb \ >> >> I'm not really sure if keeping SoM name is a good practice here. >Since the >> board is sold as "Avenger96" alone, why do you want to prepend SoM >name to it? >> When you say, "stm32mp157a-avenger96.dtb" it obviously means that >Avenger96 >> board uses the stm32mp157a SoC and that comes from SoM. > >That's because if you look at the other side of the AV96, you will >notice there is this other piece of PCB on it, that's the DHCOR SoM. >The >SoM is soldered on the AV96 carrier board. And only on that SoM is the >STM32MP15xx SoC. > Yeah I know but what I was saying is that it is not the usual convention to put SoM name in board DTS. The DTS should reflect the actual product name. Here, the SoC prefix is justified since they reflect the family/SoC name and used as a differentiation factor. But using SoM name seems redundant. You can use SoM name if there are chances where different family of SoM can be used on the base board, thereby making it as a differentiation factor. Thanks, Mani >>> stm32mp157a-dk1.dtb \ >>> stm32mp157c-dhcom-pdk2.dtb \ >>> stm32mp157c-dk2.dtb \ >>> diff --git a/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts >b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts >>> new file mode 100644 >>> index 000000000000..0f3875fbdd73 >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts >>> @@ -0,0 +1,9 @@ >>> +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) >>> +/* >>> + * Copyright (C) 2020 Marek Vasut <marex@denx.de> >>> + */ >>> + >>> +/dts-v1/; >>> + >>> +#include "stm32mp151a-dhcor-som.dtsi" >>> +#include "stm32mp15xa-dhcor-avenger96.dtsi" >> >> [...] >> >>> diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts >b/arch/arm/boot/dts/stm32mp157a-avenger96.dts >>> index 10f11ca53c7d..dc3bbd576756 100644 >>> --- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts >>> +++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts >>> @@ -1,421 +1,9 @@ >>> // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) >>> /* >>> - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved >>> - * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > >That's fixed in the other submission, sorry.
On 5/7/20 6:05 PM, Manivannan Sadhasivam wrote: > > > On 7 May 2020 9:03:08 PM IST, Marek Vasut <marex@denx.de> wrote: >> On 5/7/20 5:26 PM, Manivannan Sadhasivam wrote: >> >> Hi, >> >> [...] >> >>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >>>> index f43467b02bcd..b4a4d2b0f18e 100644 >>>> --- a/arch/arm/boot/dts/Makefile >>>> +++ b/arch/arm/boot/dts/Makefile >>>> @@ -1029,6 +1029,9 @@ dtb-$(CONFIG_ARCH_STM32) += \ >>>> stm32h743i-eval.dtb \ >>>> stm32h743i-disco.dtb \ >>>> stm32mp157a-avenger96.dtb \ >>>> + stm32mp151a-dhcor-avenger96.dtb \ >>>> + stm32mp153a-dhcor-avenger96.dtb \ >>>> + stm32mp157a-dhcor-avenger96.dtb \ >>> >>> I'm not really sure if keeping SoM name is a good practice here. >> Since the >>> board is sold as "Avenger96" alone, why do you want to prepend SoM >> name to it? >>> When you say, "stm32mp157a-avenger96.dtb" it obviously means that >> Avenger96 >>> board uses the stm32mp157a SoC and that comes from SoM. >> >> That's because if you look at the other side of the AV96, you will >> notice there is this other piece of PCB on it, that's the DHCOR SoM. >> The >> SoM is soldered on the AV96 carrier board. And only on that SoM is the >> STM32MP15xx SoC. >> > > Yeah I know but what I was saying is that it is not the usual convention to put SoM name in board DTS. The DTS should reflect the actual product name. Here, the SoC prefix is justified since they reflect the family/SoC name and used as a differentiation factor. But using SoM name seems redundant. > > You can use SoM name if there are chances where different family of SoM can be used on the base board, thereby making it as a differentiation factor. There are other SoCs on the DHCOR SoM form factor, I think MX6ULL, so technically you can populate a different one on the AV96.
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f43467b02bcd..b4a4d2b0f18e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1029,6 +1029,9 @@ dtb-$(CONFIG_ARCH_STM32) += \ stm32h743i-eval.dtb \ stm32h743i-disco.dtb \ stm32mp157a-avenger96.dtb \ + stm32mp151a-dhcor-avenger96.dtb \ + stm32mp153a-dhcor-avenger96.dtb \ + stm32mp157a-dhcor-avenger96.dtb \ stm32mp157a-dk1.dtb \ stm32mp157c-dhcom-pdk2.dtb \ stm32mp157c-dk2.dtb \ diff --git a/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts new file mode 100644 index 000000000000..0f3875fbdd73 --- /dev/null +++ b/arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) 2020 Marek Vasut <marex@denx.de> + */ + +/dts-v1/; + +#include "stm32mp151a-dhcor-som.dtsi" +#include "stm32mp15xa-dhcor-avenger96.dtsi" diff --git a/arch/arm/boot/dts/stm32mp151a-dhcor-som.dtsi b/arch/arm/boot/dts/stm32mp151a-dhcor-som.dtsi new file mode 100644 index 000000000000..40718ae324b3 --- /dev/null +++ b/arch/arm/boot/dts/stm32mp151a-dhcor-som.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) 2020 Marek Vasut <marex@denx.de> + */ + +#include "stm32mp151.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xx-dhcor-som.dtsi" diff --git a/arch/arm/boot/dts/stm32mp153a-dhcor-avenger96.dts b/arch/arm/boot/dts/stm32mp153a-dhcor-avenger96.dts new file mode 100644 index 000000000000..e6d674e47e7e --- /dev/null +++ b/arch/arm/boot/dts/stm32mp153a-dhcor-avenger96.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) 2020 Marek Vasut <marex@denx.de> + */ + +/dts-v1/; + +#include "stm32mp153a-dhcor-som.dtsi" +#include "stm32mp15xa-dhcor-avenger96.dtsi" + +&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/boot/dts/stm32mp153a-dhcor-som.dtsi b/arch/arm/boot/dts/stm32mp153a-dhcor-som.dtsi new file mode 100644 index 000000000000..e33587e7bd11 --- /dev/null +++ b/arch/arm/boot/dts/stm32mp153a-dhcor-som.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) 2020 Marek Vasut <marex@denx.de> + */ + +#include "stm32mp153.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xx-dhcor-som.dtsi" diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts index 10f11ca53c7d..dc3bbd576756 100644 --- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts +++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts @@ -1,421 +1,9 @@ // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) /* - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved - * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> * Copyright (C) 2020 Marek Vasut <marex@denx.de> */ /dts-v1/; -#include "stm32mp157a-dhcor-som.dtsi" -/* Avenger96 uses DHCOR SoM configured for 1V8 IO operation */ -#include "stm32mp157a-dhcor-io1v8.dtsi" - -/ { - model = "Arrow Electronics STM32MP157A Avenger96 board"; - compatible = "arrow,stm32mp157a-avenger96", "st,stm32mp157"; - - 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@0 { - st,adc-channels = <0 1 6>; - st,min-sample-time-nsecs = <5000>; - status = "okay"; - }; - - adc2: adc@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@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>; - }; - }; -}; - -&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@3d { - compatible = "adi,adv7513"; - reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>; - reg-names = "main", "cec", "edid", "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"; - adi,input-style = <1>; - adi,input-justification = "evenly"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - adv7513_in: endpoint { - remote-endpoint = <<dc_ep0_out>; - }; - }; - - port@1 { - reg = <1>; - adv7513_out: endpoint { - remote-endpoint = <&hdmi_con>; - }; - }; - - port@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@0 { - reg = <0>; - remote-endpoint = <&adv7513_in>; - }; - }; -}; - -&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"; -}; - -&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@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_b>; - pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_b>; - pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_b>; - 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@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>; - 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>; - vdda1v1-supply = <®11>; - vdda1v8-supply = <®18>; -}; - -&usbphyc_port1 { - phy-supply = <&vdd_usb>; - vdda1v1-supply = <®11>; - vdda1v8-supply = <®18>; -}; +/* This DT is here only for backward compatibility */ +#include "stm32mp157a-dhcor-avenger96.dts" diff --git a/arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts new file mode 100644 index 000000000000..7355af3d14f6 --- /dev/null +++ b/arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) 2020 Marek Vasut <marex@denx.de> + */ + +/dts-v1/; + +#include "stm32mp157a-dhcor-som.dtsi" +#include "stm32mp15xa-dhcor-avenger96.dtsi" + +&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/boot/dts/stm32mp157a-dhcor-som.dtsi b/arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi index 7144afeab6ca..7dac547e7996 100644 --- a/arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi +++ b/arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi @@ -1,210 +1,8 @@ // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) /* - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved - * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> * Copyright (C) 2020 Marek Vasut <marex@denx.de> */ #include "stm32mp157.dtsi" -#include "stm32mp15-pinctrl.dtsi" -#include "stm32mp15xxac-pinctrl.dtsi" -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/mfd/st,stpmic1.h> - -/ { - aliases { - spi0 = &qspi; - }; - - memory@c0000000 { - device_type = "memory"; - reg = <0xc0000000 0x40000000>; - }; -}; - -&i2c4 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c4_pins_a>; - i2c-scl-rising-time-ns = <185>; - i2c-scl-falling-time-ns = <20>; - status = "okay"; - /delete-property/dmas; - /delete-property/dma-names; - - pmic: stpmic@33 { - compatible = "st,stpmic1"; - reg = <0x33>; - interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>; - interrupt-controller; - #interrupt-cells = <2>; - status = "okay"; - - regulators { - compatible = "st,stpmic1-regulators"; - - ldo1-supply = <&v3v3>; - ldo2-supply = <&v3v3>; - ldo3-supply = <&vdd_ddr>; - ldo5-supply = <&v3v3>; - ldo6-supply = <&v3v3>; - pwr_sw1-supply = <&bst_out>; - pwr_sw2-supply = <&bst_out>; - - vddcore: buck1 { - regulator-name = "vddcore"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-initial-mode = <0>; - regulator-over-current-protection; - }; - - vdd_ddr: buck2 { - regulator-name = "vdd_ddr"; - regulator-min-microvolt = <1350000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-initial-mode = <0>; - regulator-over-current-protection; - }; - - vdd: buck3 { - regulator-name = "vdd"; - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <2900000>; - regulator-always-on; - regulator-initial-mode = <0>; - regulator-over-current-protection; - }; - - v3v3: buck4 { - regulator-name = "v3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - regulator-over-current-protection; - regulator-initial-mode = <0>; - }; - - vdda: ldo1 { - regulator-name = "vdda"; - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <2900000>; - interrupts = <IT_CURLIM_LDO1 0>; - }; - - v2v8: ldo2 { - regulator-name = "v2v8"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - interrupts = <IT_CURLIM_LDO2 0>; - }; - - vtt_ddr: ldo3 { - regulator-name = "vtt_ddr"; - regulator-min-microvolt = <500000>; - regulator-max-microvolt = <750000>; - regulator-always-on; - regulator-over-current-protection; - }; - - vdd_usb: ldo4 { - regulator-name = "vdd_usb"; - interrupts = <IT_CURLIM_LDO4 0>; - }; - - vdd_sd: ldo5 { - regulator-name = "vdd_sd"; - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <2900000>; - interrupts = <IT_CURLIM_LDO5 0>; - regulator-boot-on; - }; - - v1v8: ldo6 { - regulator-name = "v1v8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - interrupts = <IT_CURLIM_LDO6 0>; - regulator-enable-ramp-delay = <300000>; - }; - - vref_ddr: vref_ddr { - regulator-name = "vref_ddr"; - regulator-always-on; - }; - - bst_out: boost { - regulator-name = "bst_out"; - interrupts = <IT_OCP_BOOST 0>; - }; - - vbus_otg: pwr_sw1 { - regulator-name = "vbus_otg"; - interrupts = <IT_OCP_OTG 0>; - regulator-active-discharge = <1>; - }; - - vbus_sw: pwr_sw2 { - regulator-name = "vbus_sw"; - interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge = <1>; - }; - }; - - onkey { - compatible = "st,stpmic1-onkey"; - interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 1>; - interrupt-names = "onkey-falling", "onkey-rising"; - status = "okay"; - }; - - watchdog { - compatible = "st,stpmic1-wdt"; - status = "disabled"; - }; - }; - - eeprom@53 { - compatible = "atmel,24c02"; - reg = <0x53>; - pagesize = <16>; - }; -}; - -&iwdg2 { - timeout-sec = <32>; - status = "okay"; -}; - -&pwr_regulators { - vdd-supply = <&vdd>; - vdd_3v3_usbfs-supply = <&vdd_usb>; -}; - -&qspi { - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; - pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; - reg = <0x58003000 0x1000>, <0x70000000 0x200000>; - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - flash0: spi-flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-rx-bus-width = <4>; - spi-max-frequency = <108000000>; - #address-cells = <1>; - #size-cells = <1>; - }; -}; - -&rng1 { - status = "okay"; -}; - -&rtc { - status = "okay"; -}; +#include "stm32mp15xc.dtsi" +#include "stm32mp15xx-dhcor-som.dtsi" diff --git a/arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi new file mode 100644 index 000000000000..baec592aee13 --- /dev/null +++ b/arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi @@ -0,0 +1,405 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved + * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> + * Copyright (C) 2020 Marek Vasut <marex@denx.de> + */ + +#include "stm32mp157a-dhcor-som.dtsi" +/* Avenger96 uses DHCOR SoM configured for 1V8 IO operation */ +#include "stm32mp15xa-dhcor-io1v8.dtsi" + +/ { + model = "Arrow Electronics STM32MP157A Avenger96 board"; + compatible = "arrow,stm32mp157a-avenger96", "st,stm32mp157"; + + 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@0 { + st,adc-channels = <0 1 6>; + st,min-sample-time-nsecs = <5000>; + status = "okay"; + }; + + adc2: adc@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@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>; + }; + }; +}; + +&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@3d { + compatible = "adi,adv7513"; + reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>; + reg-names = "main", "cec", "edid", "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"; + adi,input-style = <1>; + adi,input-justification = "evenly"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + adv7513_in: endpoint { + remote-endpoint = <<dc_ep0_out>; + }; + }; + + port@1 { + reg = <1>; + adv7513_out: endpoint { + remote-endpoint = <&hdmi_con>; + }; + }; + + port@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@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@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_b>; + pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_b>; + pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_b>; + 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@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>; + 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>; + vdda1v1-supply = <®11>; + vdda1v8-supply = <®18>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; + vdda1v1-supply = <®11>; + vdda1v8-supply = <®18>; +}; diff --git a/arch/arm/boot/dts/stm32mp157a-dhcor-io1v8.dtsi b/arch/arm/boot/dts/stm32mp15xa-dhcor-io1v8.dtsi similarity index 100% rename from arch/arm/boot/dts/stm32mp157a-dhcor-io1v8.dtsi rename to arch/arm/boot/dts/stm32mp15xa-dhcor-io1v8.dtsi diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi new file mode 100644 index 000000000000..04fbb324a541 --- /dev/null +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi @@ -0,0 +1,209 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved + * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> + * Copyright (C) 2020 Marek Vasut <marex@denx.de> + */ + +#include "stm32mp15-pinctrl.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/mfd/st,stpmic1.h> + +/ { + aliases { + spi0 = &qspi; + }; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x40000000>; + }; +}; + +&i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pins_a>; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; + + pmic: stpmic@33 { + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + + regulators { + compatible = "st,stpmic1-regulators"; + + ldo1-supply = <&v3v3>; + ldo2-supply = <&v3v3>; + ldo3-supply = <&vdd_ddr>; + ldo5-supply = <&v3v3>; + ldo6-supply = <&v3v3>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + vddcore: buck1 { + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd_ddr: buck2 { + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd: buck3 { + regulator-name = "vdd"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + v3v3: buck4 { + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + }; + + vdda: ldo1 { + regulator-name = "vdda"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + interrupts = <IT_CURLIM_LDO1 0>; + }; + + v2v8: ldo2 { + regulator-name = "v2v8"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + interrupts = <IT_CURLIM_LDO2 0>; + }; + + vtt_ddr: ldo3 { + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + }; + + vdd_usb: ldo4 { + regulator-name = "vdd_usb"; + interrupts = <IT_CURLIM_LDO4 0>; + }; + + vdd_sd: ldo5 { + regulator-name = "vdd_sd"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + interrupts = <IT_CURLIM_LDO5 0>; + regulator-boot-on; + }; + + v1v8: ldo6 { + regulator-name = "v1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + interrupts = <IT_CURLIM_LDO6 0>; + regulator-enable-ramp-delay = <300000>; + }; + + vref_ddr: vref_ddr { + regulator-name = "vref_ddr"; + regulator-always-on; + }; + + bst_out: boost { + regulator-name = "bst_out"; + interrupts = <IT_OCP_BOOST 0>; + }; + + vbus_otg: pwr_sw1 { + regulator-name = "vbus_otg"; + interrupts = <IT_OCP_OTG 0>; + regulator-active-discharge = <1>; + }; + + vbus_sw: pwr_sw2 { + regulator-name = "vbus_sw"; + interrupts = <IT_OCP_SWOUT 0>; + regulator-active-discharge = <1>; + }; + }; + + onkey { + compatible = "st,stpmic1-onkey"; + interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 1>; + interrupt-names = "onkey-falling", "onkey-rising"; + status = "okay"; + }; + + watchdog { + compatible = "st,stpmic1-wdt"; + status = "disabled"; + }; + }; + + eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; +}; + +&iwdg2 { + timeout-sec = <32>; + status = "okay"; +}; + +&pwr_regulators { + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&qspi { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; + pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; + reg = <0x58003000 0x1000>, <0x70000000 0x200000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; + #address-cells = <1>; + #size-cells = <1>; + }; +}; + +&rng1 { + status = "okay"; +}; + +&rtc { + status = "okay"; +};
The Avenger96 can be populated with DH Electronics DHCOR SoM with any STM32MP15xA variant. Add the DTs describing the remaining combinations. Since the board is a combination of carrier board and SoM, update the DT name, however keep the old DT for backward compatibility. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexandre Torgue <alexandre.torgue@st.com> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Patrice Chotard <patrice.chotard@st.com> Cc: Patrick Delaunay <patrick.delaunay@st.com> Cc: linux-stm32@st-md-mailman.stormreply.com To: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/Makefile | 3 + .../boot/dts/stm32mp151a-dhcor-avenger96.dts | 9 + arch/arm/boot/dts/stm32mp151a-dhcor-som.dtsi | 8 + .../boot/dts/stm32mp153a-dhcor-avenger96.dts | 23 + arch/arm/boot/dts/stm32mp153a-dhcor-som.dtsi | 8 + arch/arm/boot/dts/stm32mp157a-avenger96.dts | 416 +----------------- .../boot/dts/stm32mp157a-dhcor-avenger96.dts | 23 + arch/arm/boot/dts/stm32mp157a-dhcor-som.dtsi | 206 +-------- .../boot/dts/stm32mp15xa-dhcor-avenger96.dtsi | 405 +++++++++++++++++ ...o1v8.dtsi => stm32mp15xa-dhcor-io1v8.dtsi} | 0 arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 209 +++++++++ 11 files changed, 692 insertions(+), 618 deletions(-) create mode 100644 arch/arm/boot/dts/stm32mp151a-dhcor-avenger96.dts create mode 100644 arch/arm/boot/dts/stm32mp151a-dhcor-som.dtsi create mode 100644 arch/arm/boot/dts/stm32mp153a-dhcor-avenger96.dts create mode 100644 arch/arm/boot/dts/stm32mp153a-dhcor-som.dtsi create mode 100644 arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts create mode 100644 arch/arm/boot/dts/stm32mp15xa-dhcor-avenger96.dtsi rename arch/arm/boot/dts/{stm32mp157a-dhcor-io1v8.dtsi => stm32mp15xa-dhcor-io1v8.dtsi} (100%) create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi