From patchwork Thu Apr 4 13:11:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10885585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC00E1800 for ; Thu, 4 Apr 2019 13:12:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF7BF288BE for ; Thu, 4 Apr 2019 13:12:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDA2728A0A; Thu, 4 Apr 2019 13:12:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 738CA28901 for ; Thu, 4 Apr 2019 13:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QKvu8eopNbVSNc3XE8rz0cljutlMKu+MgE+mnq23CBc=; b=fFZbSiZbAYSY4M 0aUndVXrziP/cqli83ta6L/O6x//xWq0aPjWenruYGfMgnv5GH3BwR6FfVjzN1bwruNc09wgJ5KJZ /2g8Wjq2feOJ49vCfYfHBSdJpFB0vzXKgyQnAZ5XndRDyaNtzU3MnD6h2k55HmfLMw3fyV/dq0tH6 ap9PCrkZ0GGOJHymckxANevxo09CbAky3y12Gusl9G7dvDOVIWu7Xo4uFP336xNJjqwWe/rxZR5Wq miPoVa8ZZstiJgNvC9In79ZFGwD9ZdGhikO14RRap1cQRvWn7TgiulUAUpP8IyMc7yzYjNrdwJexL AuYf9Lmev9HPUBULhbEw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hC2A5-0001Y4-6j; Thu, 04 Apr 2019 13:12:09 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hC2A0-0001R0-4G for linux-amlogic@lists.infradead.org; Thu, 04 Apr 2019 13:12:07 +0000 Received: by mail-wr1-x442.google.com with SMTP id g3so3717665wrx.9 for ; Thu, 04 Apr 2019 06:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C2Np36jjJb1WgC3/59cWHoAfdL0+gseCwYoNIkBU+7U=; b=NQgQuChtIdoSiqdDUI/JiMdfrin2nesP+nHhGvk7kbC8hVW7tOFo7cOHjEqyYBu10j Va0SyZVG9PAwkJCupFCpS2uqNbIkfkCl7XnE9VF8jiwnwH4Q+iAyanKMbDjKLy76Czgm tpOvsR49SukQ45ZGP9bqs9qCzynO2LUR3o23VOoX37jFlnHDTh6bxn8cbAK2ufyvKKFx x75UloYi0jXPXonR6xZjZHhyRCLisJGzReG2UqZMayZeqEITcr0Zy72yuTu0DYqCHPAT +gu1fDKbnRPy3GUV1Z1Lb1UI2vk8Eqmrlesu0vA2Q4Mx8KFsuN68o9WkmO0LPbwPyyeN 7e2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C2Np36jjJb1WgC3/59cWHoAfdL0+gseCwYoNIkBU+7U=; b=uGfFPCzxpW3qR3yFH3OC3iCrEB/oyevQvRG/voYcyjGZKNhrSwN3Q9ztcOwhABnFhw JIqcCpYtJYf3yyiLeBREdTUzwEMoVG7xE4CRwB0uOmAPBZ130s4qd8GquFDpy/NtScv1 Eqfw5oTFW1gQi0dRrevXpUab39/qEauPYsjhK1si2qyP57ReRMtpu0GKZaQa0MAJ2Top wrVpsunb4r+DTcLUU5Dpi6SNk2q5HtprsKfgUal7wE4lLdwZFK9ENknX++IXBacvQsO3 MxVqJSyEwJwdATtXe21g+g0v0k+1cn6kkmJSSLuX6TNn0lW9wpc6eEDMhQMAGKyfsL6x 2u1w== X-Gm-Message-State: APjAAAVO6sxP6KjrF5eCsKujGqsU57x7Ub0q4esJm9ovMsuCAoUPc26e jEzIMrBhsEnu94M4B1xs1B8kWQ== X-Google-Smtp-Source: APXvYqxQl1GGh5tExSlAH4AvtpSgyqpazagc72wWxAq/TU+yuZKlzg1TvaIJXTelAyeL+Hgp7MV4Ew== X-Received: by 2002:a5d:6181:: with SMTP id j1mr4239923wru.11.1554383522488; Thu, 04 Apr 2019 06:12:02 -0700 (PDT) Received: from boomer.local ([2a01:e34:eeb6:4690:106b:bae3:31ed:7561]) by smtp.googlemail.com with ESMTPSA id y133sm21984923wmd.2.2019.04.04.06.12.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Apr 2019 06:12:01 -0700 (PDT) From: Jerome Brunet To: Andrew Lunn , Florian Fainelli , Heiner Kallweit , "David S. Miller" , Kevin Hilman Subject: [PATCH net-next v3 4/4] net: phy: meson-gxl: clean-up gxl variant driver Date: Thu, 4 Apr 2019 15:11:47 +0200 Message-Id: <20190404131147.31156-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190404131147.31156-1-jbrunet@baylibre.com> References: <20190404131147.31156-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190404_061204_474249_B8C40D06 X-CRM114-Status: GOOD ( 12.21 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The purpose of this change is to align the gxl and g12a driver declaration. Like on the g12a variant, remove genphy_aneg_done() from the driver declaration as the net phy framework will default to it anyway. Also, the gxl phy id should be an exact match as well, so let's change this and use the macro provided. Signed-off-by: Jerome Brunet Reviewed-by: Florian Fainelli --- drivers/net/phy/meson-gxl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 2033c93a46ca..6d4a8c508ec0 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -224,14 +224,12 @@ static int meson_gxl_config_intr(struct phy_device *phydev) static struct phy_driver meson_gxl_phy[] = { { - .phy_id = 0x01814400, - .phy_id_mask = 0xfffffff0, + PHY_ID_MATCH_EXACT(0x01814400), .name = "Meson GXL Internal PHY", .features = PHY_BASIC_FEATURES, .flags = PHY_IS_INTERNAL, .soft_reset = genphy_soft_reset, .config_init = meson_gxl_config_init, - .aneg_done = genphy_aneg_done, .read_status = meson_gxl_read_status, .ack_interrupt = meson_gxl_ack_interrupt, .config_intr = meson_gxl_config_intr, @@ -251,7 +249,7 @@ static struct phy_driver meson_gxl_phy[] = { }; static struct mdio_device_id __maybe_unused meson_gxl_tbl[] = { - { 0x01814400, 0xfffffff0 }, + { PHY_ID_MATCH_VENDOR(0x01814400) }, { PHY_ID_MATCH_VENDOR(0x01803301) }, { } };