fix ac200-sunxi module deps

chraac · May 9, 2024 · 68bf44c · 68bf44c
1 parent 185806a
commit 68bf44c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/drv-gmac-sun50i-h616-gmac-driver.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/drv-gmac-sun50i-h616-gmac-driver.patch
@@ -1,4 +1,4 @@
-From 769b99eea7f48ecacfdab80b3be474e553c6cf6e Mon Sep 17 00:00:00 2001
+From d68e3f7cb77c0683e49fae1d41e8fc9e1190c6f4 Mon Sep 17 00:00:00 2001
 From: chraac <chraac@gmail.com>
 Date: Wed, 1 May 2024 14:32:00 +0800
 Subject: [PATCH] add gmac driver
@@ -17,12 +17,12 @@ commit:
  drivers/net/ethernet/allwinner/sunxi-gmac.c   | 2219 +++++++++++++++++
  drivers/net/ethernet/allwinner/sunxi-gmac.h   |  270 ++
  .../net/ethernet/allwinner/sunxi_gmac_ops.c   |  768 ++++++
- drivers/net/phy/Kconfig                       |    7 +
+ drivers/net/phy/Kconfig                       |    8 +
  drivers/net/phy/Makefile                      |    1 +
  drivers/net/phy/sunxi-ephy.c                  |  518 ++++
  include/linux/mfd/ac200.h                     |  213 ++
  include/linux/of_gpio.h                       |   18 +
- 16 files changed, 4366 insertions(+), 46 deletions(-)
+ 16 files changed, 4367 insertions(+), 46 deletions(-)
  create mode 100644 drivers/mfd/sunxi-ac200.c
  create mode 100644 drivers/net/ethernet/allwinner/sunxi-gmac.c
  create mode 100644 drivers/net/ethernet/allwinner/sunxi-gmac.h
@@ -517,7 +517,7 @@ index 000000000000..ec8959ef5327
 +MODULE_AUTHOR("Jernej Skrabec <jernej.skrabec@siol.net>");
 +MODULE_LICENSE("GPL v2");
 diff --git a/drivers/net/ethernet/allwinner/Kconfig b/drivers/net/ethernet/allwinner/Kconfig
-index 3e81059f8693..9668947f5f88 100644
+index 3e81059f8693..36d808810ca4 100644
 --- a/drivers/net/ethernet/allwinner/Kconfig
 +++ b/drivers/net/ethernet/allwinner/Kconfig
 @@ -34,4 +34,12 @@ config SUN4I_EMAC
@@ -528,9 +528,9 @@ index 3e81059f8693..9668947f5f88 100644
 +    tristate "Allwinner GMAC support"
 +	depends on ARCH_SUNXI
 +	depends on OF
++	depends on AC200_PHY_SUNXI
 +	select CRC32
 +	select MII
-+	select PHYLIB
 +
  endif # NET_VENDOR_ALLWINNER
 diff --git a/drivers/net/ethernet/allwinner/Makefile b/drivers/net/ethernet/allwinner/Makefile
@@ -3818,17 +3818,18 @@ index 000000000000..926516835023
 +}
 +MODULE_LICENSE("Dual BSD/GPL");
 diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
-index 43edfd9d61dc..f506ce104512 100644
+index 43edfd9d61dc..db939f3c6abf 100644
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -75,6 +75,13 @@ config AC200_PHY
+@@ -75,6 +75,14 @@ config AC200_PHY
  	help
  	  Fast ethernet PHY as found in X-Powers AC200 multi-function device.
 
 +config AC200_PHY_SUNXI
 +	tristate "AC200 EPHY(Sunxi)"
 +	depends on NVMEM
 +	depends on OF
++	depends on AC200_SUNXI
 +	help
 +	  Fast ethernet PHY as found in X-Powers AC200(Sunxi) multi-function device.
 +