From patchwork Tue Jul 16 20:52:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13734896 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 BC9E3C3DA59 for ; Tue, 16 Jul 2024 20:53:14 +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:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RzuZSxjKSp2RegOfalasmBFjIRHqQeh6UlUVXpWab4g=; b=rLxn5akIRA/bz2tv+NlI2jSPAp kpXWwSJEdLQYO4DElvMRnO1R8cGwftsK4JE4OWAzeKnXoBU4eZ8EauwOsXW1ievYnZima3xn62yG6 CDw+tSeWQdjOjTLUw1/4FY5U2wYSGsAGGVP5dpIG7hUjbfF1Yp65GFs3ED5rUStwSUw4XKVUQbd30 MMNnXbMeMyzxFJ7acSmT75VPbz1q8t0Eabrw+2p4hHJi2W4Rx6l3+x8EgP2urFr1acmv6+JGipPkm A5lEaeWHgCN16YysrPV46e+A7VxjT31nhgzSGN9GbRchDIS7GjWDrYEdDZ26XFuKTjap6DxUherDF rCxzcYFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpAg-0000000BjfS-1dnl; Tue, 16 Jul 2024 20:53:14 +0000 Received: from mail-northeuropeazlp170120003.outbound.protection.outlook.com ([2a01:111:f403:c200::3] helo=DU2PR03CU002.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpAL-0000000BjXu-41rP; Tue, 16 Jul 2024 20:52:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wAawBIotFEfftEWqRim4ogy2WQoqge9Gt+O6V1QxV5oQhGEVAaF4S4GEaVH7nnBTNMZR8Eqhrk0x0VOJr3vLZ8A9KddVGFU2vKDc86QlRuN4RRNp7QQrxAG6Xj+7vPUEfq0rS1O4Rq35ZNi+qpim9yGybBWGVxyeil/YLFDvoE6ue21MJNIbRpgZPqaA9YXRSXaeUF8T6w1Sq3WrHGZMuGRiqOgUYTCrwNGHsKGJvtBCtshZEHW9WWwz3YnAufOAR56AwXbU5oxmgmzo3G5LBH6yu1uj2RnwUuYYZqNvMoELawarnzWLaWGVlvi7zyqNokB3FmrglwD4iNZjSSfW8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QGg0eVqkNMHs/mp5O4euxl40i22630pU7gQgBdShYBc=; b=CdFeKoGBwARPkbMPlDD+juRiX/dBDcAyEyh3s1diMwoyr/J5Qxu78B3n14zVP5RzEwe7btxKZZo55E7sPe674i6rhNwfpyW3MuJuR5mbVNw4xayly4bGf3VTK0kFRWC3juFPEzsETShSuxViB+M2wpWwEP8x6ftDX2XeV0lz3qm4iLKSEGG6sAiWTKkd9f7UWyBOfteH90DIdWTHzyZ2gi2Hz3drnoL8zer89lSFcfUS3up88H+Ha81AU/GVn+1AwO+BiEHxFGgFlEoMjo93uLwRGhMYiShn5ukuq/Som8xd71u8HGt5HAi+LozlgVXRYT+GaiNFBMnM2Iz8CFB7Wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QGg0eVqkNMHs/mp5O4euxl40i22630pU7gQgBdShYBc=; b=R/P3supsfkVfRDs3SNMeBX9TjgZQpHeLa+blY7DdzulOvr5Yf+kPoZ/4CfoTATBSN1dgQOv0empr2r/FWa684P3OUVt2DEfYTBhYiMTmdgzVYhZ9fjkhvVh1eWDAQVgvGmuye231Im+aoUxa7CYhPc2SAnQoihQDF3aVnvRYPvo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) by AM8PR04MB7907.eurprd04.prod.outlook.com (2603:10a6:20b:237::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Tue, 16 Jul 2024 20:52:44 +0000 Received: from AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529]) by AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529%3]) with mapi id 15.20.7762.027; Tue, 16 Jul 2024 20:52:44 +0000 From: Josua Mayer Date: Tue, 16 Jul 2024 22:52:37 +0200 Subject: [PATCH RFC v2 1/4] dt-bindings: phy: cp110-utmi-phy: add compatible string for armada-38x Message-Id: <20240716-a38x-utmi-phy-v2-1-dae3a9c6ca3e@solid-run.com> References: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> In-Reply-To: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> To: Vinod Koul , Kishon Vijay Abraham I , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Yazan Shhady , linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Josua Mayer X-Mailer: b4 0.12.4 X-ClientProxiedBy: FR0P281CA0125.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::20) To AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB7586:EE_|AM8PR04MB7907:EE_ X-MS-Office365-Filtering-Correlation-Id: aeaa2084-f805-4bac-b3bb-08dca5d93dc2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|1800799024|376014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?t+n6dyfV1+WqfcG+fiebkI1O22k815/?= =?utf-8?q?9FzvqOB1OMu2CqTxolMMrdgDydAWXZxWY/U7eEkr6m+2U9V55HqLSdEV/XOQBut95?= =?utf-8?q?G4FdwbQ5Xhgm8Kh+cahMsg7lAjofXN+HPILtCt6o7xdJ4A9grLzglLWA3PwoDsNeK?= =?utf-8?q?WHzYmmSN+NDUXkkute+1VcgEdBZWkEHryEjIa7nfreGjUHLI9JjYZXC9NLUYHgWCi?= =?utf-8?q?EpzzV8UeUj9uXSND3x0r067TXdJW/248X1FnEuYu+ooUNMY7gnzuJAMeUnTOs8988?= =?utf-8?q?c93z3IBIYk7ewiCPT4c/FUrL4O4cXxEtGcUGwUGLxIrf322Y0rc7xeTjzQgfJsPFP?= =?utf-8?q?C5QP/DbLWbnNHZa1Q7E+KiR85jW0OqVz/LIXuIHjBvEY/qSuWEHRyvqNPnpWDF0/c?= =?utf-8?q?1PQwc7DzRn7MAxSeXk0bPUczM3yu9R4rGLuhkvKobTujjutbZXK2Zmkhg5DVvzHy3?= =?utf-8?q?uKXaQjDH1rWni9Bg2QEe7W6TEfGK1j0YNIdgaZJTxtwN5G0r063597Rw9vIeVpuc3?= =?utf-8?q?NmNpdtk0R7CpX5stCXo0J22EnoPblcX015wQgTm0xH5STBdXv0HVGjNNSuTZr4hTV?= =?utf-8?q?OdfLAL6PwTuGCqsx6yEvw0THBHHlpcNwjb3NB/rAniiLzu7XKXsWIL7tLFhS18yST?= =?utf-8?q?mXw4i24Viu3pHuIH84Dq72wOIWqttFkcI27gguxgcPNffP9hQEQrJ9tLLOK1xHKSA?= =?utf-8?q?S1NitUchNNl9UJm8xEAQ6lBVcZgiwRFD3EVCg+71nxIUKfU+e4q+P+WetLwHd7cqc?= =?utf-8?q?4k4nP9CR5I0X2F+0JnaiKPLAK9oNWb0r5jnjmV+xfdAbOPcVxSXu5o3YVv0HAqdkg?= =?utf-8?q?jbQwnSHJI1Hg5iWyd8W6T7B7KchZy0qNOcu3uYNap4TsJz41J2XKmpa6SDmZ0SBpi?= =?utf-8?q?4US7q2HrD+YoKzCcz15Df5nk0jSSlE54iG1ID8rVS0QfeYVF58Whw1+EvbbL51V63?= =?utf-8?q?WZuhi70J+SGqmUkymsuclblh4Y2EgQsHy4piRKQKtxZjgpsy93krNgnsTvRSpEwXc?= =?utf-8?q?2DA2PMn86R/7cFxCllz+ZuwMFtiWv8sahYjsGVwBa1K+YASXyWUylVWiqoPCiQpym?= =?utf-8?q?+GEUcqIbodpI0aG/16CIXhQ63/Ahczrr+z6sK1ZoPfAqvtCBZ9npuApkG2XdpY45j?= =?utf-8?q?2rUIs0KVCWapD1H7Uv6xz0OUcQBkDqAxK1cM1NMfa+h9bELQx1TOD43b4ev3aCvXW?= =?utf-8?q?v3PDajyEBPpjKHW9imwxY3ZJWxgkGr7MekkPK/gjTvP1qUAAUxu4fYw8elwfuWO+p?= =?utf-8?q?7Qv2c9zYQW0KF1aIOpChdWf88n1O5ktLBQ/4+HeCit6/ANyC/2vb6IcwwdPzjdGfC?= =?utf-8?q?kFuZtQz2MkXtU9cEfTvyLWK3njUu8lRa4A=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB7586.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(1800799024)(376014)(7416014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?EoERwggxFAvmf/oSte77+hxKQuKb?= =?utf-8?q?4guTNbNhZ5bxa/9gAeJeL+8PYH0Ysw0EVXe1t3kH2ToasUcRuEEThIT5a9f31AvlY?= =?utf-8?q?sBZkO7rUdTmbxPzEZOdXgn/WWD+b90ca6WLPMoH2s+CCpHyyDaSdBLOR8ptJFLHin?= =?utf-8?q?ELELXfTyc59OcGJQ8UUvyrp9aTMXOtJKP6rnurfQoan10vcL6SwGlSFmjgJHC5JjQ?= =?utf-8?q?djEZH8BB/Cw91yimCKr/HW11LbA+QKGU89jEfNMKcXTV1Oeh0oAq987aSaasoOOmX?= =?utf-8?q?T9vcBNMwMpfZhsfwvFsB/loBX2RScvvoChjP+LDlrVUNlp/+ndVtQMDc4/Cfwn4Zh?= =?utf-8?q?Fu3cDalJqQmYdXAJe64GtqMbMfjD32UPqr4PKEDgOv2Q7ac8599/BAGIi3Jz9vdT9?= =?utf-8?q?yuWW0hE9mlnlA9+qnHZ63DvrvwWpvLZZX+6tO3bW44KDpCIsMDgjinnuOLKriDZLl?= =?utf-8?q?gqftNHvDHPblAyayL0AYfWMtCdOqB87T06G98Xj5AKbMhYm4nTSaaBTExh0KI1iMJ?= =?utf-8?q?NUgXnpU78jr3EB4W0iSywL7d4tZI8d2LJY5VSaA6D4k206KNSUaKXHWjsKy9viJCx?= =?utf-8?q?FCmrlxBh1hwe2XdKR4OrkITGlzeNqmyua0IzZhh08+IBYroHduckTI1KjyHNz+duI?= =?utf-8?q?xrPwvrzkqhNxBYrdVV1IEgKzS4Ciws8sn7K1Inqp3RK5yQcaAU/O5LsOVgRrTCOFe?= =?utf-8?q?fNTFQ2BkJlmEVTBhciQkOCR2x5gj5n21nfWNgZ6du2ZC9f5s7Bzs3KD+CBsoCKGfz?= =?utf-8?q?HVUcKJZpkVnb+yNo/MRAxkR0gla0lFC1+qpKRjSYryPMHCF3wmeACvgfx0AUPIMXn?= =?utf-8?q?+EK5dwttoo+rmK1kGBNybLla8BlGMgb7YblONtRUC0L+FEcP7eoh7MXohapk0KH4h?= =?utf-8?q?7npTGGzr4sXsok5iu1NLdAMB2z7CQ+uhs86fThCNNgkuavwF/7XyBFjnldL2CrU84?= =?utf-8?q?JRpJK+jGlfYrn9K40PAcVf/lBNSHxaRVeOgG/sGxpPnh5pBXfLDMIoe5rQrL+33UU?= =?utf-8?q?YuosrVN8nHEHPkT4PNpaQFTTWfTtqkdNqlTa3SfQR1tpZpBZrS9sy/aNu3NPfpDlM?= =?utf-8?q?ReAjhlW8jzauDuSGKtlIONgzF/+t9VQM+r+LyDIvJUXFbqkMFGL9jOB0Qp+uiTsFW?= =?utf-8?q?pPLjMpnH76sx2PyH5K4hLTEh0YwS/bK0GEufGn1GRiXuMSX67x0PEPeEyYJ6dgpmg?= =?utf-8?q?gHRvlIrf82XF/J3teJWZ5P2HMagt2n3w7dj2zdlspszOpQlgR18RARYSB14hItsmC?= =?utf-8?q?FGr2tbgC2mg1gJKeDIYRWNXfDFGlQbbkhV14a2t7rE9PKnhNti9XY/qdIb16Sepmq?= =?utf-8?q?j8b9J/KNrQoLUy0Yn/EX2jnwFK63wY9FaNYBk0xtXVV6cpG0v1JdI+l7XgF53CwEI?= =?utf-8?q?Z826ZLhzHw7NNs44QQJYcd7WFaXekOoorszBj0yY5Iep1CLmPVtEIQRMY6rJSwTDm?= =?utf-8?q?N9DP5DuskCjXK27TV3fVWYop3T2mY0TMc/GP1HGeWf2XvUbZUoqyqgaSziwG3IO1A?= =?utf-8?q?kSCLcwGLsBo5?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeaa2084-f805-4bac-b3bb-08dca5d93dc2 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB7586.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2024 20:52:44.3512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: krnyEfCuHFf4bLedAJqJZkiRtvzwYliLQRvZlgQ32dzlAZ6CB4qTQlUV4a8Ic5tppHW2MBH8vghC0dsECXmZwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7907 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240716_135254_042998_5271C3E9 X-CRM114-Status: UNSURE ( 8.14 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Armada 38x USB-2.0 PHYs are similar to Armada 8K (CP110) and can be supported by the same driver with small differences. Add new compatible string for armada-38x variant of utmi phy. Signed-off-by: Josua Mayer --- .../bindings/phy/marvell,armada-cp110-utmi-phy.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml b/Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml index 9ce7b4c6d208..b90bda10b779 100644 --- a/Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml +++ b/Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml @@ -25,10 +25,21 @@ description: properties: compatible: - const: marvell,cp110-utmi-phy + enum: + - marvell,a38x-utmi-phy + - marvell,cp110-utmi-phy reg: - maxItems: 1 + items: + - description: UTMI registers + - description: USB config register + - description: UTMI config registers + + reg-names: + items: + - const: utmi + - const: usb-cfg + - const: utmi-cfg "#address-cells": const: 1 From patchwork Tue Jul 16 20:52:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13734898 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 70FEBC3DA49 for ; Tue, 16 Jul 2024 20:53:52 +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:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=wiLEP8/T6NzwNCHhzc67ZcGcN4QLKp7dq1DZYZA9YAw=; b=suQ3QIgLU2veRdUR0GgdUsCkIm BKBQfEqV46hLFlTV77mboszth5jeJcK3eBhiF9EQV5rNCnPNMJb2MMn8VqVVroCEDRX7Soj7UhGDm tCS42qcRytHGkQJDDctX7+jlofv6C5HtdeRLcYWw+U0okgVutHn41r1p2U1adU1ilPOn/G1Nszpaz PCdcPFDiSIpf6rye4I0gUy2V6x2gF2j0qrPGEDIQzoSG0dc1xqc16FWlJJr7EnFN2PhfRRzUEyDUG K7dw+H9WtgrvIHaz9QXW196Ju0w0bbXlWd/X9uf8BxCACG03nRPv4P5hZux69KCEufEqie3cXv01c KobGZ0KQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpBI-0000000Bjv3-0ZKQ; Tue, 16 Jul 2024 20:53:52 +0000 Received: from mail-northeuropeazlp170120003.outbound.protection.outlook.com ([2a01:111:f403:c200::3] helo=DU2PR03CU002.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpAP-0000000BjXu-30lq; Tue, 16 Jul 2024 20:52:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uA2QhjOhGkJBQ3bBX40ChyesDVtduzshoWryTLywgYNVIGrGVtURO74RN8rSZPndrQl33x0Z31xUCvA9CLTkcC2WNu/3/o7QF8wRmoHsX5UpKOGNGsassn2DKDo3PV4uNFnfd+ChHaX8HG+4ODrYL9meSHqi1e7bwz1ExF+3OqKRSXUb2pU+QXJSkzKBdpdGSF3psQQ5TNVlpEM60YxKiRaBf6AJtvrx50jVJwXarcR9UgEfNKLBkS7PmJIzTCTfCmtxbmvD48yY378l2ad+E7IM6NOguS53MEVA3UdH1BUHurDA41ZHFvTakRsDGsUSWRP/cv6QpXvBJH6alxP3Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jgPpoMARCDZtwyufpwR5McVZjH4VaeNPTmvphkPPwO0=; b=ya6VHtGSc/4eW8TXLSlPSvfPVaftnKRcgNjg+1AcwrMTY1olvvTrmH0xPVXniV8RL6f3w3uxplcHD63fBrB7pekCarjBaeBLhch/Qn7w5KF00t7gy9NXo6kyzP17iZq53dw8XTkL9xr9bxwcZ5z4+mBPeG4x485rDZ2ljx2RK2bxVn87Dghe5S0aOMRU0qzDpOqJ2DQMSL5ydUkLUppuoaSu+9YtZeBfqtznQLVwaPQGOegevq84aERTo+GjAoEMp4HnqyNuLtyFxBDTWW2pp9mCq0PJRZMXbtIaFN3H9Dk/24Ul+Bw6tgbD2clnnpfAhlECnC8bSEOsOvyYgg0RgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jgPpoMARCDZtwyufpwR5McVZjH4VaeNPTmvphkPPwO0=; b=OriEyJQamHS0LpmCFEgAOM+htuyZlepsk+vDK7uwXVlOSCMWDsxxu4y6fMmPhc60eLJAA4jEtKPyYR7USmxsOQap3MJDRLW+DKxF+EYo91Ir1jJEpPK/L/Jaw1kLvglxCYWJyZD8Ft0spohg+8u2nc5eGwBnPWzhsl22eknT414= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) by AM8PR04MB7907.eurprd04.prod.outlook.com (2603:10a6:20b:237::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Tue, 16 Jul 2024 20:52:44 +0000 Received: from AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529]) by AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529%3]) with mapi id 15.20.7762.027; Tue, 16 Jul 2024 20:52:44 +0000 From: Josua Mayer Date: Tue, 16 Jul 2024 22:52:38 +0200 Subject: [PATCH RFC v2 2/4] arm: dts: marvell: armada-38x: add description for usb phys Message-Id: <20240716-a38x-utmi-phy-v2-2-dae3a9c6ca3e@solid-run.com> References: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> In-Reply-To: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> To: Vinod Koul , Kishon Vijay Abraham I , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Yazan Shhady , linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Josua Mayer X-Mailer: b4 0.12.4 X-ClientProxiedBy: FR0P281CA0125.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::20) To AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB7586:EE_|AM8PR04MB7907:EE_ X-MS-Office365-Filtering-Correlation-Id: fcbb9154-6edc-442e-c53f-08dca5d93e13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|1800799024|376014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?s20jOjLa4PpKPiix6/nkDct4c7+R5TV?= =?utf-8?q?CyI/lLzO91vDKRg1n7h8WoMUVM4e8JRb4PphtQRH9ZbLbMDb7A++XIj4QNQDyY7MU?= =?utf-8?q?iC2Og/uOLkGPCcXSAJSFZYQQcI1qyDqjXh6belWDHNOVj/n7Jq9pWJ/VN2LoRmO7s?= =?utf-8?q?bU5TBfBVrIL+mPzlM07YR3sDgoYY7lq+Y3FRwHiQ9odNyMdA+1bvy3oP1Fcs7QUmj?= =?utf-8?q?8J9N+LsLzl2hnwi50BA8db/Z7URtTijc/MQFiBNepmbUEElQe57jnBH4D5wrPcGrC?= =?utf-8?q?PO9Myc46Pt1FqxgtsX3e57d2SfAJYm6uU7wKX1IZ08Zt3CuYc0Wx3zpy+XoMwTbN1?= =?utf-8?q?S58G18DLFDjjmkqNNNmH3rzSmJ8prt2qm0ZWQ6K4eQMKeHh+i6F+X4zcf7uRkT6SD?= =?utf-8?q?HU+ia5Chdu2jzqa5aAwfNO3gBNWzHfev4fTYBGKCCiIIqcp43QfSu1rVImzxCEZfs?= =?utf-8?q?g57Jv1ENsZCiv4uUpaKVbKOSaQzGAOOskQ5Fev+z8yPbSuLwZ7xVTmjueI+aBFaq+?= =?utf-8?q?GXJHK6kLjmfZstBeIUi5aOG0dAT4UE59rWG04WxmwG3i8fMT5qCwty+mZ/hjPfbJ6?= =?utf-8?q?sARMc6h/eEc3ZXmkGdQ4kreUQXL2pkzeNuZ/0ISU5kSRsR4GeEivyUWB6i8G3JKsP?= =?utf-8?q?SDfcx+AvpdGhMIiWhFS2etdWw9+w1JC0+9TH2/GXZBEFc2QbJDiXkjol+/H9OzVYi?= =?utf-8?q?3I2u+uIv0oLcMbsC17tbKWyHC9RVCU8g683fpuOX8XcbfRVNN4H9xk0ZRpQO8jYLS?= =?utf-8?q?o3AJ8zBDnUj0zE5waSN2vWX50Fut6QnK8XWmSItHZmH6TioqFAnxk6rKKKxYU4WgM?= =?utf-8?q?pFSSzK8xKoMEqVTZeXXkRbuzMY+BJs6AmWkxV5S+zFWM2MI/mQJW7OIGGF8mixjaV?= =?utf-8?q?29RXfH+JuoDb7JE6W/fDMf5zqCBjurzreX9S2AP/j6HBxbKkIPh+9uBWfkuk/acNN?= =?utf-8?q?bbbr8wMZq2NycAOURG2ZFu03FifJpLAS8sDNvY84wH6JOsVpcUlMVN+DTBS+FRwrz?= =?utf-8?q?IEUp0Ch681HyPr4WckrETjNQAL1RtMb6DLo0Q9ggnpg2onS3zZjMuUGUchInQHw67?= =?utf-8?q?nkSOzRX7AQLNRTA5TuBApAdCuQ8ghyU6QiYsmFNtgo5Zql8DRPocwjwTF6scQuhXu?= =?utf-8?q?ABzlUV7uhpbqXZxtehBKxJvtsrAeeCknE5t6tsgpGz16erQzQdeBOh4E+Dr07AnnL?= =?utf-8?q?W4i2EfkMX7AjWVA21rx6gUdrQXlNNEhYnG0BcDCR7GSB7d8nJM5sOqKBzFZAy1Lcd?= =?utf-8?q?SMv5MEFKBEbl+YYkgVMw1PXt9D+DUOxqWhkDDcI2yFjlN1AkM6lH0QiNl1gTjaOm3?= =?utf-8?q?WAOFQhkP1TdarjW6oKlxjdcz11BDx2/WiQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB7586.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(1800799024)(376014)(7416014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?W1H1wjkjPrW1odw7dAtbNv7TG5N4?= =?utf-8?q?mhWUQH9bxxZ4jjFoCevihxd2CywtNwnQuVlGOH22/cRrIL8RuWZzKqgeuGgzWf32l?= =?utf-8?q?/ocLRldBE9jD2UXMft4NLWC0wPc7yln5Vi7W90Q1n8g+U0SBlayYQz2bOC6m11BvQ?= =?utf-8?q?IvFsDNfDxdjcQzhmO5TRfC725LGrAHDzkz6eDEZO1DkBz+lyNTh3dO4cz3bZ9UE5L?= =?utf-8?q?hNZd0QwumxMWlIPFkXw7YnnTtGD378/Q4AW3sFXEoQCNXuy7YoxAszNWbgWR3V+hV?= =?utf-8?q?kpg0dCFm41FTvIs6ecHkQ/lm6YbyPcNxNqCmNvBKr5FATDmKo63ez4m8pUa/cWSp8?= =?utf-8?q?cJ2jvQlfeeqstjyY3CI4EqAEmY8U/EXbqfpn4d6/ori2D3DsX7HUSTNAvAAzoq6ux?= =?utf-8?q?BsI+Mzu1QRke/BtBf1RHI5kzN0iEHSEyJz9BjPLeMbpdxTE59L9KKMiVGt5IIMMUK?= =?utf-8?q?tYjdXqiRvOPwUxGE99I2UuuEcEhnsZiYhINGk++4BnvAkG/xB02fV6qgvwpO3M5By?= =?utf-8?q?yI1O6re79lOaX40Mz4eKGbN+QHCsTVIAORN0AbOme16qfEbjdi8BMa3Hnt2mYKza3?= =?utf-8?q?n6IhdOA4a/QwJlDZtyHwoj+LSMJKgso9cx9qsWgMOHPhQFCaCvMbaYLlq9sHNo+0O?= =?utf-8?q?xILiteFCzTTzBrPe8nDa0BE++Td016VzxoL1DwcQSACRIbaXxMkvvrL3cUnL8lwsL?= =?utf-8?q?NW5j2EvQEULq+d0U5QZpr3nK/PlU6/xcoSLRYH+h/ofRhurSZvFpZjB8sSBGqbwON?= =?utf-8?q?4lc9vrD3b7Ru+jeH1x8Ij2mrvWx/icvtjBqiOqspdkdNND3u1Rh6APQNZpXaavDHO?= =?utf-8?q?9WAnG5w7+elSfUWjRmC+HGu7u3OcClJtA23MMFPFTEdG1GDZmdot9wsmDn1n4P8ce?= =?utf-8?q?zRS9hsCrLV5bDulC0am9IBN3BlVkdnxpvj+r5NNX1Da1/HVfuVvnLm0byaqvTuBcO?= =?utf-8?q?jjORLKR5fhn0p1xzb4vkDhLPNBWQPsXJSUUkyQMXCMx6ZhKMaexrKsyiFEvstRla6?= =?utf-8?q?U1ytsdeCOF1gLgorFQ8riuW8TnQSAmIfWoKLvZC5AGp3FsbdijOeG0IrlRza19wVn?= =?utf-8?q?oQGbhDKGvQKIMh5yXo1cOj6XEgPR5l+UacOU6WI6pkgq2Y6EvZOSJkssCjMd3NDck?= =?utf-8?q?FtX/G/LD/6eX/8IRnxl5gl6nBDB4Eczl1nyDoVuyYww8OW+3fnfEBcBz5O9jSmzVq?= =?utf-8?q?k1WHA2r9ttJR8hzbOYAWxXEomXbWIzvoy0zlqaoky85Bv+ucXWMLuP7bhwJzn4u+n?= =?utf-8?q?uhNV4/ogT/mS5/y5acdXJehWWkwXxlQrnPo9MPhmTBFTzT9FMOLk+UkXHjcUXTLd0?= =?utf-8?q?8GFki3/lYSaw/O/YH2OUZfkVH+r8bDY7moJByQGwuL2tUwEJa7g8QoycsKJ8bGaLw?= =?utf-8?q?5e9eRn2uLG/VBW6/XKTh8RJZsI2LTN4LuureJcgB25T0PMJrD7+QOzvCfckqiLrWz?= =?utf-8?q?4sjMFj8XFVIYnHh6QgytW0m+wLRWKCUy4PlII6LMHESPmf6pc6rRnNIrke/Dta8v9?= =?utf-8?q?JYxcbugE3r1o?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcbb9154-6edc-442e-c53f-08dca5d93e13 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB7586.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2024 20:52:44.8528 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: P9HGy0otIDKklpOflQ3rJJKdsrUelBf37E8vn8HW4LaWFGPxn0wMxgre537q7V8sIg5elXs734MHCDarI6Dzng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7907 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240716_135257_806912_66502559 X-CRM114-Status: UNSURE ( 7.37 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Armada 38x has 3x USB-2.0 utmi phys. They are almost identical to the 2x utmi phys on armada 8k. Add descriptions for all 3 phy ports. Signed-off-by: Josua Mayer --- arch/arm/boot/dts/marvell/armada-38x.dtsi | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm/boot/dts/marvell/armada-38x.dtsi b/arch/arm/boot/dts/marvell/armada-38x.dtsi index 446861b6b17b..701a1c0c19ad 100644 --- a/arch/arm/boot/dts/marvell/armada-38x.dtsi +++ b/arch/arm/boot/dts/marvell/armada-38x.dtsi @@ -392,6 +392,11 @@ comphy5: phy@5 { }; }; + syscon0: system-controller@18400 { + compatible = "syscon", "simple-mfd"; + reg = <0x18420 0x30>; + }; + coreclk: mvebu-sar@18600 { compatible = "marvell,armada-380-core-clock"; reg = <0x18600 0x04>; @@ -580,6 +585,30 @@ ahci0: sata@a8000 { status = "disabled"; }; + utmi: utmi@c0000 { + compatible = "marvell,a38x-utmi-phy"; + reg = <0xc0000 0x6000>, <0x18420 4>, <0x18440 12>; + reg-names = "utmi", "usb-cfg", "utmi-cfg"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + utmi0: usb-phy@0 { + reg = <0>; + #phy-cells = <0>; + }; + + utmi1: usb-phy@1 { + reg = <1>; + #phy-cells = <0>; + }; + + utmi2: usb-phy@2 { + reg = <2>; + #phy-cells = <0>; + }; + }; + bm: bm@c8000 { compatible = "marvell,armada-380-neta-bm"; reg = <0xc8000 0xac>; From patchwork Tue Jul 16 20:52:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13734920 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 50184C3DA49 for ; Tue, 16 Jul 2024 20:54:11 +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:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=VF5xnnUUr5LrRWaKOncK2o1jo/1ndLZfN/ugv+I35mw=; b=Itcmnyei7dm3ggxINUkUvP1hAw 46y2j6kB4cVyRBInZVrRHJ5cofh5IdfZXjTVGIq3Yrlgcedlh3JJR9tJHTOMNW9xW2s0XTFIyddp6 910kKuj1xggrE3HLp2bIH/Z02Jdb8kwXq7ns9CidzaMTEbzx+E6jYCu+UKTpX0wIcXZOIUPPKMhMM FBej8Qq66MkRN8pzxzjVpKF85WFfGDh9xj0VsfA2stQHxzR00rhkkHIeHSmvjx1sqRS2/3zx2YzN3 Mf2d8iDfsDZd6RsiY4GMYZadfvz5bw74KEsrlMak/kqyz+GI35dp3aKBOJtivvIc6Hm8EibueQkol HDNyGw+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpBa-0000000Bk0y-3wwd; Tue, 16 Jul 2024 20:54:10 +0000 Received: from mail-northeuropeazlp170120003.outbound.protection.outlook.com ([2a01:111:f403:c200::3] helo=DU2PR03CU002.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpAR-0000000BjXu-1fta; Tue, 16 Jul 2024 20:53:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hLFV+kO6hUFNLOgqv4sejJEmBsJBXUw3qaPdCy8blBNWOLuL2TVuYR3voPta1V9sZr2d5iNdFi7rUiTaMU9qhXqoDM9EDqjCVcy2oXOqG/9+bRupUzvxcNZQASBN5oZMd5zbOybQR3nHmi8gDvEAod/OkrXx1ooM28sLrRIRfvWoU2yVe3pEYNyinGU/uTJypRnj1zGTFzIPMjAmdOKLIU59vqJr7MFiDQETSgi2xD9Dp+LWiY5pdKt4mPxuMEtIuk6c0IuTbvosxPjWj7QLCVbcRw7n7okucgQsmuO4KLWfw3alS1Srutfrh4GAI15hGKMsz1MToWnH8bn020jX5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bnO1br3YbOnp05EKB+1CCxppNWloB0QOTZNpNYg4YjU=; b=hU3A8Dijw3Uv1BJYUz9iSt/mb7OrTYe8Xlj0UFAVVHbBXQt0NPDinGOvnnf2jrbmY8xamBkl1MtnfrNPANDrnC0Cs/bfIT+2Mt0yuLdFCDjjngkff6evygE6df9/4uK52UY2zsruJd+Am1eYjs5r8SR8zb809bgVoArNqShMXBIbESDG66X5M1Yb7dr/8Shra1gkZkETXHtMun35bzpdU1Kwr8+R9fBJ4xmC9mOdMsRaVhI7RisVryUiJIMaX0UtrD/1+HCYB+4pjPy6JJsqUvDNq2ZsXSw2lSFMuEmNiaj+7q9PdQObDi1OzCrKcI1+Uo+fLBgwU4k/QzYvlmZICg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bnO1br3YbOnp05EKB+1CCxppNWloB0QOTZNpNYg4YjU=; b=KO696+jaQZte5Zb9y/NN6R5JZnvlLNuDN2skmlteYIRvu1PYdfes9faCpjie/5qf+jJIEQbrIC5Lh5TzPRH5oscAnK1vCxrJ0Ez2rwD+2dyW51MoWAw0ltj+D4VtfMIma++F6Kyurl2vZyroEZx8iYV0lWv+PzNuOYS3F2BsMhA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) by AM8PR04MB7907.eurprd04.prod.outlook.com (2603:10a6:20b:237::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Tue, 16 Jul 2024 20:52:45 +0000 Received: from AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529]) by AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529%3]) with mapi id 15.20.7762.027; Tue, 16 Jul 2024 20:52:45 +0000 From: Josua Mayer Date: Tue, 16 Jul 2024 22:52:39 +0200 Subject: [PATCH RFC v2 3/4] phy: mvebu-cp110-utmi: add support for armada-380 utmi phys Message-Id: <20240716-a38x-utmi-phy-v2-3-dae3a9c6ca3e@solid-run.com> References: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> In-Reply-To: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> To: Vinod Koul , Kishon Vijay Abraham I , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Yazan Shhady , linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Josua Mayer X-Mailer: b4 0.12.4 X-ClientProxiedBy: FR0P281CA0125.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::20) To AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB7586:EE_|AM8PR04MB7907:EE_ X-MS-Office365-Filtering-Correlation-Id: 97650bb0-a8ef-41bc-02ee-08dca5d93e5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|1800799024|376014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?XfWk3X2Wdlgem2jUqpL9yNOTTseHdX0?= =?utf-8?q?1CS3A+Xik279Y+WvlPiRAfonoBFLfMJulRZ/rBd1P+0BEJDcD4zAQif6VeRwOt9Yv?= =?utf-8?q?fu/BC/JhsfICdTFoGUA9ZYgd17JpVDts4dbqcTOWyRuXBsm6KE6EB2UVFLUPWWFiP?= =?utf-8?q?mswlIVHMm8CXNavgx12Qmo89rOUUsEElr9ANeXZh0K0d1PFPpoKZnpQyp+r4UiY2x?= =?utf-8?q?gNbsmzNYAbOP5v60dh9DTUaohipyco1rkXl3q6ft034H6mn9BOqZvKwi2J/a3sPPk?= =?utf-8?q?4gkp5Fs9ZBqRRzl+t5rhGlP+u1a/2XD131r2q/OiUWNU5miJABq7tAZz9inlml2c5?= =?utf-8?q?eyZOfcUQB+MZzpPABLLTJ//0vM7uK1sqivVGkh4ru5CwSCjeesjJ0edCq2YsdYdxX?= =?utf-8?q?SFv0QAVIGoMgTUZ2w5HkDfTOsnhrSxge2T5H62LVNaQoe5y5jQchtqdB71AWwywXG?= =?utf-8?q?5QU3YPD3ofFCZtf3XaPsgNDNppf/NyLbWRhfWgSqUOOVx2nDuuZvASBoblLVbyMwK?= =?utf-8?q?lCqHCG7H+sKOmp/EUXnZX9E5PITvtfvURtVJlIzjL9gUHDvSa/z3Y7Dz9lPDeGduU?= =?utf-8?q?ZXLkC5wRq9VtihrrYT3VmlVP9pQySlBJehNHwabx1c3qJ3IdZFz+Pqq6Z+ZrbjkTZ?= =?utf-8?q?MCbOT9G3RW314A7KWsluXjGrNMBRdGeIiLUVPqNJIsHBcdBW7QCbM07dPRJ3sgkrx?= =?utf-8?q?95+Ed59tEfEx7yRZZnewSzsV5YMVKAy79ioH7d4trExmIkJA8hLtgHn6ECAxyXHp9?= =?utf-8?q?c2oNA40UqxL1qgnhvVS8n2xbk91guHMbsrxsGjG+LSr1tsdDuabiEZgxScjnVPRVB?= =?utf-8?q?Irz8DGBLxIwqK3De2gbSXy+Uo56480phbt696zPReUllxVM1xLF3fBj3aKVgVjKal?= =?utf-8?q?0EaWTwBGscysl15SYWgK1MPD+2GOxHhAZ6hUQVml4KJ9ihvUQmLiFZtIRiLbbyrf8?= =?utf-8?q?6+EmD0pHbIr1jmgD/Je8Kh8O9JvGx0qmrzcSsqaQWBdI20KwDAWiqID3mAGqHB72r?= =?utf-8?q?MtK68mGm5bJLzLo6a9qeEN8PKT+q3XT4T32sNqF8MvLr0OF8J1wCw5Z64Kn3AJFAq?= =?utf-8?q?Qna4O8AfMhLn6JGPCs+wa3gQBKAwX5dSsHpdOsHGWB6M77etUrDz6nKbfR+enfFiH?= =?utf-8?q?Tbv0+zxiKJSQ5k+s0R5boELpAuqv2EY2Crklk61pECOz79O1luXI1UD5aCSjTBXT8?= =?utf-8?q?H+mG8uGKrItBuy8zM9zRUyJRSwqHUXz0FGwm5E1q1BrOCS8zqkgIG/ZQnjY2sOUvX?= =?utf-8?q?GUM1g1E/y1BzhuHzE6CMEnCCkSltvF7dsD8i/Do9sdzcAqVTTK8SlRwcGM1yGdxgY?= =?utf-8?q?ljmGrBMuHlslRGDKhYW+l2PQ6nKV3Av6ZA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB7586.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(1800799024)(376014)(7416014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?v5et9+o9Big6h8A4a/gUpCnA4l8a?= =?utf-8?q?UhQNc0k4MfXneU1Qgo38qncv+Z4B7MhzTzvOyECPh7Wz7zkR4EHwpheB8bMZXRopo?= =?utf-8?q?Q4V/pmbxMqS3x5ryREmuVrxKKeCGVW0aKxDAcFQW6OpXAJ7T8H3Gl51ayudkF9MY7?= =?utf-8?q?En/qF1EbZBjMOINaVT4knxYwJx5uK6e+9BtKrIhjglpkWfrm3Go81uX/3o1Xt5NUk?= =?utf-8?q?y+hqxFWsKJQAt3OAmL5/MIf000cqxee7XaGfQv+Bo5pQNIeL6JbVoYeWZQoDqrdkb?= =?utf-8?q?7lCmMbje5YCqMY5Bcepps1YIaVu+CE/MqisHEdhuna88XPRuvgoGCJf+3vQtWFa3L?= =?utf-8?q?LArl6zd/qWYaLuZadLEStHVCEPjQyfjS6XzbNoNxiQHsyIvQtqWqo7Hal6MGwROXG?= =?utf-8?q?mX4PcLcy98Jxd/kwEQQf31qF/KrcqHxfof3wpuNudpD4vIrtHOw0GMo+wcf3hDO28?= =?utf-8?q?RSr4QDY0tr2PpfrcvRoViWPMPZFENdp7jyLM+3rKZwcotRlYBB6yeQ4ZnSdkm48K0?= =?utf-8?q?21fv5a+xuW8B052VbFAgCzN2gnWx08nUVdrYj57r/IPhzyrYVFJr9hI/WNdGJ6TO+?= =?utf-8?q?FI72SYq2gnKeztH7mVhYM2E0LVkXBsR2U2eoXiIrhy5NqXmcgl2kpVTlAVGthruRU?= =?utf-8?q?DXQWfrRSz/1uZZBJwGWXL658gNjDCmKUr0Z3fipJP6rUjZYkO0t/Y1C7H49eoUNTO?= =?utf-8?q?negnf1mv4bK1O/By138pYTpWZcz3pKC7g5/T356J1hbwDcBHFiVnOcbWmOWIe5syd?= =?utf-8?q?ML6PFHt1eQ0znC3O2IfmJbVWj4KzQoJPaSeuD76gUvI/NQ4ES3VVi3o4d9iRdTREw?= =?utf-8?q?/CCcgXxvzAC8J8YDs7aWODxRW1UgUoV3W1X0cta/mO4o+p5FCSb83JNIjGyaRnlVT?= =?utf-8?q?58pDyHqBc4udPq8AojAUljoo6nbZ6Xgs/FCcrjJZeIzv0V4IshrxEzSsXllmU6x1A?= =?utf-8?q?iCRkkkQWmfm6eLzoIYjeHLeVai5Bv1p3z7y3EISPAwSsO2M6AIC2q/OPXWYRzdx86?= =?utf-8?q?cEoR0G7LEorPtxt24a72QmvfcA9DiHsgHKhuoMDDkuGA6+Zl78aLImhaWY4qVVVKl?= =?utf-8?q?iRAKuvRZBOZvthIdZ+CGMeOT/vGQ71UPHAxme8Lz1XDt26RSJfSVkeRjyAR2+ScEn?= =?utf-8?q?BXA86rHXcGj4zyanAUH5tWdZhqXmPX4uOoMoSC2BIY3RzWluZrlYkb1iTR7oh+EdI?= =?utf-8?q?2wGtaukdQ2kMlEYeg1w4V70oOBkqoFH+ZDGsa5w7rGD2Id8e9FpqFuiLbTz43fMqv?= =?utf-8?q?dw5JoIkOVFT+q/HSUcqvZ7SvzfK4PLE4tQ2VkqJqJkWZb8pQJ4FPlq0qvRNv0AGv8?= =?utf-8?q?psrjt8fvGV4kgyTF0v12VuphquIuLGOmT85+g0Mr4FhVvXjROIVbZve1gY1pWH8Dz?= =?utf-8?q?jFg2OSRPNWPVYSBBVloSLGDLu3VCM/1m8Mu/A4vxdgUJroTM3vBas7Yel1LJcyTLO?= =?utf-8?q?8G0bRi2gN6T4iyUgNrFE/3Q3/6t3YRJ/+qw7PHYsLfOAuU0IZviYuyKZidqnl/Y+y?= =?utf-8?q?llEj0ANx4r2S?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97650bb0-a8ef-41bc-02ee-08dca5d93e5b X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB7586.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2024 20:52:45.3013 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XrkBbRHKZcrRQFdjuEHa+pwbj3F9R3msoLO3ORidYNxwUzi5gkJxejLUeLI5wr1kkheBlqXd5CRSTaK6H8b1Qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7907 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240716_135259_514716_47BDFA0C X-CRM114-Status: GOOD ( 16.08 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Armada 380 has smilar USB-2.0 PHYs as CP-110. The differences are: - register base addresses - gap between port registers - number of ports: 388 has three, cp110 two - device-mode mux has bit refers to different ports - syscon register's base address (offsets identical) - armada-8k uses syscon for various drivers, a38x not Differentiation uses of_match_data with distinct compatible strings. Add support for Armada 380 PHYs by partially restructuting the driver: - Port register pointers are moved to the per-port private data. - Add armada-38x-specific compatible string and store enum value in of_match_data for differentiation. - Add support for optional regs usb-cfg and utmi-cfg replacing syscon. Signed-off-by: Josua Mayer --- drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 209 +++++++++++++++++++++++------ 1 file changed, 166 insertions(+), 43 deletions(-) diff --git a/drivers/phy/marvell/phy-mvebu-cp110-utmi.c b/drivers/phy/marvell/phy-mvebu-cp110-utmi.c index 4922a5f3327d..4341923e85bc 100644 --- a/drivers/phy/marvell/phy-mvebu-cp110-utmi.c +++ b/drivers/phy/marvell/phy-mvebu-cp110-utmi.c @@ -19,7 +19,7 @@ #include #include -#define UTMI_PHY_PORTS 2 +#define UTMI_PHY_PORTS 3 /* CP110 UTMI register macro definetions */ #define SYSCON_USB_CFG_REG 0x420 @@ -76,32 +76,44 @@ #define PLL_LOCK_DELAY_US 10000 #define PLL_LOCK_TIMEOUT_US 1000000 -#define PORT_REGS(p) ((p)->priv->regs + (p)->id * 0x1000) +enum mvebu_cp110_utmi_type { + /* 0 is reserved to avoid clashing with NULL */ + A380_UTMI = 1, + CP110_UTMI = 2, +}; + +struct mvebu_cp110_utmi_port; /** * struct mvebu_cp110_utmi - PHY driver data * - * @regs: PHY registers + * @regs_usb: USB configuration register * @syscon: Regmap with system controller registers * @dev: device driver handle * @ops: phy ops + * @ports: phy object for each port */ struct mvebu_cp110_utmi { - void __iomem *regs; + void __iomem *regs_usb; struct regmap *syscon; struct device *dev; const struct phy_ops *ops; + struct mvebu_cp110_utmi_port *ports[UTMI_PHY_PORTS]; }; /** * struct mvebu_cp110_utmi_port - PHY port data * + * @regs: PHY registers + * @regs_cfg: PHY config register * @priv: PHY driver data * @id: PHY port ID * @dr_mode: PHY connection: USB_DR_MODE_HOST or USB_DR_MODE_PERIPHERAL */ struct mvebu_cp110_utmi_port { struct mvebu_cp110_utmi *priv; + void __iomem *regs; + void __iomem *regs_cfg; u32 id; enum usb_dr_mode dr_mode; }; @@ -118,47 +130,47 @@ static void mvebu_cp110_utmi_port_setup(struct mvebu_cp110_utmi_port *port) * The crystal used for all platform boards is now 25MHz. * See the functional specification for details. */ - reg = readl(PORT_REGS(port) + UTMI_PLL_CTRL_REG); + reg = readl(port->regs + UTMI_PLL_CTRL_REG); reg &= ~(PLL_REFDIV_MASK | PLL_FBDIV_MASK | PLL_SEL_LPFR_MASK); reg |= (PLL_REFDIV_VAL << PLL_REFDIV_OFFSET) | (PLL_FBDIV_VAL << PLL_FBDIV_OFFSET); - writel(reg, PORT_REGS(port) + UTMI_PLL_CTRL_REG); + writel(reg, port->regs + UTMI_PLL_CTRL_REG); /* Impedance Calibration Threshold Setting */ - reg = readl(PORT_REGS(port) + UTMI_CAL_CTRL_REG); + reg = readl(port->regs + UTMI_CAL_CTRL_REG); reg &= ~IMPCAL_VTH_MASK; reg |= IMPCAL_VTH_VAL << IMPCAL_VTH_OFFSET; - writel(reg, PORT_REGS(port) + UTMI_CAL_CTRL_REG); + writel(reg, port->regs + UTMI_CAL_CTRL_REG); /* Set LS TX driver strength coarse control */ - reg = readl(PORT_REGS(port) + UTMI_TX_CH_CTRL_REG); + reg = readl(port->regs + UTMI_TX_CH_CTRL_REG); reg &= ~TX_AMP_MASK; reg |= TX_AMP_VAL << TX_AMP_OFFSET; - writel(reg, PORT_REGS(port) + UTMI_TX_CH_CTRL_REG); + writel(reg, port->regs + UTMI_TX_CH_CTRL_REG); /* Disable SQ and enable analog squelch detect */ - reg = readl(PORT_REGS(port) + UTMI_RX_CH_CTRL0_REG); + reg = readl(port->regs + UTMI_RX_CH_CTRL0_REG); reg &= ~SQ_DET_EN; reg |= SQ_ANA_DTC_SEL; - writel(reg, PORT_REGS(port) + UTMI_RX_CH_CTRL0_REG); + writel(reg, port->regs + UTMI_RX_CH_CTRL0_REG); /* * Set External squelch calibration number and * enable the External squelch calibration */ - reg = readl(PORT_REGS(port) + UTMI_RX_CH_CTRL1_REG); + reg = readl(port->regs + UTMI_RX_CH_CTRL1_REG); reg &= ~SQ_AMP_CAL_MASK; reg |= (SQ_AMP_CAL_VAL << SQ_AMP_CAL_OFFSET) | SQ_AMP_CAL_EN; - writel(reg, PORT_REGS(port) + UTMI_RX_CH_CTRL1_REG); + writel(reg, port->regs + UTMI_RX_CH_CTRL1_REG); /* * Set Control VDAT Reference Voltage - 0.325V and * Control VSRC Reference Voltage - 0.6V */ - reg = readl(PORT_REGS(port) + UTMI_CHGDTC_CTRL_REG); + reg = readl(port->regs + UTMI_CHGDTC_CTRL_REG); reg &= ~(VDAT_MASK | VSRC_MASK); reg |= (VDAT_VAL << VDAT_OFFSET) | (VSRC_VAL << VSRC_OFFSET); - writel(reg, PORT_REGS(port) + UTMI_CHGDTC_CTRL_REG); + writel(reg, port->regs + UTMI_CHGDTC_CTRL_REG); } static int mvebu_cp110_utmi_phy_power_off(struct phy *phy) @@ -166,22 +178,38 @@ static int mvebu_cp110_utmi_phy_power_off(struct phy *phy) struct mvebu_cp110_utmi_port *port = phy_get_drvdata(phy); struct mvebu_cp110_utmi *utmi = port->priv; int i; + int reg; /* Power down UTMI PHY port */ - regmap_clear_bits(utmi->syscon, SYSCON_UTMI_CFG_REG(port->id), - UTMI_PHY_CFG_PU_MASK); + if (!IS_ERR(port->regs_cfg)) { + reg = readl(port->regs_cfg); + reg &= ~(UTMI_PHY_CFG_PU_MASK); + writel(reg, port->regs_cfg); + } else + regmap_clear_bits(utmi->syscon, SYSCON_UTMI_CFG_REG(port->id), + UTMI_PHY_CFG_PU_MASK); for (i = 0; i < UTMI_PHY_PORTS; i++) { - int test = regmap_test_bits(utmi->syscon, - SYSCON_UTMI_CFG_REG(i), - UTMI_PHY_CFG_PU_MASK); + if (!utmi->ports[i]) + continue; + + if (!IS_ERR(utmi->ports[i]->regs_cfg)) + reg = readl(utmi->ports[i]->regs_cfg); + else + regmap_read(utmi->syscon, SYSCON_UTMI_CFG_REG(i), ®); + int test = reg & UTMI_PHY_CFG_PU_MASK; /* skip PLL shutdown if there are active UTMI PHY ports */ if (test != 0) return 0; } /* PLL Power down if all UTMI PHYs are down */ - regmap_clear_bits(utmi->syscon, SYSCON_USB_CFG_REG, USB_CFG_PLL_MASK); + if (!IS_ERR(utmi->regs_usb)) { + reg = readl(utmi->regs_usb); + reg &= ~(USB_CFG_PLL_MASK); + writel(reg, utmi->regs_usb); + } else + regmap_clear_bits(utmi->syscon, SYSCON_USB_CFG_REG, USB_CFG_PLL_MASK); return 0; } @@ -191,8 +219,15 @@ static int mvebu_cp110_utmi_phy_power_on(struct phy *phy) struct mvebu_cp110_utmi_port *port = phy_get_drvdata(phy); struct mvebu_cp110_utmi *utmi = port->priv; struct device *dev = &phy->dev; + const void *match; + enum mvebu_cp110_utmi_type type; int ret; u32 reg; + u32 sel; + + match = device_get_match_data(utmi->dev); + if (match) + type = (enum mvebu_cp110_utmi_type)(uintptr_t)match; /* It is necessary to power off UTMI before configuration */ ret = mvebu_cp110_utmi_phy_power_off(phy); @@ -208,16 +243,45 @@ static int mvebu_cp110_utmi_phy_power_on(struct phy *phy) * to UTMI0 or to UTMI1 PHY port, but not to both. */ if (port->dr_mode == USB_DR_MODE_PERIPHERAL) { - regmap_update_bits(utmi->syscon, SYSCON_USB_CFG_REG, - USB_CFG_DEVICE_EN_MASK | USB_CFG_DEVICE_MUX_MASK, - USB_CFG_DEVICE_EN_MASK | - (port->id << USB_CFG_DEVICE_MUX_OFFSET)); + switch (type) { + case A380_UTMI: + /* + * A380 muxes between ports 0/2: + * - 0: Device mode on Port 2 + * - 1: Device mode on Port 0 + */ + if (port->id == 1) + return -EINVAL; + sel = !!(port->id == 0); + break; + case CP110_UTMI: + /* + * CP110 muxes between ports 0/1: + * - 0: Device mode on Port 0 + * - 1: Device mode on Port 1 + */ + sel = port->id; + break; + default: + return -EINVAL; + } + if (!IS_ERR(utmi->regs_usb)) { + reg = readl(utmi->regs_usb); + reg &= ~(USB_CFG_DEVICE_EN_MASK | USB_CFG_DEVICE_MUX_MASK); + reg |= USB_CFG_DEVICE_EN_MASK; + reg |= (sel << USB_CFG_DEVICE_MUX_OFFSET); + writel(reg, utmi->regs_usb); + } else + regmap_update_bits(utmi->syscon, SYSCON_USB_CFG_REG, + USB_CFG_DEVICE_EN_MASK | USB_CFG_DEVICE_MUX_MASK, + USB_CFG_DEVICE_EN_MASK | + (sel << USB_CFG_DEVICE_MUX_OFFSET)); } /* Set Test suspendm mode and enable Test UTMI select */ - reg = readl(PORT_REGS(port) + UTMI_CTRL_STATUS0_REG); + reg = readl(port->regs + UTMI_CTRL_STATUS0_REG); reg |= SUSPENDM | TEST_SEL; - writel(reg, PORT_REGS(port) + UTMI_CTRL_STATUS0_REG); + writel(reg, port->regs + UTMI_CTRL_STATUS0_REG); /* Wait for UTMI power down */ mdelay(1); @@ -226,16 +290,21 @@ static int mvebu_cp110_utmi_phy_power_on(struct phy *phy) mvebu_cp110_utmi_port_setup(port); /* Power UP UTMI PHY */ - regmap_set_bits(utmi->syscon, SYSCON_UTMI_CFG_REG(port->id), - UTMI_PHY_CFG_PU_MASK); + if (!IS_ERR(port->regs_cfg)) { + reg = readl(port->regs_cfg); + reg |= UTMI_PHY_CFG_PU_MASK; + writel(reg, port->regs_cfg); + } else + regmap_set_bits(utmi->syscon, SYSCON_UTMI_CFG_REG(port->id), + UTMI_PHY_CFG_PU_MASK); /* Disable Test UTMI select */ - reg = readl(PORT_REGS(port) + UTMI_CTRL_STATUS0_REG); + reg = readl(port->regs + UTMI_CTRL_STATUS0_REG); reg &= ~TEST_SEL; - writel(reg, PORT_REGS(port) + UTMI_CTRL_STATUS0_REG); + writel(reg, port->regs + UTMI_CTRL_STATUS0_REG); /* Wait for impedance calibration */ - ret = readl_poll_timeout(PORT_REGS(port) + UTMI_CAL_CTRL_REG, reg, + ret = readl_poll_timeout(port->regs + UTMI_CAL_CTRL_REG, reg, reg & IMPCAL_DONE, PLL_LOCK_DELAY_US, PLL_LOCK_TIMEOUT_US); if (ret) { @@ -244,7 +313,7 @@ static int mvebu_cp110_utmi_phy_power_on(struct phy *phy) } /* Wait for PLL calibration */ - ret = readl_poll_timeout(PORT_REGS(port) + UTMI_CAL_CTRL_REG, reg, + ret = readl_poll_timeout(port->regs + UTMI_CAL_CTRL_REG, reg, reg & PLLCAL_DONE, PLL_LOCK_DELAY_US, PLL_LOCK_TIMEOUT_US); if (ret) { @@ -253,7 +322,7 @@ static int mvebu_cp110_utmi_phy_power_on(struct phy *phy) } /* Wait for PLL ready */ - ret = readl_poll_timeout(PORT_REGS(port) + UTMI_PLL_CTRL_REG, reg, + ret = readl_poll_timeout(port->regs + UTMI_PLL_CTRL_REG, reg, reg & PLL_RDY, PLL_LOCK_DELAY_US, PLL_LOCK_TIMEOUT_US); if (ret) { @@ -262,7 +331,12 @@ static int mvebu_cp110_utmi_phy_power_on(struct phy *phy) } /* PLL Power up */ - regmap_set_bits(utmi->syscon, SYSCON_USB_CFG_REG, USB_CFG_PLL_MASK); + if (!IS_ERR(utmi->regs_usb)) { + reg = readl(utmi->regs_usb); + reg |= USB_CFG_PLL_MASK; + writel(reg, utmi->regs_usb); + } else + regmap_set_bits(utmi->syscon, SYSCON_USB_CFG_REG, USB_CFG_PLL_MASK); return 0; } @@ -274,7 +348,8 @@ static const struct phy_ops mvebu_cp110_utmi_phy_ops = { }; static const struct of_device_id mvebu_cp110_utmi_of_match[] = { - { .compatible = "marvell,cp110-utmi-phy" }, + { .compatible = "marvell,a38x-utmi-phy", .data = (void *)A380_UTMI }, + { .compatible = "marvell,cp110-utmi-phy", .data = (void *)CP110_UTMI }, {}, }; MODULE_DEVICE_TABLE(of, mvebu_cp110_utmi_of_match); @@ -285,6 +360,10 @@ static int mvebu_cp110_utmi_phy_probe(struct platform_device *pdev) struct mvebu_cp110_utmi *utmi; struct phy_provider *provider; struct device_node *child; + void __iomem *regs_utmi; + void __iomem *regs_utmi_cfg; + const void *match; + enum mvebu_cp110_utmi_type type; u32 usb_devices = 0; utmi = devm_kzalloc(dev, sizeof(*utmi), GFP_KERNEL); @@ -293,18 +372,44 @@ static int mvebu_cp110_utmi_phy_probe(struct platform_device *pdev) utmi->dev = dev; + match = device_get_match_data(dev); + if (match) + type = (enum mvebu_cp110_utmi_type)(uintptr_t)match; + + /* Get UTMI memory region */ + regs_utmi = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(regs_utmi)) { + dev_err(dev, "Failed to map utmi regs\n"); + return PTR_ERR(regs_utmi); + } + + /* Get usb config region */ + utmi->regs_usb = devm_platform_ioremap_resource_byname(pdev, "usb-cfg"); + if (IS_ERR(utmi->regs_usb) && PTR_ERR(utmi->regs_usb) != -EINVAL) { + dev_err(dev, "Failed to map usb config regs\n"); + return PTR_ERR(utmi->regs_usb); + } + + /* Get utmi config region */ + regs_utmi_cfg = devm_platform_ioremap_resource_byname(pdev, "utmi-cfg"); + if (IS_ERR(regs_utmi_cfg) && PTR_ERR(regs_utmi_cfg) != -EINVAL) { + dev_err(dev, "Failed to map usb config regs\n"); + return PTR_ERR(regs_utmi_cfg); + } + /* Get system controller region */ utmi->syscon = syscon_regmap_lookup_by_phandle(dev->of_node, "marvell,system-controller"); - if (IS_ERR(utmi->syscon)) { - dev_err(dev, "Missing UTMI system controller\n"); + if (IS_ERR(utmi->syscon) && PTR_ERR(utmi->syscon) != -ENODEV) { + dev_err(dev, "Failed to get system controller\n"); return PTR_ERR(utmi->syscon); } - /* Get UTMI memory region */ - utmi->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(utmi->regs)) - return PTR_ERR(utmi->regs); + if (IS_ERR(utmi->syscon) && + (IS_ERR(utmi->regs_usb) || IS_ERR(regs_utmi_cfg))) { + dev_err(dev, "Missing utmi system controller or config regs"); + return -EINVAL; + } for_each_available_child_of_node(dev->of_node, child) { struct mvebu_cp110_utmi_port *port; @@ -326,6 +431,24 @@ static int mvebu_cp110_utmi_phy_probe(struct platform_device *pdev) return -ENOMEM; } + utmi->ports[port_id] = port; + + /* Get port memory region */ + switch (type) { + case A380_UTMI: + port->regs = regs_utmi + port_id * 0x1000; + break; + case CP110_UTMI: + port->regs = regs_utmi + port_id * 0x2000; + break; + default: + return -EINVAL; + } + + /* assign utmi cfg reg */ + if (!IS_ERR(regs_utmi_cfg)) + port->regs_cfg = regs_utmi_cfg + port_id * 4; + port->dr_mode = of_usb_get_dr_mode_by_phy(child, -1); if ((port->dr_mode != USB_DR_MODE_HOST) && (port->dr_mode != USB_DR_MODE_PERIPHERAL)) { From patchwork Tue Jul 16 20:52:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13734921 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 E59CBC3DA49 for ; Tue, 16 Jul 2024 20:54:28 +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:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=pDzu64qpOdojdVmYiCdHzB0WJ4nlC1VPWWJqxm0nByU=; b=qcUqMazwNk61IdvZZYW3/SMfOe FLKBbDAVGN1C/75G1gTJSmjBWngRde+FtcR6q9IPWGH/U/Y1sQPf/GtrJy/qql5A7dnxfbwqodtaQ pllqjRbk3RL/SjUTG4Xzjw1noHPIYCjQX+l9RV/z+wHuY+Z4vCfjgDeq7VajorjaxOmbELt2eVa9C +9eg5aO1r2CHqCObXyfbVmfS09VPN0Ok+rKDv47XaviToaIV78DO4TqLPOuiVvT01qVFTNiEMqnrN mjD1xKrsOXes7c22br36qOqWlcbTpe8sq45jSR6rxUMU3tbPGMgXF6pjzaajEc+T9GqUc6OUquKzc btcd3rYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpBs-0000000Bk8g-2fqp; Tue, 16 Jul 2024 20:54:28 +0000 Received: from mail-northeuropeazlp170120003.outbound.protection.outlook.com ([2a01:111:f403:c200::3] helo=DU2PR03CU002.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTpAU-0000000BjXu-39NK; Tue, 16 Jul 2024 20:53:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PGFrO2fHB1A/FNj6QaVwMmuKvYbOYu1voTUKReg8ANsJtJhXEetLlODVuVSEYDePiH+H3MhfoCqpa95CETK7qGGhFtPoNxqEr0J9iLRBUW2jGimAJ7NPyZpRZarJ9tTlx2zhygRQ5puh7EY6xiUz2GfLfZnilQHSuZWCTNQ4GmvSETRixHs7qRyGUcuY19kQXYbgsUgU2w1jz+DBp5AhuVqiGro6wmPkXgDvx25PTY6tmo9VeKbo9eyqw98VIYykUN5QO7w74/GwHGCxsJ80WLpGrboxQ7S2f41LvVKbTlJSeyGV2xTsbRBX6BdTtLJFHlwVGvCa/iJ1POJrwRsQNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9Qx8HfbcMS/xYfx01GPXfHOt2rGcViQ8W1/DHS62asc=; b=PZXGMVMpBtlEcVXX3lU7MZ4qRGkqwZg+o6keANrtpmhj7yUI+iYUmQ+GBy6+Tecz59V2aHJ3cXyvuHlviTeJbGIg1xweo+nFn9ZzStXbE1IFxngdxPmBvYg//VBK3VsyyCaop6mh3cK4Lo4Vdv0QMUuWJD9ioYosMZ+RBSs1vssQgxMwCqaR61S+Wda4csCz3xKcBLaFdqm2R9o/l3Kjv2sTeSlxrImDqCswiplG4meCCQqmAFTu9SjdUswJxNGIbDjEmg7T5ODgYLRgUUbzdQarMPftDnX534+Rlax4h4PglMLKgiN6DD+a1gFB4yACMhstpU4SGl/YWX3DjzfZng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9Qx8HfbcMS/xYfx01GPXfHOt2rGcViQ8W1/DHS62asc=; b=c53JvZl6itbuovAXJPEiTPW9dU5UBJ/0IydRfi3Q4tq7QVH76SyGT0T2GD24OJugVplWwz4tuGj1PFxHeoDsY3sJYkNEsp94RRdSn1f9dJjFq1BVUcCaU3yyl5skSUZ/7coR0xEpx9uoo5BAIhKYAmHwwy4O+2/5tJyU9bVfMHk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) by AM8PR04MB7907.eurprd04.prod.outlook.com (2603:10a6:20b:237::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Tue, 16 Jul 2024 20:52:45 +0000 Received: from AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529]) by AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529%3]) with mapi id 15.20.7762.027; Tue, 16 Jul 2024 20:52:45 +0000 From: Josua Mayer Date: Tue, 16 Jul 2024 22:52:40 +0200 Subject: [PATCH RFC v2 4/4] arm: dts: marvell: armada-388-clearfog: add description for usb phys Message-Id: <20240716-a38x-utmi-phy-v2-4-dae3a9c6ca3e@solid-run.com> References: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> In-Reply-To: <20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run.com> To: Vinod Koul , Kishon Vijay Abraham I , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Yazan Shhady , linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Josua Mayer X-Mailer: b4 0.12.4 X-ClientProxiedBy: FR0P281CA0125.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::20) To AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB7586:EE_|AM8PR04MB7907:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b5c8b2e-c893-4398-bef3-08dca5d93ea0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|1800799024|376014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?5JjmtQQ8eLsuwQWW33CwMhUqd5WGE1+?= =?utf-8?q?BD30u7v6wjyZT++t9gZmi8C4NAEnN1cJv/xlw9Ik9kahR49XW0V1w5yM+pXFkevXO?= =?utf-8?q?WHyQp5swYCutG50f21PerYn6gJQXZ5crGGcNevNVUDm6K+CdMIfDAzIj9PC4M/fRA?= =?utf-8?q?eCTeCAcuyI3D41BfoPhDf4EpVVCp+8uR9fHVCz7siq2d4mMTd/39BRxZHIhSUHjfL?= =?utf-8?q?XkIpvIt+ueEL/Iu0C4VfbE+eyKF3u360KSFY1+FZqjxtuowF9whlXxcIN4alQqp+l?= =?utf-8?q?Mc9b5cGdMZXjF9Eytz1LFtRtrFWCpRu+XOJLnZiHJxD6gaqMd5YxotvS8Rt/nvxZX?= =?utf-8?q?o+AU32JJGuU0z3bhTeDaDxgOpUJuRrfbbY6dHBH47bffpNZ3bBLx0v85BZpgnxe74?= =?utf-8?q?mOBeXS+qNCiRqRrBp0PZyqy4zcxLmyl9mmapToKmiqx9vTwEk9wBlLEoFBAGFBmDW?= =?utf-8?q?dt91kKT21NzP8yzZY82VxkD26uSbYcY1gXn6pDWMAD9awJpuqLP4fgXpP6vO+Jzh/?= =?utf-8?q?Ecwmsyk264CFl8b4rCkpRkyNd5AKQFD6rQd/xs7guSmZ98fXh9kKIYWgxG5kOjDx0?= =?utf-8?q?ZZ0uTXbkGqVYn+pks2sE9yciA5kX6TW+gWZysLLEX60NF032fwWF7/2n8rCrxaql5?= =?utf-8?q?UCg+PcWrNV8mnXCM5eHzHP3A9XJwwSMKxJBwjewQREShAFetxU6Ozl7InvSld2mrg?= =?utf-8?q?6mLZn1duFGhwa/ebsyCNpaW5odphFbYIk/sCe4b1w2ahfmiPEMw4DUb0+xg6OnvQt?= =?utf-8?q?VBqyVm513BJ0zIBQ4l0WIim+gOzBKYdqIoQj4GKHgF6tJbxflMtd9qrDhP1peqz1A?= =?utf-8?q?qgozzPsU4FLtDQp8VM8MzYRHfvPMEPj/pDlgVe/u8SHLd1Cr5I3GuDaMTvo+ixYti?= =?utf-8?q?76cw/UMH0+ZZeQFzlJY08A0OHqsAJu/dcYpF6EgRqUmytjlW9CXJI319JA11JreLa?= =?utf-8?q?C8PN/Haxri51lp/gQ3T4Oo7Msyid5BIlYRc8D6wsODM+I0iz3VxpVqQqg3XvihoRc?= =?utf-8?q?AlxY4iE3JBy1FquIkIajIALhlQ5xtWzqvNmtKjCRI8dkRyFpCYoZhnhN2ZEEcbNrQ?= =?utf-8?q?dBjUbpr4ptx7jRymEXUJVR2HX0n+jH8qlg/WVQmdRXJVv+pz71uUOZ+Z8Sd1TC3x9?= =?utf-8?q?dvXQgsmu9h4mRAO6PtQD0I/iRav1MX1fnrYD7BYxaNsjEbmh39koA4t2AtbzI8kp7?= =?utf-8?q?B6hkv3xHOWyOHa9gEfyJo9QTnQdRDJVg9N3BCMoeh7J5si0Gdf+sm/PhN9BRTXNpv?= =?utf-8?q?I3/Y6PPTrFDYgXEhKgR6mZ8K+rwikXwL9ME9ly8RZFvrdU33H2ccR59FN4gFPgtfO?= =?utf-8?q?LcEwRBwkDLzY8JvBu//W5Cn9JmETJ8O50g=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB7586.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(1800799024)(376014)(7416014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?frKtb5sJmANcmccYikraq8Cusfy1?= =?utf-8?q?8yFhLiTta2O2T349BW9j4pTgBKOIfxOSjSg+xpYBYf9DBPbeIPh9jH6otJ1tQTi7h?= =?utf-8?q?1c6AMsAx0lwBA4BE/TPbkCMC2hOgd8iLRYtz10dXoiP6WE3FCIGgVvoboF2FMP0Hz?= =?utf-8?q?50iIb6rxDnP40lNFFSh6H84egyrcPsAKyo+BmnbtpUmM1Y8+zvbZOYfMndJabdVrd?= =?utf-8?q?JhB5Wq0cdv4yTzJq5VCVkWkZT1JQCuyIgg0xGZ6fXsq7ldlVJyyOVzpBqmpoTK06K?= =?utf-8?q?CTRR/3MeBL+Jm3w6AIIcARqiqxcJ1DdHdnOfgL4VILLCqiPLmeK4O+6VcEnukozkP?= =?utf-8?q?n1w+Mp3pAIE9w6UdK0gh4DcPGm9JxoUuInuh2BQiT8kr7xm98zzKgG64ISksQL2f2?= =?utf-8?q?VNaNkwMFjeR2WnoAZ/MVEVV5iMQ8wqoTC6+tJMX/P6ZB1Q7ZXc2KytNFEM3XBSOx2?= =?utf-8?q?9DbPyTp/aiTp9QMBt9rcNwk24f7ZxhOnXKsaFw0g2C2UAkvCq55vd2e8yvfzwSJCg?= =?utf-8?q?513AqekAIalviy8bqX4qgoJh0jI0HNk4ljypJeZmOBgk1RTCVPE4IEGy1/mu43iQ/?= =?utf-8?q?O/a15XBdvQ4IsKzaLJWjlkAAV18EbtSUoNL8gM/UynpP9crjnpAcrgPpATuOdpirB?= =?utf-8?q?yKv4Fz4grhAu6eozz0t5NI4VglTEuiLRESmfWrNn/QGAEMfEjt6Nv5tPslFFrtu34?= =?utf-8?q?S3BeXtHExOp+F0GpH1lHCxpX77hgQ9QtjwN9WzBDv8d1DmjNqpepwt+poUIh+s5W/?= =?utf-8?q?tODsvHmeWJdLzmMzkJge3SetNuRFID5Nr9xkFoyrgewW2eauCS53uK0KVy0XsOBYh?= =?utf-8?q?flTmbCWzI77ma8Qj+/S3MjOzMklGKPyPVm9+H5z2V21KaNiYh/wwBim4RUqq3XZIz?= =?utf-8?q?kbLk/IlCD03GhypGcfeRUCLS7/OJGhzGkRybhqUdyrvJcZ6FVB2y60ioe1hJwC+dk?= =?utf-8?q?KheGEHBDHxjfyYWHV9tXAiV/4RVFYROd0R0xaG2+gAjjWsxWLXR0BskRuf2qhcxv6?= =?utf-8?q?O63IZBJX/kp4ZIJxE6O3hhmEuxFiECSeDpsgL0tn0hSd3F9paJeWR5vtw+WD4OYMV?= =?utf-8?q?DPrLadlnUY9m550cVX2K3bnhJjilWIlo2czq/+Nh+SM8trxNxNizYY7Gm2vEfFzwR?= =?utf-8?q?btEXIv2+FTjAYQSdyq0euKPXToVKDjN3O5dVAD5Cvf3d/AT8utoa1cPUNMCZ3EvIl?= =?utf-8?q?jqEBtRHYgwlyOxbbqDyrr3mCP74JbA9419CuAhXV9ddxEfL6mfUj11bbwFzX5dIOR?= =?utf-8?q?s1w0XPQoO2u/g0PhYDytNH22dhcgUikj60y+CHwPF1gv8eIBu/9UIV5hb4gLVqUl5?= =?utf-8?q?LYXyqaErfDG3Hrlbu2XtHYLPge6TSkm8dxr0Hak6rnawxPB1dR15yrnc76bXp62MG?= =?utf-8?q?Tko2YjBJ/MEPVH39iNhvzn3UG037xlbu4HPB4b4WDjySacJtnqaPzLlL4/+6Z6wjg?= =?utf-8?q?+LX8ecd+mfLX2BbMF/NK96kSlxflN+59bhJ6bSq6OYDk9+RzXCezD4g535WU72J8v?= =?utf-8?q?Z0sBz19TKfOX?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b5c8b2e-c893-4398-bef3-08dca5d93ea0 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB7586.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2024 20:52:45.7589 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HuNd1jUQgXdJ1Y9P38ZFd7E+kip0x19Uad8VLZNvCu6uFxwy6u4eCD77rheMpVaTY7vXNj9bQiVXmkZoQuSGZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7907 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240716_135302_870470_882EF4FF X-CRM114-Status: GOOD ( 10.51 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Clearfog Base and Pro use three sets of USB-2.0 signals going to various connectors. Only two were enabled so far without links to their phys. Further there were some minor issues with usb port descriptions. Firstly add references for each phy to the corresponding controller nodes. At the same time redeclarations of controller nodes are replaced with references to labels in armada-38x.dtsi. Secondly enable USB-2.0 controller routed to Clearfog Base M.2 / Clearfog Pro mPCIe connectors. FInally add missing dr_mode properties to stop utmi phy driver from complaining. Signed-off-by: Josua Mayer --- .../boot/dts/marvell/armada-388-clearfog-base.dts | 8 ++++++ arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 8 ++++++ arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi | 30 ++++++++++++++-------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts index f7daa3bc707e..09ba024e432e 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts @@ -66,3 +66,11 @@ rear_button_pins: rear-button-pins { marvell,function = "gpio"; }; }; + +/* SRDS #4 - USB-2.0/3.0 Host, M.2 */ +&usb3_0 { + phys = <&utmi1>; + phy-names = "utmi"; + dr_mode = "host"; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts index 09bf2e6d4ed0..4f5bb5867f20 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts @@ -182,3 +182,11 @@ &spi1 { */ pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>; }; + +/* USB-2.0 Host, CON2 - nearest CPU */ +&usb3_0 { + phys = <&utmi1>; + phy-names = "utmi"; + dr_mode = "host"; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi b/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi index f8a06ae4a3c9..0497fe13f56d 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi @@ -51,16 +51,6 @@ sdhci@d8000 { vmmc-supply = <®_3p3v>; wp-inverted; }; - - usb@58000 { - /* CON3, nearest power. */ - status = "okay"; - }; - - usb3@f8000 { - /* CON7 */ - status = "okay"; - }; }; pcie { @@ -243,3 +233,23 @@ &uart1 { pinctrl-names = "default"; status = "okay"; }; + +/* USB-2.0 Host, CON3 - nearest power */ +&usb0 { + phys = <&utmi0>; + phy-names = "utmi"; + dr_mode = "host"; + status = "okay"; +}; + +/* SRDS #3 - USB-2.0/3.0 Host, Type-A connector */ +&usb3_1 { + phys = <&utmi2>; + phy-names = "utmi"; + dr_mode = "host"; + status = "okay"; +}; + +&utmi { + status = "okay"; +};