From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 23 Jan 2023 10:17:05 +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 1pJsws-002y8V-D6 for lore@lore.pengutronix.de; Mon, 23 Jan 2023 10:17:05 +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 1pJswp-0007hZ-Ly for lore@pengutronix.de; Mon, 23 Jan 2023 10:17:05 +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:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fmGKYg6eTMNDENLhXFYFL1yjvKGb2yQVk/yKBmBiVYA=; b=G9i5sWCHosP9DVnZwpRcj0hQEB 4bkqRhksjDkoZa5V6ftlPw+CfID6LlXCl2uFw5o1UCFWLDfrI2gbZYkMft/tIRGabYP6jtQrrsEVp Mxb2CCVXbB7XosuCZtx5qyNUqvGiwXOPol/ZBrEfIvURfB20uRdGaMX9hdrM3+iZhbMoPq/jM+rrE xQwxgSNXIdfMGFqUOy1HrVHaHP9z/eEAT5209Iln05B4dq/rw4RU27YAzPYoCUEuuIpJAs5bzNq6A 3EqjSzHtWrEznAlONt577CbN4kj2PuMQnpc8QYgABZCcIWd3YYnty/Q27f9NI7M7lq6LURybbVl0i byUFHEWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJsvV-00GTzy-CS; Mon, 23 Jan 2023 09:15:41 +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 1pJsvO-00GTxo-9A for barebox@lists.infradead.org; Mon, 23 Jan 2023 09:15:36 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pJsvL-0007O6-2u; Mon, 23 Jan 2023 10:15:31 +0100 Message-ID: Date: Mon, 23 Jan 2023 10:15:30 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-US To: Sascha Hauer Cc: barebox@lists.infradead.org, Xogium References: <20230116132911.1991963-1-a.fatoum@pengutronix.de> <20230123082127.GO24755@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20230123082127.GO24755@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230123_011534_699204_0AE41774 X-CRM114-Status: GOOD ( 24.71 ) 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=-5.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,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) Hello Sascha, On 23.01.23 09:21, Sascha Hauer wrote: > 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 I don't mind waiting for this patch to be tested before applying. > > 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 |