From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 C1B79360EC2 for ; Thu, 21 May 2026 15:37:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779377826; cv=none; b=FklDMfrV24ePFfPJySgVOGzXE3TYq82wUnWuPvte+lfrulSro2CCcUJz5d3KdkBktg5+hoTz5iHKR3TiSMrWKe8TVBm2nqJnxpBd13FxXEPUiP6Dk/FO1zzqL54MwN2oVnxvQT+miLAVCvDorTbb9dAKpw00MUKg0Y2kksLr7+U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779377826; c=relaxed/simple; bh=m5DUnXaSNzM04LXhJuLXRbwAToGbpkmQqYhcor9mmeI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IkUCUWBECZGqHT8Gt0Qdm2WIFC9QAYkbuip52gKUTMx6CS9uxWJOL+HKdPDTf3jncBrWQ+3WaSurX5IbLW9YpynZxsVYxayErFGazgyqtzmwQukW/Dh8ATrsvwhe9RMu9AnGpVuZywIxgVHpWXoubn5JC1uGAUfDVU9JTJUuOwQ= 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=s6kliwG/; arc=none smtp.client-ip=209.85.128.46 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="s6kliwG/" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4903d730b1fso5122885e9.2 for ; Thu, 21 May 2026 08:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779377823; x=1779982623; 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; bh=MIB28TKX46XSJ6UoBivfsKflmRaG92nOEG3Dee2rX0k=; b=s6kliwG/PVEIDukxj1rNUYcib9Ox+Z3tlBoH4W8FC00b1TCa+D43o0yArbS4SBjfOJ mNnIX9IgIJDn6UI1SMSaiUsv0TZjYBquZxq/WHXcK7oRhm1Z/jk2mRbTL4rbnEtiuJ2p adPjiRrik1tsgw0T7Rrd9VQN+k/pKGns+GTOi+mziAcYAq5OyLnYnvAwQHnVgEN33Erb w6ZFmvqRqWyLkTPzTZ927FP73l/R02DTLGJfXSFnFX3tQnLeRc39hs/oKUi6p32mEWJd GsYCcyHq0Zkkwhs7Z49oTVEJjAuc2o0NkbapELO3W9Lq6uDJKKJf7sOOB3Azfo5B42uP l1Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779377823; x=1779982623; 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; bh=MIB28TKX46XSJ6UoBivfsKflmRaG92nOEG3Dee2rX0k=; b=eis+44gW2lVPyvF56/WOwVgwswbngGoMnUGlvfTdQOoGQLeVGNssZrZKwgkqFHJ5FL uv8Jo2k/YtN3gyI8bX4pqMLgShvCqsRA36rnHuR/jsIMmor5+lYZLxQXZ+7jwsATH0nH oXGOeEg0GFoRV9WUndfcRjbby45SXaaT90c91KRShU8YtuTfnaxNG3TAWJVIQ3hvtAth CspcLyKgxK7P4vcaDMnObFmcp8wIceR9SQGiy9xdW2ACLak/D+PPF2ZCaAJQxLFwzML+ 8MTD8hF7isGSJCIYaG9DcQWbiBOltlcbHCWehGIb3RaYpUK99S2IJMB4g1DXHJskMx1R bcMw== X-Forwarded-Encrypted: i=1; AFNElJ9OuoXB7pXkSKR9gTlL62Olu6Ci9/YTbrtvo3xn5mKcHWwhgV45e8rvJRuMLvx4ONbK0ZQ3Jck+/EM=@vger.kernel.org X-Gm-Message-State: AOJu0YxuEEt7T9LbnWrMoDQWLi2Arznt686Tug+2RQxLC646A+qpISwK rvk0lx5sVLt1HkYt/czNCCckk35ZeTPyFjjw1Od1+MoFHLeKvuR32ojP X-Gm-Gg: Acq92OGn36st7L+diOPOS6I9BOfl3r/dHGSqj7/DtguOzsHqX8l8MfEroHksbEHpP2y FimL3WC3JkMgsY1D3zJEDgAXBI058V1Tb0X+deyosAo3Q26IJSWphOlnDRRLkQBGbfxbvvvACRP GnjkvK+xn67rZQZogkNzz/1DPfwbXKKzR6EA8xVef89WFAiQzq2I7TjAFuYaoJ9Lmmmp8ErgOyq Z4XxGaCCRB0swY9PWf79GpmgSyD1X9iTGpV4+RbwqPBawm2m1PkZRi/vfXKBb8N4zFr9LyyXI8s 7hPNNb2Ng7Z7fr3ehstyqK82a4PXQKJQ+Nk4QCTKC6woJzIDQTuK62u+4Ce5bJHCwwKyMgUdg+V NymFAoegZehmPaJJ+MHOouQ6Jql72Z4DP8v6JzqYlornYViktJHRqvG8fnXlTIwNpLHCZDSFJze HzKKNt6X8xsr7ACzs3F1iiQ+3xpa65wCd4k6zMCHyLmAIER2eQaOaWn8bXzD8bBuw= X-Received: by 2002:a05:600c:4c24:b0:485:30d4:6b9e with SMTP id 5b1f17b1804b1-490360a373bmr29483185e9.21.1779377822804; Thu, 21 May 2026 08:37:02 -0700 (PDT) Received: from Ansuel-XPS24 (host-79-22-5-99.retail.telecomitalia.it. [79.22.5.99]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49033d9edcbsm79159825e9.13.2026.05.21.08.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 08:37:01 -0700 (PDT) From: Christian Marangi To: Michael Turquette , Stephen Boyd , Brian Masney , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Christian Marangi , Vinod Koul , Neil Armstrong , Lorenzo Bianconi , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org Subject: [PATCH v9 4/5] phy: move and rename Airoha PCIe PHY driver to dedicated directory Date: Thu, 21 May 2026 17:35:55 +0200 Message-ID: <20260521153645.7028-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260521153645.7028-1-ansuelsmth@gmail.com> References: <20260521153645.7028-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To keep the generic PHY directory tidy, move the PCIe PHY driver for Airoha AN7581 SoC to a dedicated directory. Also rename the driver and add the relevant SoC name to the .c and .h file in preparation for support of PCIe and USB PHY driver for Airoha AN7583 SoC that use a completely different implementation and calibration for PHYs and will have their own dedicated drivers. The rename permits to better identify the specific usage of the driver in the future once the airoha PHY directory will have multiple driver for multiple SoC. The config is changed from PHY_AIROHA_PCIE to PHY_AIROHA_AN7581_PCIE. Signed-off-by: Christian Marangi Acked-by: Lorenzo Bianconi --- MAINTAINERS | 4 ++-- drivers/phy/Kconfig | 11 +---------- drivers/phy/Makefile | 4 ++-- drivers/phy/airoha/Kconfig | 13 +++++++++++++ drivers/phy/airoha/Makefile | 3 +++ .../phy-an7581-pcie-regs.h} | 2 +- .../{phy-airoha-pcie.c => airoha/phy-an7581-pcie.c} | 6 +++--- 7 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 drivers/phy/airoha/Kconfig create mode 100644 drivers/phy/airoha/Makefile rename drivers/phy/{phy-airoha-pcie-regs.h => airoha/phy-an7581-pcie-regs.h} (99%) rename drivers/phy/{phy-airoha-pcie.c => airoha/phy-an7581-pcie.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 932044785a39..7bea8c620da8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -759,8 +759,8 @@ M: Lorenzo Bianconi L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/phy/airoha,en7581-pcie-phy.yaml -F: drivers/phy/phy-airoha-pcie-regs.h -F: drivers/phy/phy-airoha-pcie.c +F: drivers/phy/airoha/phy-an7581-pcie-regs.h +F: drivers/phy/airoha/phy-an7581-pcie.c AIROHA SPI SNFI DRIVER M: Lorenzo Bianconi diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 227b9a4c612e..f9cd765a3ccc 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -46,16 +46,6 @@ config GENERIC_PHY_MIPI_DPHY Provides a number of helpers a core functions for MIPI D-PHY drivers to us. -config PHY_AIROHA_PCIE - tristate "Airoha PCIe-PHY Driver" - depends on ARCH_AIROHA || COMPILE_TEST - depends on OF - select GENERIC_PHY - help - Say Y here to add support for Airoha PCIe PHY driver. - This driver create the basic PHY instance and provides initialize - callback for PCIe GEN3 port. - config PHY_CAN_TRANSCEIVER tristate "CAN transceiver PHY" select GENERIC_PHY @@ -133,6 +123,7 @@ config PHY_XGENE help This option enables support for APM X-Gene SoC multi-purpose PHY. +source "drivers/phy/airoha/Kconfig" source "drivers/phy/allwinner/Kconfig" source "drivers/phy/amlogic/Kconfig" source "drivers/phy/apple/Kconfig" diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index f49d83f00a3d..84062279fa63 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_PHY_COMMON_PROPS) += phy-common-props.o obj-$(CONFIG_PHY_COMMON_PROPS_TEST) += phy-common-props-test.o obj-$(CONFIG_GENERIC_PHY) += phy-core.o obj-$(CONFIG_GENERIC_PHY_MIPI_DPHY) += phy-core-mipi-dphy.o -obj-$(CONFIG_PHY_AIROHA_PCIE) += phy-airoha-pcie.o obj-$(CONFIG_PHY_CAN_TRANSCEIVER) += phy-can-transceiver.o obj-$(CONFIG_PHY_GOOGLE_USB) += phy-google-usb.o obj-$(CONFIG_USB_LGM_PHY) += phy-lgm-usb.o @@ -17,7 +16,8 @@ obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o obj-$(CONFIG_PHY_SNPS_EUSB2) += phy-snps-eusb2.o obj-$(CONFIG_PHY_XGENE) += phy-xgene.o -obj-$(CONFIG_GENERIC_PHY) += allwinner/ \ +obj-$(CONFIG_GENERIC_PHY) += airoha/ \ + allwinner/ \ amlogic/ \ apple/ \ broadcom/ \ diff --git a/drivers/phy/airoha/Kconfig b/drivers/phy/airoha/Kconfig new file mode 100644 index 000000000000..9a1b625a7701 --- /dev/null +++ b/drivers/phy/airoha/Kconfig @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Phy drivers for Airoha devices +# +config PHY_AIROHA_AN7581_PCIE + tristate "Airoha AN7581 PCIe-PHY Driver" + depends on ARCH_AIROHA || COMPILE_TEST + depends on OF + select GENERIC_PHY + help + Say Y here to add support for Airoha AN7581 PCIe PHY driver. + This driver create the basic PHY instance and provides initialize + callback for PCIe GEN3 port. diff --git a/drivers/phy/airoha/Makefile b/drivers/phy/airoha/Makefile new file mode 100644 index 000000000000..912f3e11a061 --- /dev/null +++ b/drivers/phy/airoha/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_PHY_AIROHA_AN7581_PCIE) += phy-an7581-pcie.o diff --git a/drivers/phy/phy-airoha-pcie-regs.h b/drivers/phy/airoha/phy-an7581-pcie-regs.h similarity index 99% rename from drivers/phy/phy-airoha-pcie-regs.h rename to drivers/phy/airoha/phy-an7581-pcie-regs.h index 58572c793722..b938a7b468fe 100644 --- a/drivers/phy/phy-airoha-pcie-regs.h +++ b/drivers/phy/airoha/phy-an7581-pcie-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2024 AIROHA Inc * Author: Lorenzo Bianconi diff --git a/drivers/phy/phy-airoha-pcie.c b/drivers/phy/airoha/phy-an7581-pcie.c similarity index 99% rename from drivers/phy/phy-airoha-pcie.c rename to drivers/phy/airoha/phy-an7581-pcie.c index 56e9ade8a9fd..81ddf0e7638b 100644 --- a/drivers/phy/phy-airoha-pcie.c +++ b/drivers/phy/airoha/phy-an7581-pcie.c @@ -13,7 +13,7 @@ #include #include -#include "phy-airoha-pcie-regs.h" +#include "phy-an7581-pcie-regs.h" #define LEQ_LEN_CTRL_MAX_VAL 7 #define FREQ_LOCK_MAX_ATTEMPT 10 @@ -1279,12 +1279,12 @@ MODULE_DEVICE_TABLE(of, airoha_pcie_phy_of_match); static struct platform_driver airoha_pcie_phy_driver = { .probe = airoha_pcie_phy_probe, .driver = { - .name = "airoha-pcie-phy", + .name = "airoha-an7581-pcie-phy", .of_match_table = airoha_pcie_phy_of_match, }, }; module_platform_driver(airoha_pcie_phy_driver); -MODULE_DESCRIPTION("Airoha PCIe PHY driver"); +MODULE_DESCRIPTION("Airoha AN7581 PCIe PHY driver"); MODULE_AUTHOR("Lorenzo Bianconi "); MODULE_LICENSE("GPL"); -- 2.53.0