From patchwork Fri Feb 11 18:16:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Volmat X-Patchwork-Id: 12743734 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6DE7C433F5 for ; Fri, 11 Feb 2022 18:19:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LuXUfUI9mk/2cqrS+FxV8tThYafUt0RX1XdwIBo/6iA=; b=WOHjGaasfcKx24 KZhU/pfqz3T3Oreu83Nz9upBxmfXmSRq3z2C3T8c5X+q9ebFagj9bnmh0UeYC2LY64CtJDwmRtWci bvuW3wghiIfkwCw9ijLw2Tdpx5JvX8kstoDzMLjSSzs3aihdWuwjrUWKi35G7BmgYRC9YAFQ5c69A 6jtZzg3wa/4hS6q9c5dt0M2o6h1uiH0I4G8GF91plMkABYy0no5NhTd49hYlp4KldDXqrpvt518me JZ2k+f973wxD5628rGFd9lguYo/a2JaA0O7LWl3eneZc2JcTIvrlW5WsA4B16L54uPkNyKKGEjlku vLoR7mQERuJewDGwLjlw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nIaUc-008OIj-QD; Fri, 11 Feb 2022 18:18:03 +0000 Received: from st43p00im-ztdg10073201.me.com ([17.58.63.177]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nIaTb-008Nni-6w for linux-arm-kernel@lists.infradead.org; Fri, 11 Feb 2022 18:17:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1644603417; bh=Rg0EIUG5YQ/nG3yQzZ80SkA2uhlV3mGvQHIXfsmLoRk=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=p/MFjwttwRQM0R5xLX7LXKQwp05C2DIKB9JPfYqk6B85svRVzfrsFxA92m4jZzmEj P+7bFOjXPT0P+uv4BoH7T0fIGdqGT2UFCGgl3pbM/ZyzJCF98WA9t8QNnvRCYQdxp5 XoexvO3NZ3iBg0CO+101e0oHXssAv/zEbAeQ4I/v1Ffb+rdUSqGPFRhH8UFnqDp4o0 I0YFLerSoBp1+2zUI6LwgFQrVJEBrN3JbDdVi4Ra0cJPxBD9kZjlckmRuX6ZKEoZY0 jxiGoRbZhBJbwRDp5DPATf8uF9GP0UadVyJl0CfwT0xxjV2cdbroysO6Nihyz2ONrg XGhT/25X+Z3HQ== Received: from localhost (lfbn-lyo-1-306-208.w2-7.abo.wanadoo.fr [2.7.142.208]) by st43p00im-ztdg10073201.me.com (Postfix) with ESMTPSA id 3B2719A0FD3; Fri, 11 Feb 2022 18:16:57 +0000 (UTC) From: Alain Volmat To: Patrice Chotard , Rob Herring Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, avolmat@me.com Subject: [PATCH v2 6/7] ARM: dts: sti: move usb picophy nodes out of soc in stih410.dtsi Date: Fri, 11 Feb 2022 19:16:13 +0100 Message-Id: <20220211181614.683497-7-avolmat@me.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220211181614.683497-1-avolmat@me.com> References: <20220211181614.683497-1-avolmat@me.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E138=2C18=2E0?= =?utf-8?q?=2E816=2C17=2E11=2E62=2E513=2E0000000_definitions=3D2022-01-17=5F?= =?utf-8?q?04=3A2020-02-14=5F02=2C2022-01-17=5F04=2C2021-12-02=5F01_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=915 adultscore=0 suspectscore=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2202110099 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220211_101659_390063_B0D159F9 X-CRM114-Status: GOOD ( 11.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move the usb2_picophy1 and usb2_picophy2 nodes out of the soc section. Since they are controlled via syscfg, there is no reg property needed, which is required when having the node within the soc section. Modification is done within stih410.dtsi and within related board dts files (stih410-b2120.dts, stih410-b2260.dts). Signed-off-by: Alain Volmat Reviewed-by: Patrice Chotard --- v2: squash together 3 commits from v1 to avoid compilation issues arch/arm/boot/dts/stih410-b2120.dts | 16 +++++------ arch/arm/boot/dts/stih410-b2260.dts | 16 +++++------ arch/arm/boot/dts/stih410.dtsi | 42 ++++++++++++++--------------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 9d3b118f5f0f..538ff98ca1b1 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -24,6 +24,14 @@ aliases { ethernet0 = ðernet0; }; + usb2_picophy1: phy2 { + status = "okay"; + }; + + usb2_picophy2: phy3 { + status = "okay"; + }; + soc { mmc0: sdhci@9060000 { @@ -33,14 +41,6 @@ mmc0: sdhci@9060000 { sd-uhs-ddr50; }; - usb2_picophy1: phy2@0 { - status = "okay"; - }; - - usb2_picophy2: phy3@0 { - status = "okay"; - }; - ohci0: usb@9a03c00 { status = "okay"; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index c2d3b6de55d0..26d93f26f6d0 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -82,6 +82,14 @@ phy_port1: port@9b2a000 { }; }; + usb2_picophy1: phy2 { + status = "okay"; + }; + + usb2_picophy2: phy3 { + status = "okay"; + }; + soc { /* Low speed expansion connector */ uart0: serial@9830000 { @@ -152,14 +160,6 @@ pwm1: pwm@9510000 { status = "okay"; }; - usb2_picophy1: phy2@0 { - status = "okay"; - }; - - usb2_picophy2: phy3@0 { - status = "okay"; - }; - ohci0: usb@9a03c00 { status = "okay"; }; diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index fe83d9a522bf..ce2f62cf129b 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -12,31 +12,29 @@ aliases { bdisp0 = &bdisp0; }; - soc { - usb2_picophy1: phy2@0 { - compatible = "st,stih407-usb2-phy"; - reg = <0 0>; - #phy-cells = <0>; - st,syscfg = <&syscfg_core 0xf8 0xf4>; - resets = <&softreset STIH407_PICOPHY_SOFTRESET>, - <&picophyreset STIH407_PICOPHY0_RESET>; - reset-names = "global", "port"; + usb2_picophy1: phy2 { + compatible = "st,stih407-usb2-phy"; + #phy-cells = <0>; + st,syscfg = <&syscfg_core 0xf8 0xf4>; + resets = <&softreset STIH407_PICOPHY_SOFTRESET>, + <&picophyreset STIH407_PICOPHY0_RESET>; + reset-names = "global", "port"; + + status = "disabled"; + }; - status = "disabled"; - }; + usb2_picophy2: phy3 { + compatible = "st,stih407-usb2-phy"; + #phy-cells = <0>; + st,syscfg = <&syscfg_core 0xfc 0xf4>; + resets = <&softreset STIH407_PICOPHY_SOFTRESET>, + <&picophyreset STIH407_PICOPHY1_RESET>; + reset-names = "global", "port"; - usb2_picophy2: phy3@0 { - compatible = "st,stih407-usb2-phy"; - reg = <0 0>; - #phy-cells = <0>; - st,syscfg = <&syscfg_core 0xfc 0xf4>; - resets = <&softreset STIH407_PICOPHY_SOFTRESET>, - <&picophyreset STIH407_PICOPHY1_RESET>; - reset-names = "global", "port"; - - status = "disabled"; - }; + status = "disabled"; + }; + soc { ohci0: usb@9a03c00 { compatible = "st,st-ohci-300x"; reg = <0x9a03c00 0x100>;