net: phy: aquantia: move to separate directory

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>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 421d2b62918fd28b3c94aeb354b7d22be0351d93..25cfc5ded1da856f8a91bc600bae9b0c169f3a5a 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -96,10 +96,7 @@ 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
+source "drivers/net/phy/aquantia/Kconfig"
 
 config AX88796B_PHY
        tristate "Asix PHYs"

diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index c945ed9bd14b3928d6aa161b925a075fd90e5e9b..f65e85c91fc10b1be61b5c06d118aed149aee43f 100644 (file)
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -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

diff --git a/drivers/net/phy/aquantia/Kconfig b/drivers/net/phy/aquantia/Kconfig
new file mode 100644 (file)
index 0000000..2261464
--- /dev/null
+++ b/drivers/net/phy/aquantia/Kconfig
@@ -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

diff --git a/drivers/net/phy/aquantia/Makefile b/drivers/net/phy/aquantia/Makefile
new file mode 100644 (file)
index 0000000..346f350
--- /dev/null
+++ b/drivers/net/phy/aquantia/Makefile
@@ -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

diff --git a/drivers/net/phy/aquantia.h b/drivers/net/phy/aquantia/aquantia.h
similarity index 100%
rename from drivers/net/phy/aquantia.h
rename to drivers/net/phy/aquantia/aquantia.h

diff --git a/drivers/net/phy/aquantia_hwmon.c b/drivers/net/phy/aquantia/aquantia_hwmon.c
similarity index 100%
rename from drivers/net/phy/aquantia_hwmon.c
rename to drivers/net/phy/aquantia/aquantia_hwmon.c

diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
similarity index 100%
rename from drivers/net/phy/aquantia_main.c
rename to drivers/net/phy/aquantia/aquantia_main.c