From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (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 D02D147B420 for ; Mon, 5 Oct 2026 10:55:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791197757; cv=none; b=upSlge2eNB0isfHOQDawGnwQLJ3KjQGw3XRFz5sldVeT9K0QIASCGVlb2y7pIJw4HbG7cSoEKElOhbv8+0y22CRJ/KbDofxCTnjNJsDDk+31zVdnPZS49Tg6Cdg6IlEzlwOZYOmyZ75GqqssfW8uj/BMl3oewSGDWYLMK3fsdvA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791197757; c=relaxed/simple; bh=ew8woYCTikj82gjHgZJthlUWLw3UgsBxzgCSWrswDRY=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CwtvQVVQVTVPNUswIGu3nGnY21zMHoR5+9tl3G1uqQeMKjnKUoxixpmPVTis5JNQU8IwLZpdVvhYVJNn3DQPUrWrkt+CMIvZAL7/cJO/b3UULgbC477rAkcSN6L2aBYj1NBR2MIRxOuGuPYtH0RVfgD1TBqhxgwD0UvMxy3/RII= 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=U0uxJwA9; arc=none smtp.client-ip=74.125.225.141 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="U0uxJwA9" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49e7d2bb404so6011265e9.1 for ; Mon, 05 Oct 2026 03:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791197749; x=1791802549; 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=Q6qZ1hBsm+xN1P6TzN/THVD/Mds3MJJk5yLYQnWA52I=; b=U0uxJwA93XKUu5uv05FaXSOItsE8+c3UWNvzHLfRdY7AkzDPlpa/SZ3Z3kNgOVLqON W8lrPXLe0A70prSgYddJyEbPhdvJYLFWY4ealsLxPWXrP6lGWR4E4knOkdPa3shSiZt4 sZSMDuV9vIo3xxh68oD/olozRoc/LQlY16LWZEkNOlGPDUYCwUeR21Aqet/Pe9zlFGT7 fZ0AhEBfZCD/dx6ETyn4TKxPmpr0Zzk2a8se8dimHKb8LGEbVAZLqzOB9QzrNiEl7Qpn AgSVg40YrBn6nJhkkBOLmlA/ypot2XeCQqWjhiZ8kbDoxLuk3E2gfd6RTzwgohTHpwKk FG4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791197749; x=1791802549; 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=Q6qZ1hBsm+xN1P6TzN/THVD/Mds3MJJk5yLYQnWA52I=; b=pN1NmVO7sQU0n0MRT7i4UXYHk5jDduTcfJCcW+FnlUi23i2T8GqZMOZWmVMGLBKyvP KJGFSMl8jy0+zlN2VjZZmlx8XeAmDstVIHAkmSFQbsdS92jLbtZ9f/j6bccC1v3GGYYM bmdIT1hx6yjXsNGhU0czHe1fVvz08jVoooH5xav7aOkjIBGFxASH16Pa5CmsHPQWobop 1sPdsRTMMpsWSqrXOLmW8IUqn3IBwHeRjFiyzMIp9mfXn04LZyiEk4JuOYSF+Bk4QVc8 Zt2bF28BwNfuf+UZqomsnJZq+TaDmxG53U0nDC+59KtG9/5TAN7Hk/zsR74pqccFJUHi YpGw== X-Forwarded-Encrypted: i=1; AKwUvByzPU3N3ewmdgbe/bshnpg0UqfOuNBsmUV//vOc/s7NRHbkT0rZmUAEI3q2LCTZum97WvWEWmDK1ZNaitQ=@vger.kernel.org X-Gm-Message-State: AFuF++k/cFLTFdCilV/8vNBdYR53SRVsoxwHv0gHDNUCI5KJg2k/FS0B VhePINYau+B2mR3zqV3FqZSPMc5m3qDjtKjHTINeHv+94ggr/tqjwoK3 X-Gm-Gg: AYBFou1/tbDiAxt+W5x8OvT6Hv8DPtp5dbD0X4htOOrF7Dykf4scUWGBZDRIo3EB9Nb Qw3HD+CBUdG6PNMUKsvF92DkI5I1hvAKFJKJgG4O5kjyFjXANcLMOgJgiJcZ+/JOzdaWaLVkn7N FGoxeXDXB4eoB/N5ApQ4BNIDy6OVA9CPD0zzoQecoD2Mj5ETKHmYWgJeXSJwdfwDHFTY76jE6ff Wvv+NRuWELYtuyTw7G+SdarHobLr+RDJQqoAfUVzjaEVXLOnKvE+j9hTeKXvZps02qsnPlBSsq4 WjYUV2r4tggRStlw276v5PjJiSvhMT8B0pvff6WotAr1sLsNp5iCfG2E86ndRA0XEQu8JRRGYUP IJFnyIQC8JD5BDyCVo12hgPU6UY5y++eO9g/6Mi/S1R/ZC2y9t7cjOfbI3yikFpyXdULXgHrXMU 45Sl8sbaYl83jyvdFthRreI0djhVAt6bKeawZN1t/CvHVVIeiop/iwoWRSkhf54ziEHnp7D0DfJ RslqJvpTpPrgXVZQOxElDFm72NWt22dKfnzPhY3+gNPHarLwkmt08eucH6HPiHrsW5mvg8IRQ== X-Received: by 2002:a05:600c:3b05:b0:49e:715d:95ca with SMTP id 5b1f17b1804b1-4a027561e0fmr167300395e9.13.1791197748928; Mon, 05 Oct 2026 03:55:48 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-82-57-191-234.retail.telecomitalia.it. [82.57.191.234]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4a030326132sm270319635e9.0.2026.10.05.03.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 03:55:48 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Vinod Koul , Neil Armstrong , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lorenzo Bianconi , linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v13 2/3] phy: move and rename Airoha PCIe PHY driver to dedicated directory Date: Mon, 5 Oct 2026 12:55:31 +0200 Message-ID: <20261005105535.2472-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261005105535.2472-1-ansuelsmth@gmail.com> References: <20261005105535.2472-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: 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 d8cf9722f76e..26ba9624acd5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -764,8 +764,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 105fbe408aa2..4ac7475dccfa 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 @@ -168,6 +158,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 c6dd02003bbe..dcc88a3cbaa7 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_ECONET_PCIE) += phy-econet-pcie.o obj-$(CONFIG_PHY_EYEQ5_ETH) += phy-eyeq5-eth.o @@ -20,7 +19,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/ \ aspeed/ \ 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.55.0