From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC54027A92E for ; Thu, 28 Aug 2025 20:27:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756412855; cv=none; b=oKBlWLp3WTMEn2/4vV/kSUoq9+/5DOUPNSGRq5bRxYFwv8VV26PHjBZTYyotmlJnEqS2rsasLP49NqplqP9j2bVrnE5JXedATArMxv6o/X8I0J5ohh1k5U+p3lOGEovv2UMiw7BCSpvDIg5w4aVpW4/Ou+3qS+L8YoAj8SWXZDY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756412855; c=relaxed/simple; bh=KkE/0YGTrXaqh6OGmYBVihCQjMSsTe1L1JfaB5r1EAk=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:Content-Type; b=KhLkJz25xVD6OkZXDVnfmiXJ2Oh/yUPVUlT1eyzT06f84nMf3csXG8YnA3pKaCGAwNy7RwtXGXIf5DUs5gIPi/1zkJCV1s/I7JtD7PE0UeGUvuvGb/fLspjARnY3qarbcVYPZwxqXeRP/3aAm64Pigo7v8j2ds8eLP12jhxfCiQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JL8Z3uoA; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JL8Z3uoA" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-45b7d497abaso5471825e9.0 for ; Thu, 28 Aug 2025 13:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756412852; x=1757017652; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:autocrypt:subject:from :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=7KeU5O8j9h2XmLcNb0UWrdlpvlMJiGNoPn3UL1n0epM=; b=JL8Z3uoAweYaJaSHCwpXbOp4UJhZVwDPiOY+wBFHtYsnpkJaqSq1rseApKwjdS1PPt 0HtjiWSUXupkIefq2xnqG7NXG7/jDaHkS5l8BigKmNHfa0ndlRpgW8r+6lIOGDi9fVjq sJplCYUUGAxkhAXW7EnE7fFbvi1WnhJSWf6WpN7erN2ejS4Uj3QnKu0r9xiLt0ZX5b3F DN6KxqCUzYbsKmjXllulOwqnyQvReGawHWDPw03tNtPIC97gC+F4FrxIeDORET6K//YI 2a7HpCWJPeOLD2gXQre0TR+QjISQAdcZBPtKB26zYOAPNmJEn612T9j2Wp63GQtadoGi s/IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756412852; x=1757017652; h=content-transfer-encoding:cc:to:autocrypt:subject:from :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7KeU5O8j9h2XmLcNb0UWrdlpvlMJiGNoPn3UL1n0epM=; b=Zaaj9D8wQ2OmQNgjV7SSwOMkVigadCVsGExv/9DLbcdAVwvo+4HmVuyA1SRZXg+vDH /06HeTpO7YYml1YP71j9fXV1WFC4dZSODra+Eg+8XoSOTYQZTHCJWogu/6nWI86kz31J MFCfq/t8OlaHfaDvkZhiC2WSAzx6Crx/obZ+64dEg/aLH0MG0P5wSma16kc5FwC5q+rK z/IHqB/oyuzH09oblEdGPb2DsLal9NsAAMXKjvxiQgG6d+LFEBG232jt3HEgVJHff58+ bLFCX/mKpHqwtYREYSFhTzqwhPILjKkT0/lLSkdZIIvaNss3tsfP52caVqEBPQOtAdmi UCng== X-Gm-Message-State: AOJu0Yxpq36QSrfMUv7Wv09rMNs9aY2K+c74yD9e6EMRpiDU1k8uPyia P6mkdB1aDbAfglmJigfzLvkuO+jdU8eV4VYn6oaqigdLJosbPh7ks0sB X-Gm-Gg: ASbGnct12S1mSPyFbvxiJvNUrr/+aMzes4iB6qYycLSxhRgslpQSuNGuBjrv69WlWta yAD/xQXl7LUQoc394KSZFij9JG4VlI1s9CSYZMdDGOvo/jXVHJO1uuxySD2El2zGcRi7JsOpEji ZGNFlc9H/DZtp8UeRzhzzrR7g6ZRom2T0AvP9O0Dmar3XWSSyc20b+Av3BIXgTtGEdn6bRdTHq1 f8boK/olc2oDC9gHnEW/KCxhmf6hh8Y6xUjupaory1RV5I4G5+hoqlWoZirU7B92I1n1U058ruH cARC2XnQ1euL4o9VsHuSX/T9IeDD4O8kp3H6Dv7bdadgXFs622PFSSlb2LtxIoAed1R1Mwk202O SLcrYh0vyp/MtoYbOpg2slgHI4Zhb7/l9mkPgPzDWNc1NwlE994nEDQZDc2x8lldiiRyXP+wbAd H49BG8VxfbGPrGIFyqn8BGHBGQv/DdvhmzazISi8mOsYWv0rWETzvjTShsb5LxTOgBzkQltZOdi 9Lfl/Hm X-Google-Smtp-Source: AGHT+IFr3XMXBJo1FYzkJ1hK2TAPNzhhpgHL/SjCPwaa5aTIOOi5JhUiYthAEYZP3eiOH+HsSII5sg== X-Received: by 2002:a05:600c:332a:b0:45b:7e6b:c235 with SMTP id 5b1f17b1804b1-45b7e6bc4f5mr5424375e9.9.1756412851838; Thu, 28 Aug 2025 13:27:31 -0700 (PDT) Received: from ?IPV6:2003:ea:8f2b:cc00:ac80:6621:77d9:a28? (p200300ea8f2bcc00ac80662177d90a28.dip0.t-ipconnect.de. [2003:ea:8f2b:cc00:ac80:6621:77d9:a28]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-45b6f0d3073sm98595765e9.7.2025.08.28.13.27.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 28 Aug 2025 13:27:31 -0700 (PDT) Message-ID: <5c9f80a8-1f4b-419b-a2fc-2f85f9602ae5@gmail.com> Date: Thu, 28 Aug 2025 22:27:37 +0200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Heiner Kallweit Subject: [PATCH net-next] net: phy: fixed_phy: remove link gpio support Autocrypt: addr=hkallweit1@gmail.com; keydata= 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 To: Russell King - ARM Linux , Andrew Lunn , Andrew Lunn , Paolo Abeni , Eric Dumazet , Jakub Kicinski , David Miller Cc: "netdev@vger.kernel.org" , Florian Fainelli Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit The only user of fixed_phy gpio functionality was here: arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-b.dts Support for the switch on this board was migrated to phylink (DSA - mv88e6xxx) years ago, so the the functionality is unused now. Therefore remove it. Suggested-by: Russell King (Oracle) Signed-off-by: Heiner Kallweit --- drivers/net/phy/fixed_phy.c | 68 +++---------------------------------- 1 file changed, 4 insertions(+), 64 deletions(-) diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index 7f4e1a155..aae7bd4ce 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -36,7 +35,6 @@ struct fixed_phy { bool no_carrier; int (*link_update)(struct net_device *, struct fixed_phy_status *); struct list_head node; - struct gpio_desc *link_gpiod; }; static struct fixed_mdio_bus platform_fmb = { @@ -62,12 +60,6 @@ int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier) } EXPORT_SYMBOL_GPL(fixed_phy_change_carrier); -static void fixed_phy_update(struct fixed_phy *fp) -{ - if (!fp->no_carrier && fp->link_gpiod) - fp->status.link = !!gpiod_get_value_cansleep(fp->link_gpiod); -} - static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) { struct fixed_mdio_bus *fmb = bus->priv; @@ -82,9 +74,6 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) fp->link_update(fp->phydev->attached_dev, &fp->status); - /* Check the GPIO for change in status */ - fixed_phy_update(fp); - return swphy_read_reg(reg_num, &fp->status); } } @@ -125,9 +114,8 @@ int fixed_phy_set_link_update(struct phy_device *phydev, } EXPORT_SYMBOL_GPL(fixed_phy_set_link_update); -static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr, - const struct fixed_phy_status *status, - struct gpio_desc *gpiod) +static int __fixed_phy_add(unsigned int irq, int phy_addr, + const struct fixed_phy_status *status) { int ret; struct fixed_mdio_bus *fmb = &platform_fmb; @@ -146,9 +134,6 @@ static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr, fp->addr = phy_addr; fp->status = *status; - fp->link_gpiod = gpiod; - - fixed_phy_update(fp); list_add_tail(&fp->node, &fmb->phys); @@ -157,7 +142,7 @@ static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr, void fixed_phy_add(const struct fixed_phy_status *status) { - fixed_phy_add_gpiod(PHY_POLL, 0, status, NULL); + __fixed_phy_add(PHY_POLL, 0, status); } EXPORT_SYMBOL_GPL(fixed_phy_add); @@ -171,8 +156,6 @@ static void fixed_phy_del(int phy_addr) list_for_each_entry_safe(fp, tmp, &fmb->phys, node) { if (fp->addr == phy_addr) { list_del(&fp->node); - if (fp->link_gpiod) - gpiod_put(fp->link_gpiod); kfree(fp); ida_free(&phy_fixed_ida, phy_addr); return; @@ -180,48 +163,10 @@ static void fixed_phy_del(int phy_addr) } } -#ifdef CONFIG_OF_GPIO -static struct gpio_desc *fixed_phy_get_gpiod(struct device_node *np) -{ - struct device_node *fixed_link_node; - struct gpio_desc *gpiod; - - if (!np) - return NULL; - - fixed_link_node = of_get_child_by_name(np, "fixed-link"); - if (!fixed_link_node) - return NULL; - - /* - * As the fixed link is just a device tree node without any - * Linux device associated with it, we simply have obtain - * the GPIO descriptor from the device tree like this. - */ - gpiod = fwnode_gpiod_get_index(of_fwnode_handle(fixed_link_node), - "link", 0, GPIOD_IN, "mdio"); - if (IS_ERR(gpiod) && PTR_ERR(gpiod) != -EPROBE_DEFER) { - if (PTR_ERR(gpiod) != -ENOENT) - pr_err("error getting GPIO for fixed link %pOF, proceed without\n", - fixed_link_node); - gpiod = NULL; - } - of_node_put(fixed_link_node); - - return gpiod; -} -#else -static struct gpio_desc *fixed_phy_get_gpiod(struct device_node *np) -{ - return NULL; -} -#endif - struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, struct device_node *np) { struct fixed_mdio_bus *fmb = &platform_fmb; - struct gpio_desc *gpiod; struct phy_device *phy; int phy_addr; int ret; @@ -229,17 +174,12 @@ struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, if (!fmb->mii_bus || fmb->mii_bus->state != MDIOBUS_REGISTERED) return ERR_PTR(-EPROBE_DEFER); - /* Check if we have a GPIO associated with this fixed phy */ - gpiod = fixed_phy_get_gpiod(np); - if (IS_ERR(gpiod)) - return ERR_CAST(gpiod); - /* Get the next available PHY address, up to PHY_MAX_ADDR */ phy_addr = ida_alloc_max(&phy_fixed_ida, PHY_MAX_ADDR - 1, GFP_KERNEL); if (phy_addr < 0) return ERR_PTR(phy_addr); - ret = fixed_phy_add_gpiod(PHY_POLL, phy_addr, status, gpiod); + ret = __fixed_phy_add(PHY_POLL, phy_addr, status); if (ret < 0) { ida_free(&phy_fixed_ida, phy_addr); return ERR_PTR(ret); -- 2.51.0