Merge tag 'v5.11' into h8300-next

Linux 5.11

diff --cc drivers/net/ethernet/smsc/Kconfig
index cc900412f55d12b123c9ad8851ecc73aad215f1a,c52a38df0e0d8eac628bbc97460ef86ac4f7b972..6571a6a90c1a58928a342c07620a551b96ab6513
--- 1/drivers/net/ethernet/smsc/Kconfig
--- 2/drivers/net/ethernet/smsc/Kconfig
+++ b/drivers/net/ethernet/smsc/Kconfig
@@@ -37,8 -37,9 +37,8 @@@ config SMC91
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII
 -      depends on !OF || GPIOLIB
        depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \
-                  MIPS || NIOS2 || SUPERH || XTENSA || H8300
+                  MIPS || NIOS2 || SUPERH || XTENSA || H8300 || COMPILE_TEST
        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it

diff --cc drivers/net/ethernet/smsc/smc91x.c
index b5d053292e7179860a3bac207847d545a8c5f873,742a1f7a838c95ed579a150742a08a5c061a118e..56c36798cb111b4ce6895d0d245ba2cef3a39358
--- 1/drivers/net/ethernet/smsc/smc91x.c
--- 2/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@@ -2189,9 -2190,14 +2190,15 @@@ static const struct of_device_id smc91x
  };
  MODULE_DEVICE_TABLE(of, smc91x_match);
  
 +#if defined(CONFIG_GPIOLIB)
  /**
   * of_try_set_control_gpio - configure a gpio if it exists
+  * @dev: net device
+  * @desc: where to store the GPIO descriptor, if it exists
+  * @name: name of the GPIO in DT
+  * @index: index of the GPIO in DT
+  * @value: set the GPIO to this value
+  * @nsdelay: delay before setting the GPIO
   */
  static int try_toggle_control_gpio(struct device *dev,
                                   struct gpio_desc **desc,