[net-next,RFC,v3,1/4] net: phy: aquantia: move to separate directory
Commit Message
Move aquantia PHY driver to separate driectory in preparation for
firmware loading support to keep things tidy.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
Changes v3:
- Add this patch
drivers/net/phy/Kconfig | 7 ++-----
drivers/net/phy/Makefile | 6 +-----
drivers/net/phy/aquantia/Kconfig | 5 +++++
drivers/net/phy/aquantia/Makefile | 6 ++++++
drivers/net/phy/{ => aquantia}/aquantia.h | 0
drivers/net/phy/{ => aquantia}/aquantia_hwmon.c | 0
drivers/net/phy/{ => aquantia}/aquantia_main.c | 0
7 files changed, 14 insertions(+), 10 deletions(-)
create mode 100644 drivers/net/phy/aquantia/Kconfig
create mode 100644 drivers/net/phy/aquantia/Makefile
rename drivers/net/phy/{ => aquantia}/aquantia.h (100%)
rename drivers/net/phy/{ => aquantia}/aquantia_hwmon.c (100%)
rename drivers/net/phy/{ => aquantia}/aquantia_main.c (100%)
Comments
> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> index 421d2b62918f..4b2451dd6c45 100644
> --- a/drivers/net/phy/Kconfig
> +++ b/drivers/net/phy/Kconfig
> @@ -68,6 +68,8 @@ config SFP
>
> comment "MII PHY device drivers"
>
> +source "drivers/net/phy/aquantia/Kconfig"
> +
> config AMD_PHY
> tristate "AMD and Altima PHYs"
> help
> @@ -96,11 +98,6 @@ config ADIN1100_PHY
> Currently supports the:
> - ADIN1100 - Robust,Industrial, Low Power 10BASE-T1L Ethernet PHY
>
> -config AQUANTIA_PHY
> - tristate "Aquantia PHYs"
> - help
> - Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
> -
Does this move the PHY in the make menuconfig menu? We try to keep it
sorted based on the tristate string.
Andrew
On Thu, Nov 02, 2023 at 04:03:33PM +0100, Andrew Lunn wrote:
> > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> > index 421d2b62918f..4b2451dd6c45 100644
> > --- a/drivers/net/phy/Kconfig
> > +++ b/drivers/net/phy/Kconfig
> > @@ -68,6 +68,8 @@ config SFP
> >
> > comment "MII PHY device drivers"
> >
> > +source "drivers/net/phy/aquantia/Kconfig"
> > +
> > config AMD_PHY
> > tristate "AMD and Altima PHYs"
> > help
> > @@ -96,11 +98,6 @@ config ADIN1100_PHY
> > Currently supports the:
> > - ADIN1100 - Robust,Industrial, Low Power 10BASE-T1L Ethernet PHY
> >
> > -config AQUANTIA_PHY
> > - tristate "Aquantia PHYs"
> > - help
> > - Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
> > -
>
> Does this move the PHY in the make menuconfig menu? We try to keep it
> sorted based on the tristate string.
>
Oh wasn't aware... Yes it does move it to the top of the list... I can
just move the source entry where AQUANTIA_PHY was... Or if we really
want, not create a dedicated Kconfig for it and keep everything in PHY.
On Thu, Nov 02, 2023 at 04:07:41PM +0100, Christian Marangi wrote:
> On Thu, Nov 02, 2023 at 04:03:33PM +0100, Andrew Lunn wrote:
> > > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> > > index 421d2b62918f..4b2451dd6c45 100644
> > > --- a/drivers/net/phy/Kconfig
> > > +++ b/drivers/net/phy/Kconfig
> > > @@ -68,6 +68,8 @@ config SFP
> > >
> > > comment "MII PHY device drivers"
> > >
> > > +source "drivers/net/phy/aquantia/Kconfig"
> > > +
> > > config AMD_PHY
> > > tristate "AMD and Altima PHYs"
> > > help
> > > @@ -96,11 +98,6 @@ config ADIN1100_PHY
> > > Currently supports the:
> > > - ADIN1100 - Robust,Industrial, Low Power 10BASE-T1L Ethernet PHY
> > >
> > > -config AQUANTIA_PHY
> > > - tristate "Aquantia PHYs"
> > > - help
> > > - Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
> > > -
> >
> > Does this move the PHY in the make menuconfig menu? We try to keep it
> > sorted based on the tristate string.
> >
>
> Oh wasn't aware... Yes it does move it to the top of the list... I can
> just move the source entry where AQUANTIA_PHY was...
Yes, that would be best.
Thanks
Andrew
---
pw-bot: cr
@@ -68,6 +68,8 @@ config SFP
comment "MII PHY device drivers"
+source "drivers/net/phy/aquantia/Kconfig"
+
config AMD_PHY
tristate "AMD and Altima PHYs"
help
@@ -96,11 +98,6 @@ config ADIN1100_PHY
Currently supports the:
- ADIN1100 - Robust,Industrial, Low Power 10BASE-T1L Ethernet PHY
-config AQUANTIA_PHY
- tristate "Aquantia PHYs"
- help
- Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
-
config AX88796B_PHY
tristate "Asix PHYs"
help
@@ -35,11 +35,7 @@ obj-y += $(sfp-obj-y) $(sfp-obj-m)
obj-$(CONFIG_ADIN_PHY) += adin.o
obj-$(CONFIG_ADIN1100_PHY) += adin1100.o
obj-$(CONFIG_AMD_PHY) += amd.o
-aquantia-objs += aquantia_main.o
-ifdef CONFIG_HWMON
-aquantia-objs += aquantia_hwmon.o
-endif
-obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o
+obj-$(CONFIG_AQUANTIA_PHY) += aquantia/
obj-$(CONFIG_AT803X_PHY) += at803x.o
obj-$(CONFIG_AX88796B_PHY) += ax88796b.o
obj-$(CONFIG_BCM54140_PHY) += bcm54140.o
new file mode 100644
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config AQUANTIA_PHY
+ tristate "Aquantia PHYs"
+ help
+ Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
new file mode 100644
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+aquantia-objs += aquantia_main.o
+ifdef CONFIG_HWMON
+aquantia-objs += aquantia_hwmon.o
+endif
+obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o
similarity index 100%
rename from drivers/net/phy/aquantia.h
rename to drivers/net/phy/aquantia/aquantia.h
similarity index 100%
rename from drivers/net/phy/aquantia_hwmon.c
rename to drivers/net/phy/aquantia/aquantia_hwmon.c
similarity index 100%
rename from drivers/net/phy/aquantia_main.c
rename to drivers/net/phy/aquantia/aquantia_main.c