From nobody Fri Sep 25 07:21:29 2026 Received: from mail-ed2-f12.google.com (mail-ed2-f12.google.com [74.125.228.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5D4D3B9D86 for ; Tue, 15 Sep 2026 12:52:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476757; cv=none; b=NVQOoxwsu1oSZYdZYNxM5RaGmJHbo0mgr7SkhW6md36Ckgpdu3yGMZa6X0mdvGW4uKQRYws7a5jynqEn1q8E0S8DGQAI9BtfyRVs9FQytiNbhZzHAG5wAOUlkJTytBNsd6Y8yfh11qybz1EHowdFNhDOqhjGmVPNc7p5MsC+chw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476757; c=relaxed/simple; bh=m8sAzO33iYtVKLXrd+2NaUjzgG3gzawYUAd74pqePhQ=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V1g5fUnTKwQkQMw6AHvu33hKgPb0cDHGGxLBlIUigLR8LYnDy/HXwSDWGEW5E7c7CvoFE9yPc65FUJXNi3UpxiJmFxLU5Bi87gevH/c++SaZ5Zx9D85kGaIt+ISHiwB2tyfGtBZM2NGy6IIRw6v79NHLeifacHud+LMTrnEOG7A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a1TMNnOa; arc=none smtp.client-ip=74.125.228.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a1TMNnOa" Received: by mail-ed2-f12.google.com with SMTP id 4fb4d7f45d1cf-6a8038a9f10so385002a12.1 for ; Tue, 15 Sep 2026 05:52:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789476754; x=1790081554; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=lSkFSVGa/dllH5JEoKe0+pLfgUwm43MOT22pfjYzUoU=; b=a1TMNnOaWPkCyd0PRw2yfor8ttdv8V+icIEqrnSBZZp/NbT1ZToUPALVzveFb7j045 jk3uhghFYcrRfdotIYtVjVDsjYvYdZRDqTxXBphdOVg3i8eWNXAi4AkSB5f7cv7clNVP evMPJv05xelxA7uBW8GfPB5VA3aq9Jrf96VkbW/R+5xrmL/WPINWNkCN4OQymr5lVN5O 5AZkdQEF4NfsdTluVDgfJA3wjxNVf/NyggjXSaCHqiZEEck3OojiTL7uBpXQMpo5lKFe Vk8kO9le9hgtgmNrAoeU/C898gYXg38Vlxc1yeeI9naM7MmtVytAh34C6JnhoYWfC0ok jw9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789476754; x=1790081554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=lSkFSVGa/dllH5JEoKe0+pLfgUwm43MOT22pfjYzUoU=; b=GctHWP58IsJysoXVlBly6Nd7oFXzHdn0QgH3JUGUJZNts++/0m9R6PfU+BFl/uQAj0 Nrxqq9FHJnKS7/kmOgw5OrkQJMNvYjEHReG+zzDQieYIGCgfu9LKKBIbMowZJ8RXLLHt lJSBNwfyGRvoYrRdww1jiQjl09lOHymxhACZ2mvlI7Hea7cBJC+YiiPfNZD4Fx40J85D l/0SJgiKHOREbSOlgV1MwCoqqnZsxCxXTU1o1ImNREPWk27iXFpJmj84P/ndGm4NvvCh 0HpAhUPAIEHqHcCpMAM6KoQPDJO81i2xGdeOCQ3FMats2V/tXQtBdlvtQLXrcvi2SNa6 KO9Q== X-Forwarded-Encrypted: i=1; AKwUvBw3y1atBY5B32d3OnplLwf5Q2pFi3c08P2ndR/wLxU6jFNSddAfuX51IUEYgOqZbb3kD7ZRkB8pFu8WP/M=@vger.kernel.org X-Gm-Message-State: AFuF++loJ7s6ida3S/m3z32lznNCYP8KoowfJXz9sbb9Qspiz1266zbs kMmOo/NVQ3DBUCYZYFl9pWlnnkzXxKDD/KTGk9xV0T3WbvPgHlk/IF60 X-Gm-Gg: AYBFou33TsDvJw0DZlc4Kzh7S8qjhKIK/52KC5M5DzF4AiS/6EcSLbI6sl4P1b42onR iixRCDAvjwq9hiHWgz1MOwM8z7Mkob97RDsdHVFZxZ8CF5ec7Ah9Il3fV0vlvM/33z0F3y+X5Xs YNFE6sjH2hk1H93ssQ2TFJkiZkAEM3h3xWM+6F16rNl8/yZLgaNZAo6rO9QIrhsCE/RUGi7lxD9 NTqiI+S8KggeLsu9CCfe6egVGpOUgpJ7ypGD9ZA4VCS/Xozi3y2qG40dPURmlxfGxGohUtaFz2q I9jpFJSH93yUDXOpzsU4e2AymNdrQxgoxK8D8iLcrwFfDJj/2cBGzk0Q9kerxT59tu//0paLL/5 MkpBl5y9GZ8eBQwduw6ondYIEFb97gNgyrLI++ECTqHP+u6t0g5lbDQUr1K7cpZ2obCaTta0uAx gPPjlh5FsFRnyBGd2Yhlb7ZxnqMDneuBEJZvoBIdq2Sp3IEz+PIIkvqXluFLpQDvVIeHZlH2KeE JVYZ/aE5G+HcD+7WnxsG1IRM5v7gjtJ12bH+SUvsozzQ0jSCPTk4ZmRwkdGgnNy X-Received: by 2002:a17:907:724a:b0:c29:4cb4:8582 with SMTP id a640c23a62f3a-c29d79e7c35mr78298466b.47.1789476754036; Tue, 15 Sep 2026 05:52:34 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-79-26-252-140.retail.telecomitalia.it. [79.26.252.140]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-c296605b9a6sm587969266b.25.2026.09.15.05.52.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 05:52:33 -0700 (PDT) From: Christian Marangi To: Stephen Boyd , Brian Masney , Jerome Brunet , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Christian Marangi , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] dt-bindings: clock: airoha: Add PHY binding for Serdes port Date: Tue, 15 Sep 2026 14:52:23 +0200 Message-ID: <20260915125226.20579-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260915125226.20579-1-ansuelsmth@gmail.com> References: <20260915125226.20579-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add PHY cell property for Serdes port selection. Currently supported only for Airoha AN7581 SoC, that support up to 4 Serdes port. The Serdes port can support both PCIe, USB3 or Ethernet mode. - PCIe1 Serdes can support PCIe or Ethernet mode. - PCIe2 Serdes can support PCIe or Ethernet mode. - USB1 Serdes can support USB3 or HSGMII mode. - USB2 Serdes can support USB3 or PCIe mode. Add bindings to permit correct reference of the Serdes ports in DT. Values are just symbolic and enumerates the Serdes port with a specific number for precise reference. The available Serdes port can be selected following the dt-binding header in [2]. [2] Signed-off-by: Christian Marangi Reviewed-by: Rob Herring (Arm) --- .../bindings/clock/airoha,en7523-scu.yaml | 24 ++++++++++++++++--- include/dt-bindings/soc/airoha,scu-ssr.h | 11 +++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 include/dt-bindings/soc/airoha,scu-ssr.h diff --git a/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml= b/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml index eb24a5687639..fc37786ac7ed 100644 --- a/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +++ b/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml @@ -23,6 +23,7 @@ description: | =20 All these identifiers can be found in: [1]: . + [2]: . =20 The clocks are provided inside a system controller node. =20 @@ -50,6 +51,12 @@ properties: description: ID of the controller reset line const: 1 =20 + '#phy-cells': + description: + The first cell indicates the serdes phy number, see [2] for the + available serdes port. + const: 1 + required: - compatible - reg @@ -65,12 +72,23 @@ allOf: reg: minItems: 2 =20 + '#phy-cells': false + + - if: + properties: + compatible: + const: econet,en751221-scu + then: + properties: + reg: + maxItems: 1 + + '#phy-cells': false + - if: properties: compatible: - enum: - - airoha,en7581-scu - - econet,en751221-scu + const: airoha,en7581-scu then: properties: reg: diff --git a/include/dt-bindings/soc/airoha,scu-ssr.h b/include/dt-bindings= /soc/airoha,scu-ssr.h new file mode 100644 index 000000000000..33c64844ada3 --- /dev/null +++ b/include/dt-bindings/soc/airoha,scu-ssr.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef __DT_BINDINGS_AIROHA_SCU_SSR_H +#define __DT_BINDINGS_AIROHA_SCU_SSR_H + +#define AIROHA_SCU_SERDES_PCIE1 0 +#define AIROHA_SCU_SERDES_PCIE2 1 +#define AIROHA_SCU_SERDES_USB1 2 +#define AIROHA_SCU_SERDES_USB2 3 + +#endif /* __DT_BINDINGS_AIROHA_SCU_SSR_H */ --=20 2.53.0 From nobody Fri Sep 25 07:21:29 2026 Received: from mail-ej2-f12.google.com (mail-ej2-f12.google.com [74.125.228.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 929043BB9E0 for ; Tue, 15 Sep 2026 12:52:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.140 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476759; cv=none; b=PiEbvqDd7RFANADSLNF97rHvqf1WmjpcYGmtK+bp7KyrWCVPnxJO3oW7lGrgoHU6XrMEmEHFZWIMFhe/ZSfuwdi6sa0diBIejJ84OmurcdUALAjTxe6CudpvfuiUPePOvqZ/h4pBQNNpkgOy/gWJwT8bPU6sIPZHj6KEI4tHc60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476759; c=relaxed/simple; bh=TKosStvcDTO5obgERHr8Bfw8JxgQBt7ikfSUeiQSvgk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gmjajP5jv+C774wJY1Krsg4VBx27UzM7E5WXeXSNs2EnA37ZzxgDyxplR/bqODs/noe8y/r6ujuTveyQRbpHHP4QlHdCNEo23LogV+3UnEvYRQcUc1q8LV6LMvZc0hjRXu4DBxY/NHUpWTpXzJ+/8NVKHOUTI7vf4m8C3t+8BfM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MlNNc2r+; arc=none smtp.client-ip=74.125.228.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MlNNc2r+" Received: by mail-ej2-f12.google.com with SMTP id a640c23a62f3a-c294496989aso562183966b.3 for ; Tue, 15 Sep 2026 05:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789476755; x=1790081555; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=2C8z0u16/ATPXIQwJTUgp1EH2ZZxhLUD/YnSweKb5A4=; b=MlNNc2r+H7YUUJiXWzeuM2F7GY/pNMaWk3+I7M+sSBdGZc5LbMaCAjBkiF2PUhNEf6 lL0WFVi+lgA/oUdAsz0HOemVVI7+qhqf0HMqpwKQzQGitGXHwDKFyVtFcwQ/pTINwssi 9TG9cOBTZtrbtk16HR+3pyPMXHN2A1vQhEZ3rmMDrg7Vli5BYQV1uSM5MLFjF2E3TSqz MMa3a7fH7t0wmcyKEoNlo8SNUNXHzI3StpvNLUMZBaG/bkdMkMmbY3CYmirF6Dv6ub+R eD6CQwlgMue8ysv9lrAeqQUpx5HEKPJD+N4ehSHsIfwp8NWFW5ghP8YtK7SF1Z8lBQbT iB7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789476755; x=1790081555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=2C8z0u16/ATPXIQwJTUgp1EH2ZZxhLUD/YnSweKb5A4=; b=e9AWKYwj7L96Nbkzwh0QUbIqzPkQDLnJgcairlKgrbM7ERC3I2WaMvkeGyou/VyadX jHNmgQ2o+E6zPPLiAEwj9s6fi8aGo/uJGD0gJIaKwNAUD+vMsyGdjK9B66pvHQT+BBXK mrQrojUG4tFLyxDcXvoYQrBGFOjkxtOEKsOkTxsKXxaoT0Rvijx2bfJay/NAg3CpzBp4 wqz+drWUWFqn1ImdA2gaZ4x55x/SXJBmcwWCF0y8P/8o/vTrXXWp598UtCaRten8s23z j9hSwt34I6rtJjU3dIOA0qnY00F3WXS3ZXQAeCOvVnDjVllTc+4yFpsNDwMSVhtARGqI hCSw== X-Forwarded-Encrypted: i=1; AKwUvByb1X1pT3gRROEUjrcnqJXSXoaMxEFsTFB163WKbBg5L0J3oDErb59VYel3hqvtz8nX5S4QBEnwFX8ETgo=@vger.kernel.org X-Gm-Message-State: AFuF++lfNp+LMGh2NzV/y8vhLOjw7tIxCT767TNXHbWx0qLRjEcE+sIa XKoON2ceUxQyPkmgI/dlhVXkyos5/vunfOF1RyD2fqhKtJrLbNEbHHeE X-Gm-Gg: AYBFou0YvIniFt6pgq4hLVK9ecIE03fDHA+BpGdQZsS5b/ddLlxGdetGr0NyGfgOf3e nd1vYUgTuxEMUwvcS5hzaqKofHkZSI61DcsdSvJ6TIiKcQE31fn7P1S9S/DSNDN/UI60xqnWeY6 eu995feqbfNdzdPwF4501tIo85TYI4NpUtnE4GuNKelqIYlKvprTnQjCMrbqrihIEzl9y9yavKj TOez0Qt+QXInMQxUG4luGGcnP/cM1+oj6n9TOKc9YZNWJUrW5L+zVYoxrTNkmzCtTPZADSGByRm wb8s1FqfuFIFJWzqUddeZ3Blg/8aH5BIlSHHS/PkqxL3WBLRVi4YNyd3xOpv7NzjkUeA6A4VZvv EMqsiBWVXNTu0b9VxkQ2u2FXgBil/1IHLIJRJh8v4soDCD8o/VvhUD+yKPtzogmHF/aI0Qt6C6R lzddIcudcFiog9Yx6lpq029EdbbelEQK8hRszI0OrDhyn9jCYWZRyvUz08hnPXSRoKwOCE756LL y6+6HHeSITS/oSC82tImdcAJEAdHXP5IgIryjj2I+Q27TpQ/gC6jPKDovjLVtCO1A== X-Received: by 2002:a17:907:dab:b0:c26:1648:a065 with SMTP id a640c23a62f3a-c29b87267demr463483366b.32.1789476755376; Tue, 15 Sep 2026 05:52:35 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-79-26-252-140.retail.telecomitalia.it. [79.26.252.140]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-c296605b9a6sm587969266b.25.2026.09.15.05.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 05:52:34 -0700 (PDT) From: Christian Marangi To: Stephen Boyd , Brian Masney , Jerome Brunet , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Christian Marangi , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Brian Masney Subject: [PATCH v2 2/2] clk: en7523: Add support for selecting the Serdes port in SCU Date: Tue, 15 Sep 2026 14:52:24 +0200 Message-ID: <20260915125226.20579-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260915125226.20579-1-ansuelsmth@gmail.com> References: <20260915125226.20579-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the SCU register for clock and reset, there are also some register to select the Serdes port mode. The Airoha AN7581 SoC have 4 different Serdes that can switch between PCIe, USB or Ethernet mode. Add a simple PHY provider that expose the .set_mode OP to toggle the requested mode for the Serdes port. Reviewed-by: Brian Masney Signed-off-by: Christian Marangi --- drivers/clk/Kconfig | 1 + drivers/clk/clk-en7523.c | 218 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 216 insertions(+), 3 deletions(-) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 252f6a1f21b8..e0cc4ebafb5e 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -221,6 +221,7 @@ config COMMON_CLK_EN7523 bool "Clock driver for Airoha/EcoNet SoC system clocks" depends on OF depends on ARCH_AIROHA || ECONET || COMPILE_TEST + select GENERIC_PHY default ARCH_AIROHA help This driver provides the fixed clocks and gates present on Airoha diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index 5c45aacb6409..24fdec2e6198 100644 --- a/drivers/clk/clk-en7523.c +++ b/drivers/clk/clk-en7523.c @@ -6,14 +6,18 @@ #include #include #include +#include +#include #include #include #include +#include #include #include #include #include #include +#include =20 #define RST_NR_PER_BANK 32 =20 @@ -40,9 +44,22 @@ #define REG_HIR_MASK GENMASK(31, 16) /* EN7581 */ #define REG_NP_SCU_PCIC 0x88 +#define REG_NP_SCU_SSR3 0x94 +#define REG_SSUSB_HSGMII_SEL_MASK BIT(29) +#define REG_SSUSB_HSGMII_SEL_HSGMII FIELD_PREP_CONST(REG_SSUSB_HSGMII_SEL_= MASK, 0x0) +#define REG_SSUSB_HSGMII_SEL_USB FIELD_PREP_CONST(REG_SSUSB_HSGMII_SEL_MAS= K, 0x1) #define REG_NP_SCU_SSTR 0x9c #define REG_PCIE_XSI0_SEL_MASK GENMASK(14, 13) +#define REG_PCIE_XSI0_SEL_PCIE FIELD_PREP_CONST(REG_PCIE_XSI0_SEL_MASK, 0= x0) +#define REG_PCIE_XSI0_SEL_XFI FIELD_PREP_CONST(REG_PCIE_XSI0_SEL_MASK, 0x= 1) +#define REG_PCIE_XSI0_SEL_HSGMII FIELD_PREP_CONST(REG_PCIE_XSI0_SEL_MASK, = 0x2) #define REG_PCIE_XSI1_SEL_MASK GENMASK(12, 11) +#define REG_PCIE_XSI1_SEL_PCIE FIELD_PREP_CONST(REG_PCIE_XSI1_SEL_MASK, 0= x0) +#define REG_PCIE_XSI1_SEL_XFI FIELD_PREP_CONST(REG_PCIE_XSI1_SEL_MASK, 0x= 1) +#define REG_PCIE_XSI1_SEL_HSGMII FIELD_PREP_CONST(REG_PCIE_XSI1_SEL_MASK, = 0x2) +#define REG_USB_PCIE_SEL_MASK BIT(3) +#define REG_USB_PCIE_SEL_PCIE FIELD_PREP_CONST(REG_USB_PCIE_SEL_MASK, 0x0) +#define REG_USB_PCIE_SEL_USB FIELD_PREP_CONST(REG_USB_PCIE_SEL_MASK, 0x1) #define REG_CRYPTO_CLKSRC2 0x20c /* EN751221 */ #define EN751221_REG_SPI_DIV 0x0cc @@ -82,6 +99,8 @@ enum en_hir { HIR_MAX =3D 14, }; =20 +#define EN_SERDES_PHY_NUM 4 + struct en_clk_desc { int id; const char *name; @@ -114,6 +133,18 @@ struct en_rst_data { struct reset_controller_dev rcdev; }; =20 +struct en_serdes_phy_instance { + struct phy *phy; + unsigned int serdes_port; +}; + +struct en_clk_priv { + void __iomem *base; + /* protect SCU register */ + spinlock_t lock; + struct en_serdes_phy_instance *serdes_phys[EN_SERDES_PHY_NUM]; +}; + struct en_clk_soc_data { u32 num_clocks; const struct clk_ops pcie_ops; @@ -847,12 +878,179 @@ static int en7581_reset_register(struct device *dev,= void __iomem *base, return devm_reset_controller_register(dev, &rst_data->rcdev); } =20 +static int en7581_serdes_phy_set_mode(struct phy *phy, enum phy_mode mode, + int submode) +{ + struct en_serdes_phy_instance *instance =3D phy_get_drvdata(phy); + struct en_clk_priv *priv =3D dev_get_drvdata(phy->dev.parent); + u32 reg, mask, sel, val; + unsigned long flags; + + switch (instance->serdes_port) { + case AIROHA_SCU_SERDES_PCIE1: + reg =3D REG_NP_SCU_SSTR; + mask =3D REG_PCIE_XSI0_SEL_MASK; + + if (mode !=3D PHY_MODE_ETHERNET && mode !=3D PHY_MODE_PCIE) + return -EINVAL; + + if (mode =3D=3D PHY_MODE_ETHERNET) { + switch (submode) { + case PHY_INTERFACE_MODE_USXGMII: + case PHY_INTERFACE_MODE_10GBASER: + sel =3D REG_PCIE_XSI0_SEL_XFI; + break; + case PHY_INTERFACE_MODE_SGMII: + case PHY_INTERFACE_MODE_1000BASEX: + case PHY_INTERFACE_MODE_2500BASEX: + sel =3D REG_PCIE_XSI0_SEL_HSGMII; + break; + default: + return -EINVAL; + } + } else { + sel =3D REG_PCIE_XSI0_SEL_PCIE; + } + + break; + case AIROHA_SCU_SERDES_PCIE2: + reg =3D REG_NP_SCU_SSTR; + mask =3D REG_PCIE_XSI1_SEL_MASK; + + if (mode !=3D PHY_MODE_ETHERNET && mode !=3D PHY_MODE_PCIE) + return -EINVAL; + + if (mode =3D=3D PHY_MODE_ETHERNET) { + switch (submode) { + case PHY_INTERFACE_MODE_USXGMII: + case PHY_INTERFACE_MODE_10GBASER: + sel =3D REG_PCIE_XSI1_SEL_XFI; + break; + case PHY_INTERFACE_MODE_SGMII: + case PHY_INTERFACE_MODE_1000BASEX: + case PHY_INTERFACE_MODE_2500BASEX: + sel =3D REG_PCIE_XSI1_SEL_HSGMII; + break; + default: + return -EINVAL; + } + } else { + sel =3D REG_PCIE_XSI1_SEL_PCIE; + } + + break; + case AIROHA_SCU_SERDES_USB1: + reg =3D REG_NP_SCU_SSR3; + mask =3D REG_SSUSB_HSGMII_SEL_MASK; + + if (mode !=3D PHY_MODE_ETHERNET && mode !=3D PHY_MODE_USB_DEVICE && + mode !=3D PHY_MODE_USB_DEVICE_SS) + return -EINVAL; + + if (mode =3D=3D PHY_MODE_ETHERNET) + sel =3D REG_SSUSB_HSGMII_SEL_HSGMII; + else + sel =3D REG_SSUSB_HSGMII_SEL_USB; + + break; + case AIROHA_SCU_SERDES_USB2: + reg =3D REG_NP_SCU_SSTR; + mask =3D REG_USB_PCIE_SEL_MASK; + + if (mode !=3D PHY_MODE_PCIE && mode !=3D PHY_MODE_USB_DEVICE && + mode !=3D PHY_MODE_USB_DEVICE_SS) + return -EINVAL; + + if (mode =3D=3D PHY_MODE_PCIE) + sel =3D REG_USB_PCIE_SEL_PCIE; + else + sel =3D REG_USB_PCIE_SEL_USB; + + break; + default: + return -EINVAL; + } + + spin_lock_irqsave(&priv->lock, flags); + val =3D readl(priv->base + reg); + val &=3D ~mask; + val |=3D sel; + writel(val, priv->base + reg); + spin_unlock_irqrestore(&priv->lock, flags); + + return 0; +} + +static const struct phy_ops en7581_serdes_phy_ops =3D { + .set_mode =3D en7581_serdes_phy_set_mode, + .owner =3D THIS_MODULE, +}; + +static struct phy *en7581_serdes_phy_xlate(struct device *dev, + const struct of_phandle_args *args) +{ + struct en_clk_priv *priv =3D dev_get_drvdata(dev); + struct en_serdes_phy_instance *instance; + unsigned int serdes_port; + + if (args->args_count !=3D 1) { + dev_err(dev, "invalid number of cells in 'phy' property\n"); + return ERR_PTR(-EINVAL); + } + + serdes_port =3D args->args[0]; + if (serdes_port >=3D EN_SERDES_PHY_NUM) { + dev_err(dev, "invalid serdes port: %d\n", serdes_port); + return ERR_PTR(-EINVAL); + } + + instance =3D priv->serdes_phys[serdes_port]; + if (!instance) { + dev_err(dev, "failed to find appropriate serdes phy\n"); + return ERR_PTR(-EINVAL); + } + + return instance->phy; +} + +static int en7581_serdes_phy_register(struct device *dev) +{ + struct en_clk_priv *priv =3D dev_get_drvdata(dev); + struct phy_provider *phy_provider; + int i; + + for (i =3D 0; i < EN_SERDES_PHY_NUM; i++) { + struct en_serdes_phy_instance *instance; + + instance =3D devm_kzalloc(dev, sizeof(*instance), + GFP_KERNEL); + if (!instance) + return -ENOMEM; + + instance->phy =3D devm_phy_create(dev, NULL, + &en7581_serdes_phy_ops); + if (IS_ERR(instance->phy)) + return dev_err_probe(dev, PTR_ERR(instance->phy), "failed to create phy= \n"); + + instance->serdes_port =3D i; + priv->serdes_phys[i] =3D instance; + + phy_set_drvdata(instance->phy, instance); + } + + phy_provider =3D devm_of_phy_provider_register(dev, en7581_serdes_phy_xla= te); + + return PTR_ERR_OR_ZERO(phy_provider); +} + static int en7581_clk_hw_init(struct platform_device *pdev, struct clk_hw_onecell_data *clk_data) { + struct en_clk_priv *priv =3D platform_get_drvdata(pdev); struct regmap *map; void __iomem *base; u32 val; + int ret; =20 map =3D syscon_regmap_lookup_by_compatible("airoha,en7581-chip-scu"); if (IS_ERR(map)) @@ -862,6 +1060,8 @@ static int en7581_clk_hw_init(struct platform_device *= pdev, if (IS_ERR(base)) return PTR_ERR(base); =20 + priv->base =3D base; + en7581_register_clocks(&pdev->dev, clk_data, map, base); =20 val =3D readl(base + REG_NP_SCU_SSTR); @@ -876,9 +1076,12 @@ static int en7581_clk_hw_init(struct platform_device = *pdev, val &=3D ~REG_PCIE_HB_RST; writel(val, base + REG_RST_CTRL1); =20 - return en7581_reset_register(&pdev->dev, base, en7581_rst_map, - ARRAY_SIZE(en7581_rst_map), - en7581_rst_ofs); + ret =3D en7581_reset_register(&pdev->dev, base, en7581_rst_map, + ARRAY_SIZE(en7581_rst_map), en7581_rst_ofs); + if (ret) + return ret; + + return en7581_serdes_phy_register(&pdev->dev); } =20 static enum en_hir get_hw_id(void __iomem *np_base) @@ -985,16 +1188,25 @@ static int en7523_clk_probe(struct platform_device *= pdev) struct device_node *node =3D pdev->dev.of_node; const struct en_clk_soc_data *soc_data; struct clk_hw_onecell_data *clk_data; + struct en_clk_priv *priv; int r; =20 soc_data =3D device_get_match_data(&pdev->dev); =20 + priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + spin_lock_init(&priv->lock); + clk_data =3D devm_kzalloc(&pdev->dev, struct_size(clk_data, hws, soc_data->num_clocks), GFP_KERNEL); if (!clk_data) return -ENOMEM; =20 + platform_set_drvdata(pdev, priv); + clk_data->num =3D soc_data->num_clocks; r =3D soc_data->hw_init(pdev, clk_data); if (r) --=20 2.53.0