generic: ar8216: update version switch for of_get_phy_mode fix
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 16 Feb 2021 21:56:06 +0000 (22:56 +0100)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 16 Feb 2021 22:42:43 +0000 (23:42 +0100)
Kernel has changed the of_get_phy_mode API in commit 0c65b2b90d13
("net: of_get_phy_mode: Change API to solve int/unit warnings").

This is already included in kernel 5.5, so fix the version switch
(though this will not actually matter for the versions we support).

Similar driver adjustments to account for the API change will
probably be necessary to various other local drivers.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
target/linux/generic/files/drivers/net/phy/ar8216.c

index d48a415d50c99d80c7e3ed1e27b1596b9e3e8ea4..ef0fc549492d1e3c22513f2017793c1ebd3b8817 100644 (file)
@@ -891,7 +891,7 @@ ar8216_phy_write(struct ar8xxx_priv *priv, int addr, int regnum, u16 val)
 static int
 ar8229_hw_init(struct ar8xxx_priv *priv)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
        phy_interface_t phy_if_mode;
 #else
        int phy_if_mode;
@@ -903,7 +903,7 @@ ar8229_hw_init(struct ar8xxx_priv *priv)
        ar8xxx_write(priv, AR8216_REG_CTRL, AR8216_CTRL_RESET);
        ar8xxx_reg_wait(priv, AR8216_REG_CTRL, AR8216_CTRL_RESET, 0, 1000);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
        of_get_phy_mode(priv->pdev->of_node, &phy_if_mode);
 #else
        phy_if_mode = of_get_phy_mode(priv->pdev->of_node);