Message ID | 20230712124248.2400862-9-sean@geanix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v4,1/9] ARM: dts: stm32: Add alternate pinmux for i2s pins | expand |
Hi Sean On 7/12/23 14:42, Sean Nyekjaer wrote: > Add support for the Octavo OSD32MP1-RED development board. > > General features: > - STM32MP157C > - 512MB DDR3 > - CAN-FD > - HDMI > - USB-C OTG > - UART > > Signed-off-by: Sean Nyekjaer <sean@geanix.com> > Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com> > --- > Changes since v1: > - Fixed comments from Ahmad > > Changes since v2: > - Reordered phandles alfabetically > - Added devicetree to Makefile > > Changes since v3: > - Explained the dma disable > - Removed the status ok for hdmi-transmitter > > arch/arm/boot/dts/st/Makefile | 3 +- > .../boot/dts/st/stm32mp157c-osd32mp1-red.dts | 226 ++++++++++++++++++ > 2 files changed, 228 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts > Sorry for my late answer (just back from vacations). I got some build issue: make W=1 st/stm32mp157c-osd32mp1-red.dtb DTC arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts:138.4-14: Warning (reg_format): /soc/display-controller@5a001000/port/endpoint@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: Warning (pci_device_reg): Failed prerequisite 'reg_format' arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: Warning (pci_device_bus_num): Failed prerequisite 'reg_format' arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: Warning (simple_bus_reg): Failed prerequisite 'reg_format' arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: Warning (i2c_bus_reg): Failed prerequisite 'reg_format' arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: Warning (spi_bus_reg): Failed prerequisite 'reg_format' arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts:137.28-140.5: Warning (avoid_default_addr_size): /soc/display-controller@5a001000/port/endpoint@0: Relying on default #address-cells value arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts:137.28-140.5: Warning (avoid_default_addr_size): /soc/display-controller@5a001000/port/endpoint@0: Relying on default #size-cells value arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: Warning (avoid_unnecessary_addr_size): Failed prerequisite 'avoid_default_addr_size' arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: Warning (unique_unit_address_if_enabled): Failed prerequisite 'avoid_default_addr_size' arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts:137.28-140.5: Warning (graph_endpoint): /soc/display-controller@5a001000/port/endpoint@0: graph node '#address-cells' is -1, must be 1 arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts:137.28-140.5: Warning (graph_endpoint): /soc/display-controller@5a001000/port/endpoint@0: graph node '#size-cells' is -1, must be 0 And Yaml verification issue: make CHECK_DTBS=y st/stm32mp157c-osd32mp1-red.dtb UPD include/config/kernel.release LINT Documentation/devicetree/bindings CHKDT Documentation/devicetree/bindings/processed-schema.json /local/home/frq08678/STLINUX/kernel/my-kernel/stm32/Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml: properties:adi,ext1-burnout-current-nanoamp: '$ref' should not be valid under {'const': '$ref'} from schema $id: http://devicetree.org/meta-schemas/core.yaml# /local/home/frq08678/STLINUX/kernel/my-kernel/stm32/Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml: properties:adi,ext2-burnout-current-nanoamp: '$ref' should not be valid under {'const': '$ref'} from schema $id: http://devicetree.org/meta-schemas/core.yaml# /local/home/frq08678/STLINUX/kernel/my-kernel/stm32/Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml: properties:adi,viout-burnout-current-nanoamp: '$ref' should not be valid under {'const': '$ref'} from schema $id: http://devicetree.org/meta-schemas/core.yaml# SCHEMA Documentation/devicetree/bindings/processed-schema.json DTC_CHK arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb /local/home/frq08678/STLINUX/kernel/my-kernel/stm32/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: audio-controller@4000b000: port:endpoint: Unevaluated properties are not allowed ('format' was unexpected) from schema $id: http://devicetree.org/schemas/sound/st,stm32-i2s.yaml# /local/home/frq08678/STLINUX/kernel/my-kernel/stm32/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dtb: audio-controller@4000b000: Unevaluated properties are not allowed ('port' was unexpected) from schema $id: http://devicetree.org/schemas/sound/st,stm32-i2s.yaml# I think we recently fixed some of them for ST boards, you could have a look on correction we did. Regards Alex > diff --git a/arch/arm/boot/dts/st/Makefile b/arch/arm/boot/dts/st/Makefile > index 44b264c399ec..94feb1f1d569 100644 > --- a/arch/arm/boot/dts/st/Makefile > +++ b/arch/arm/boot/dts/st/Makefile > @@ -59,7 +59,8 @@ dtb-$(CONFIG_ARCH_STM32) += \ > stm32mp157c-lxa-tac-gen1.dtb \ > stm32mp157c-lxa-tac-gen2.dtb \ > stm32mp157c-odyssey.dtb \ > - stm32mp157c-phycore-stm32mp1-3.dtb > + stm32mp157c-phycore-stm32mp1-3.dtb \ > + stm32mp157c-osd32mp1-red.dtb > dtb-$(CONFIG_ARCH_U8500) += \ > ste-snowball.dtb \ > ste-hrefprev60-stuib.dtb \ > diff --git a/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts b/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts > new file mode 100644 > index 000000000000..2e2751a62aaf > --- /dev/null > +++ b/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts > @@ -0,0 +1,226 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) > +/* > + * Copyright (C) Geanix ApS 2023 - All Rights Reserved > + * Author: Sean Nyekjaer <sean@geanix.com> > + */ > + > +/dts-v1/; > + > +#include "stm32mp157.dtsi" > +#include "stm32mp15xc.dtsi" > +#include "stm32mp15xx-osd32.dtsi" > +#include "stm32mp15xxac-pinctrl.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/pinctrl/stm32-pinfunc.h> > + > +/ { > + model = "Octavo OSD32MP1 RED board"; > + compatible = "oct,stm32mp157c-osd32-red", "oct,stm32mp15xx-osd32", "st,stm32mp157"; > + > + aliases { > + serial0 = &uart4; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + led-controller-0 { > + compatible = "gpio-leds"; > + > + led-0 { > + label = "heartbeat"; > + gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>; > + linux,default-trigger = "heartbeat"; > + }; > + }; > +}; > + > +&crc1 { > + status = "okay"; > +}; > + > +&dts { > + status = "okay"; > +}; > + > +ðernet0 { > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <ðernet0_rgmii_pins_a>; > + pinctrl-1 = <ðernet0_rgmii_sleep_pins_a>; > + phy-mode = "rgmii-id"; > + max-speed = <1000>; > + phy-handle = <&phy0>; > + st,eth-clk-sel; > + status = "okay"; > + > + mdio { > + compatible = "snps,dwmac-mdio"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + phy0: ethernet-phy@3 { > + reg = <3>; > + }; > + }; > +}; > + > +&iwdg2 { > + timeout-sec = <32>; > + status = "okay"; > +}; > + > +&i2c1 { > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <&i2c1_pins_a>; > + pinctrl-1 = <&i2c1_sleep_pins_a>; > + status = "okay"; > + i2c-scl-rising-time-ns = <100>; > + i2c-scl-falling-time-ns = <7>; > + /* spare dmas for other usage */ > + /delete-property/dmas; > + /delete-property/dma-names; > + > + hdmi-transmitter@39 { > + compatible = "sil,sii9022"; > + reg = <0x39>; > + reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; > + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; > + interrupt-parent = <&gpiog>; > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <<dc_pins_e>; > + pinctrl-1 = <<dc_sleep_pins_e>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + sii9022_in: endpoint { > + remote-endpoint = <<dc_ep0_out>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + sii9022_tx_endpoint: endpoint { > + remote-endpoint = <&i2s2_endpoint>; > + }; > + }; > + }; > + }; > +}; > + > +&i2s2 { > + clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc CK_PER>, <&rcc PLL3_R>; > + clock-names = "pclk", "i2sclk", "x8k", "x11k"; > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <&i2s2_pins_b>; > + pinctrl-1 = <&i2s2_sleep_pins_b>; > + status = "okay"; > + > + i2s2_port: port { > + i2s2_endpoint: endpoint { > + remote-endpoint = <&sii9022_tx_endpoint>; > + format = "i2s"; > + mclk-fs = <256>; > + }; > + }; > +}; > + > +<dc { > + status = "okay"; > + > + port { > + ltdc_ep0_out: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&sii9022_in>; > + }; > + }; > +}; > + > +&m_can1 { > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <&m_can1_pins_d>; > + pinctrl-1 = <&m_can1_sleep_pins_d>; > + status = "okay"; > +}; > + > +&pwr_regulators { > + vdd-supply = <&vdd>; > + vdd_3v3_usbfs-supply = <&vdd_usb>; > +}; > + > +&rtc { > + status = "okay"; > +}; > + > +&sdmmc1 { > + pinctrl-names = "default", "opendrain", "sleep"; > + pinctrl-0 = <&sdmmc1_b4_pins_a>; > + pinctrl-1 = <&sdmmc1_b4_od_pins_a>; > + pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>; > + cd-gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; > + disable-wp; > + st,neg-edge; > + bus-width = <4>; > + vmmc-supply = <&v3v3>; > + status = "okay"; > +}; > + > +&sdmmc2 { > + pinctrl-names = "default", "opendrain", "sleep"; > + pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_d>; > + pinctrl-1 = <&sdmmc2_b4_od_pins_a>; > + pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_d>; > + non-removable; > + no-sd; > + no-sdio; > + st,neg-edge; > + bus-width = <8>; > + vmmc-supply = <&v3v3>; > + vqmmc-supply = <&vdd>; > + mmc-ddr-3_3v; > + status = "okay"; > +}; > + > +&uart4 { > + pinctrl-names = "default", "sleep", "idle"; > + pinctrl-0 = <&uart4_pins_a>; > + pinctrl-1 = <&uart4_sleep_pins_a>; > + pinctrl-2 = <&uart4_idle_pins_a>; > + /* spare dmas for other usage */ > + /delete-property/dmas; > + /delete-property/dma-names; > + status = "okay"; > +}; > + > +&usbh_ehci { > + phys = <&usbphyc_port0>; > + phy-names = "usb"; > + status = "okay"; > +}; > + > +&usbh_ohci { > + phys = <&usbphyc_port0>; > + phy-names = "usb"; > + status = "okay"; > +}; > + > +&usbotg_hs { > + vbus-supply = <&vbus_otg>; > +}; > + > +&usbphyc { > + status = "okay"; > +}; > + > +&usbphyc_port0 { > + phy-supply = <&vdd_usb>; > +}; > + > +&usbphyc_port1 { > + phy-supply = <&vdd_usb>; > +};
diff --git a/arch/arm/boot/dts/st/Makefile b/arch/arm/boot/dts/st/Makefile index 44b264c399ec..94feb1f1d569 100644 --- a/arch/arm/boot/dts/st/Makefile +++ b/arch/arm/boot/dts/st/Makefile @@ -59,7 +59,8 @@ dtb-$(CONFIG_ARCH_STM32) += \ stm32mp157c-lxa-tac-gen1.dtb \ stm32mp157c-lxa-tac-gen2.dtb \ stm32mp157c-odyssey.dtb \ - stm32mp157c-phycore-stm32mp1-3.dtb + stm32mp157c-phycore-stm32mp1-3.dtb \ + stm32mp157c-osd32mp1-red.dtb dtb-$(CONFIG_ARCH_U8500) += \ ste-snowball.dtb \ ste-hrefprev60-stuib.dtb \ diff --git a/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts b/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts new file mode 100644 index 000000000000..2e2751a62aaf --- /dev/null +++ b/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts @@ -0,0 +1,226 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) Geanix ApS 2023 - All Rights Reserved + * Author: Sean Nyekjaer <sean@geanix.com> + */ + +/dts-v1/; + +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xx-osd32.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/stm32-pinfunc.h> + +/ { + model = "Octavo OSD32MP1 RED board"; + compatible = "oct,stm32mp157c-osd32-red", "oct,stm32mp15xx-osd32", "st,stm32mp157"; + + aliases { + serial0 = &uart4; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + led-controller-0 { + compatible = "gpio-leds"; + + led-0 { + label = "heartbeat"; + gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + }; +}; + +&crc1 { + status = "okay"; +}; + +&dts { + status = "okay"; +}; + +ðernet0 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <ðernet0_rgmii_pins_a>; + pinctrl-1 = <ðernet0_rgmii_sleep_pins_a>; + phy-mode = "rgmii-id"; + max-speed = <1000>; + phy-handle = <&phy0>; + st,eth-clk-sel; + status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy@3 { + reg = <3>; + }; + }; +}; + +&iwdg2 { + timeout-sec = <32>; + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c1_pins_a>; + pinctrl-1 = <&i2c1_sleep_pins_a>; + status = "okay"; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + + hdmi-transmitter@39 { + compatible = "sil,sii9022"; + reg = <0x39>; + reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpiog>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <<dc_pins_e>; + pinctrl-1 = <<dc_sleep_pins_e>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + sii9022_in: endpoint { + remote-endpoint = <<dc_ep0_out>; + }; + }; + + port@1 { + reg = <1>; + sii9022_tx_endpoint: endpoint { + remote-endpoint = <&i2s2_endpoint>; + }; + }; + }; + }; +}; + +&i2s2 { + clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc CK_PER>, <&rcc PLL3_R>; + clock-names = "pclk", "i2sclk", "x8k", "x11k"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2s2_pins_b>; + pinctrl-1 = <&i2s2_sleep_pins_b>; + status = "okay"; + + i2s2_port: port { + i2s2_endpoint: endpoint { + remote-endpoint = <&sii9022_tx_endpoint>; + format = "i2s"; + mclk-fs = <256>; + }; + }; +}; + +<dc { + status = "okay"; + + port { + ltdc_ep0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&sii9022_in>; + }; + }; +}; + +&m_can1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&m_can1_pins_d>; + pinctrl-1 = <&m_can1_sleep_pins_d>; + status = "okay"; +}; + +&pwr_regulators { + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&rtc { + status = "okay"; +}; + +&sdmmc1 { + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc1_b4_pins_a>; + pinctrl-1 = <&sdmmc1_b4_od_pins_a>; + pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>; + cd-gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + status = "okay"; +}; + +&sdmmc2 { + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_d>; + pinctrl-1 = <&sdmmc2_b4_od_pins_a>; + pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_d>; + non-removable; + no-sd; + no-sdio; + st,neg-edge; + bus-width = <8>; + vmmc-supply = <&v3v3>; + vqmmc-supply = <&vdd>; + mmc-ddr-3_3v; + status = "okay"; +}; + +&uart4 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart4_pins_a>; + pinctrl-1 = <&uart4_sleep_pins_a>; + pinctrl-2 = <&uart4_idle_pins_a>; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + status = "okay"; +}; + +&usbh_ehci { + phys = <&usbphyc_port0>; + phy-names = "usb"; + status = "okay"; +}; + +&usbh_ohci { + phys = <&usbphyc_port0>; + phy-names = "usb"; + status = "okay"; +}; + +&usbotg_hs { + vbus-supply = <&vbus_otg>; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; +};