From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 23 Jan 2023 09:23:17 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pJs6o-002vXb-Jk for lore@lore.pengutronix.de; Mon, 23 Jan 2023 09:23:17 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pJs6l-0007dJ-Sa for lore@pengutronix.de; Mon, 23 Jan 2023 09:23:16 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NcertU4OvY++0SqG+xgdtoUfdA5zi02eYAv7IDhSAVs=; b=Jd7iKQxIliy9RrDT9XWfONcl3Y Dgk+QLiMqgZKleWpbdsBWKgZKYWyI+MO27NZS5aZG/1MCvLovW+5XkrkK3uzU7eLU/iNNvo3b1Q0j XGiZpknNfHP9AHa+SC56JYKpCdfnn7i1t5NRzsa0KbRYpFX6QElAE0Vk2dhU2NH0juatn+N82UFUC /XMTckFHIJVX/xpazl0XAWeYk7wio1llyTEDjdLZOLqlGowgwWWdsLNkhywKlJWju/KRyokQlk7UA K4lNzuKFSmHtAdOjNnfpOb51+lqDrim8AtkrWy0V5eJMO9Frk4zaNti2UWazf1lP8v5ynYz3eULvl FgMZ02LQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJs5E-00GLHx-LF; Mon, 23 Jan 2023 08:21:40 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJs58-00GLGZ-2B for barebox@lists.infradead.org; Mon, 23 Jan 2023 08:21:37 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pJs52-0007LZ-Nq; Mon, 23 Jan 2023 09:21:28 +0100 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1pJs51-0003wn-OD; Mon, 23 Jan 2023 09:21:27 +0100 Date: Mon, 23 Jan 2023 09:21:27 +0100 To: Ahmad Fatoum Cc: barebox@lists.infradead.org, Xogium Message-ID: <20230123082127.GO24755@pengutronix.de> References: <20230116132911.1991963-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230116132911.1991963-1-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230123_002134_473704_086354D6 X-CRM114-Status: GOOD ( 28.42 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [RFT PATCH] ARM: stm32mp: odyssey-som: use upstream device trees X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On Mon, Jan 16, 2023 at 02:29:11PM +0100, Ahmad Fatoum wrote: > When board support was first added, it used a version of the device tree > of the Linux kernel mailing list. The device tree is now upstream, so > replace the copy we have with the version already existing in dts/. > > Signed-off-by: Ahmad Fatoum > --- > I don't have the hardware, Cc'ing Xogium, who has this board and may be > able to test this patch. > --- > arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 294 ---------------------- > arch/arm/dts/stm32mp157c-odyssey.dts | 6 +- > arch/arm/dts/stm32mp157c-odyssey.dtsi | 72 ------ > 3 files changed, 1 insertion(+), 371 deletions(-) > delete mode 100644 arch/arm/dts/stm32mp157c-odyssey-som.dtsi > delete mode 100644 arch/arm/dts/stm32mp157c-odyssey.dtsi Applied, thanks Sascha > > diff --git a/arch/arm/dts/stm32mp157c-odyssey-som.dtsi b/arch/arm/dts/stm32mp157c-odyssey-som.dtsi > deleted file mode 100644 > index 1e5bd8bccb71..000000000000 > --- a/arch/arm/dts/stm32mp157c-odyssey-som.dtsi > +++ /dev/null > @@ -1,294 +0,0 @@ > -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) > -/* > - * Copyright (C) 2020 Marcin Sloniewski . > - */ > - > -/dts-v1/; > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -/ { > - model = "Seeed Studio Odyssey-STM32MP157C SOM"; > - compatible = "seeed,stm32mp157c-odyssey-som", "st,stm32mp157"; > - > - memory@c0000000 { > - device_type = "memory"; > - reg = <0xc0000000 0x20000000>; > - }; > - > - reserved-memory { > - #address-cells = <1>; > - #size-cells = <1>; > - ranges; > - > - mcuram2: mcuram2@10000000 { > - compatible = "shared-dma-pool"; > - reg = <0x10000000 0x40000>; > - no-map; > - }; > - > - vdev0vring0: vdev0vring0@10040000 { > - compatible = "shared-dma-pool"; > - reg = <0x10040000 0x1000>; > - no-map; > - }; > - > - vdev0vring1: vdev0vring1@10041000 { > - compatible = "shared-dma-pool"; > - reg = <0x10041000 0x1000>; > - no-map; > - }; > - > - vdev0buffer: vdev0buffer@10042000 { > - compatible = "shared-dma-pool"; > - reg = <0x10042000 0x4000>; > - no-map; > - }; > - > - mcuram: mcuram@30000000 { > - compatible = "shared-dma-pool"; > - reg = <0x30000000 0x40000>; > - no-map; > - }; > - > - retram: retram@38000000 { > - compatible = "shared-dma-pool"; > - reg = <0x38000000 0x10000>; > - no-map; > - }; > - > - gpu_reserved: gpu@d4000000 { > - reg = <0xd4000000 0x4000000>; > - no-map; > - }; > - }; > - > - led { > - compatible = "gpio-leds"; > - led-blue { > - color = ; > - function = LED_FUNCTION_HEARTBEAT; > - gpios = <&gpiog 3 GPIO_ACTIVE_HIGH>; > - linux,default-trigger = "heartbeat"; > - }; > - }; > -}; > - > -&gpu { > - contiguous-area = <&gpu_reserved>; > - status = "okay"; > -}; > - > -&i2c2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&i2c2_pins_a>; > - i2c-scl-rising-time-ns = <185>; > - i2c-scl-falling-time-ns = <20>; > - status = "okay"; > - /* spare dmas for other usage */ > - /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>; > - > - regulators { > - compatible = "st,stpmic1-regulators"; > - ldo1-supply = <&v3v3>; > - ldo3-supply = <&vdd_ddr>; > - ldo6-supply = <&v3v3>; > - pwr_sw1-supply = <&bst_out>; > - pwr_sw2-supply = <&bst_out>; > - > - vddcore: buck1 { > - regulator-name = "vddcore"; > - regulator-min-microvolt = <800000>; > - 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 = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-always-on; > - st,mask-reset; > - 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>; > - }; > - > - v1v8_audio: ldo1 { > - regulator-name = "v1v8_audio"; > - regulator-min-microvolt = <1800000>; > - regulator-max-microvolt = <1800000>; > - regulator-always-on; > - interrupts = ; > - }; > - > - v3v3_hdmi: ldo2 { > - regulator-name = "v3v3_hdmi"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-always-on; > - interrupts = ; > - }; > - > - 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"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - interrupts = ; > - }; > - > - vdda: ldo5 { > - regulator-name = "vdda"; > - regulator-min-microvolt = <2900000>; > - regulator-max-microvolt = <2900000>; > - interrupts = ; > - regulator-boot-on; > - }; > - > - v1v2_hdmi: ldo6 { > - regulator-name = "v1v2_hdmi"; > - regulator-min-microvolt = <1200000>; > - regulator-max-microvolt = <1200000>; > - regulator-always-on; > - interrupts = ; > - }; > - > - vref_ddr: vref_ddr { > - regulator-name = "vref_ddr"; > - regulator-always-on; > - regulator-over-current-protection; > - }; > - > - bst_out: boost { > - regulator-name = "bst_out"; > - interrupts = ; > - }; > - > - vbus_otg: pwr_sw1 { > - regulator-name = "vbus_otg"; > - interrupts = ; > - }; > - > - vbus_sw: pwr_sw2 { > - regulator-name = "vbus_sw"; > - interrupts = ; > - regulator-active-discharge; > - }; > - }; > - > - onkey { > - compatible = "st,stpmic1-onkey"; > - interrupts = , ; > - interrupt-names = "onkey-falling", "onkey-rising"; > - power-off-time-sec = <10>; > - }; > - > - watchdog { > - compatible = "st,stpmic1-wdt"; > - status = "disabled"; > - }; > - }; > -}; > - > -&ipcc { > - status = "okay"; > -}; > - > -&iwdg2 { > - timeout-sec = <32>; > - status = "okay"; > -}; > - > -&m4_rproc { > - memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, > - <&vdev0vring1>, <&vdev0buffer>; > - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; > - mbox-names = "vq0", "vq1", "shutdown"; > - interrupt-parent = <&exti>; > - interrupts = <68 1>; > - status = "okay"; > -}; > - > -&rng1 { > - status = "okay"; > -}; > - > -&rtc { > - status = "okay"; > -}; > - > -&sdmmc2_d47_pins_a { > - pins { > - pinmux = , /* SDMMC2_D4 */ > - , /* SDMMC2_D5 */ > - , /* SDMMC2_D6 */ > - ; /* SDMMC2_D7 */ > - }; > -}; > - > -&sdmmc2_d47_sleep_pins_a { > - pins { > - pinmux = , /* SDMMC2_D4 */ > - , /* SDMMC2_D5 */ > - , /* SDMMC2_D6 */ > - ; /* SDMMC2_D7 */ > - }; > -}; > - > -&sdmmc2 { > - pinctrl-names = "default", "opendrain", "sleep"; > - pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_a>; > - pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_a>; > - pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_a>; > - non-removable; > - no-sd; > - no-sdio; > - st,neg-edge; > - bus-width = <8>; > - vmmc-supply = <&v3v3>; > - vqmmc-supply = <&v3v3>; > - mmc-ddr-3_3v; > - status = "okay"; > -}; > - > diff --git a/arch/arm/dts/stm32mp157c-odyssey.dts b/arch/arm/dts/stm32mp157c-odyssey.dts > index 0e395bdec961..6ced6363eb0f 100644 > --- a/arch/arm/dts/stm32mp157c-odyssey.dts > +++ b/arch/arm/dts/stm32mp157c-odyssey.dts > @@ -3,7 +3,7 @@ > * Copyright (C) 2020 Ahmad Fatoum, Pengutronix > */ > > -#include "stm32mp157c-odyssey.dtsi" > +#include > #include "stm32mp151.dtsi" > > / { > @@ -21,7 +21,3 @@ > }; > }; > }; > - > -&phy0 { > - reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; > -}; > diff --git a/arch/arm/dts/stm32mp157c-odyssey.dtsi b/arch/arm/dts/stm32mp157c-odyssey.dtsi > deleted file mode 100644 > index 85a4f313ae33..000000000000 > --- a/arch/arm/dts/stm32mp157c-odyssey.dtsi > +++ /dev/null > @@ -1,72 +0,0 @@ > -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) > -/* > - * Copyright (C) 2020 Marcin Sloniewski . > - */ > - > -/dts-v1/; > - > -#include "stm32mp157c-odyssey-som.dtsi" > - > -/ { > - model = "Seeed Studio Odyssey-STM32MP157C Board"; > - compatible = "seeed,stm32mp157c-odyssey", > - "seeed,stm32mp157c-odyssey-som", "st,stm32mp157"; > - > - aliases { > - ethernet0 = ðernet0; > - serial0 = &uart4; > - }; > - > - chosen { > - stdout-path = "serial0:115200n8"; > - }; > -}; > - > -ðernet0 { > - status = "okay"; > - pinctrl-0 = <ðernet0_rgmii_pins_a>; > - pinctrl-1 = <ðernet0_rgmii_sleep_pins_a>; > - pinctrl-names = "default", "sleep"; > - phy-mode = "rgmii-id"; > - max-speed = <1000>; > - phy-handle = <&phy0>; > - > - mdio0 { > - #address-cells = <1>; > - #size-cells = <0>; > - compatible = "snps,dwmac-mdio"; > - phy0: ethernet-phy@7 { /* KSZ9031RN */ > - reg = <7>; > - }; > - }; > -}; > - > -&i2c1 { > - pinctrl-names = "default", "sleep"; > - pinctrl-0 = <&i2c1_pins_a>; > - pinctrl-1 = <&i2c1_sleep_pins_a>; > - i2c-scl-rising-time-ns = <100>; > - i2c-scl-falling-time-ns = <7>; > - status = "okay"; > - /delete-property/dmas; > - /delete-property/dma-names; > -}; > - > -&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 = <&gpiob 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; > - disable-wp; > - st,neg-edge; > - bus-width = <4>; > - vmmc-supply = <&v3v3>; > - status = "okay"; > -}; > - > -&uart4 { > - pinctrl-names = "default"; > - pinctrl-0 = <&uart4_pins_a>; > - status = "okay"; > -}; > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |