From patchwork Fri Feb 14 16:32:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dimitri Fedrau X-Patchwork-Id: 13975245 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 5853026738E; Fri, 14 Feb 2025 16:32:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550748; cv=none; b=AnDfj+aU886ntm+zmIAXgQjtpgK0T6xSoVRtpMRXOKzoao60DmcWFMnYYIKbEmCc8/aE9gy5uoOLut0lT2EXppAxQGAhRnZO3xApvk3i8ylguaqp1MOqktYeXc38FlV0w/AaxCGnszA+BD7O/b9/jsZGImuKuzt4sdqv4pv3/Fg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550748; c=relaxed/simple; bh=bbN5XPoPJYOE7dUWkYFpKfKibXLVL4Gt//xKGZaY0H0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=csd9yMGD3JldJ0H/70VuYUSBCKN5KIVooEUNM1pdHBqKhRBLiVeBVOsYgBAyVBuJsHkJWYxqWiM7ckdGP7/VyaRHUmQeEY916FIBACYLW561EitdJteGiu8oTHAc2+rF8M05UD1Tp2hvWzsDFJenQqBzq2oW+GgnhsO0YbMBF9k= 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=cZCz+nHc; arc=none smtp.client-ip=209.85.218.41 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="cZCz+nHc" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-aaf0f1adef8so452103166b.3; Fri, 14 Feb 2025 08:32:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739550744; x=1740155544; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pLxy05oqMmwvq+/mJkLJb+5gbVQ1NvpKOenAaEc/PzE=; b=cZCz+nHcUs9IFTww+Ie2qGacCjv+w30sL89i/cwoLzZV5OkS+zJjYkGsiLhktwCq86 PpElutf6fcixVsE0BpMqr5hN5Nuy5EXiZW6zMXfIsbrtXgyWGfKQZ/9Ok2SgvtTaZple bYdve/u1fZle0oWfMtYAuIopP2/gOg5LuO62x+hjHiXxPZRxkB7DN1ssvZWd49QcmrkI J1xHzLBpt+HMDSONz3IQtmjfLl2C657hDjj6RGy6uiCjVBDFkAAangXFeox/uWD3n5/2 2eLJQAKhSWygpWzhg9b+mlH84VuAaEgm/HOwxmckjRxWzxrlqzHQKFLE0GxrTNyVikut PETA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739550744; x=1740155544; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pLxy05oqMmwvq+/mJkLJb+5gbVQ1NvpKOenAaEc/PzE=; b=KGdNiA5qiRT2DnULJdCGawFi/+eVPI+euDzlu2Muija1rnTFx1/W1tdB2bR6mIqSVd qIil9Bx060F9USWvXftRX4I7NuBBHKFWM8ef2GeMqIHaGhXeYxWuQir2zQYFi/tsydK+ db4PlB9azAvf3nK6+JgxsdUkMCQlqCxkMKXEieBRmV5ztLtL5dtpY+gbGsBhxMRCAUP8 bTvpDb9Uexld0MopYmLCNua2YqTtcNMZi0kNNFT2SKdtRbg2smRX7mXoJ9Q4sxc/Tinm DBFSc+DrM+GxatABiCADdReNhfbBTfSCB6EFie7Xk0783Uv1uWeaQZOOikQbUMglvdta BH3Q== X-Forwarded-Encrypted: i=1; AJvYcCV9IBeFG9uLAj+GSiFPc5uY9XfgunBi7e4vkC0SDyJmZBt6Enk5yyrPvKgKZhVpZDY/SlByTKAVEKbAxEE=@vger.kernel.org X-Gm-Message-State: AOJu0YxNnwsdA2g+XrysooUIehjqjAWfbrug/HTgvoSc7mktD2URKvp/ At5jazaOJrWHSMq32PigQPEi70Tt/nj9GaFhaFD5Wzd6rrrtSddo X-Gm-Gg: ASbGncua8i2mPGweJrCfA8vRMy0HxuFG1xu2zVxNjlpemVOGV/z16VnJOBEDz7QgMPJ yidXTsRqu1fEKqYaZzQdEJUi8LM4I8pQPiLLLINeW0FTH4w44ACgyJ7bc1zmk3S/mEZuF6luyk5 AvwwOZg6fBHOKVZy/atozSeZKTrWJcUflRX9Ex0MhvkZ5ul4q6Hda0DtuMfghigixunvftly+bQ wJAL5+SZjIAjTiIIh9IZRcjVqM0Zw94/9SB8eHfuxpA+LlG+Y7k5/E4dqC807k6LufJ1KFe582i YHRkv5o747HNewk1Tqc= X-Google-Smtp-Source: AGHT+IGXVcix/3pEl7EzZKrYT+OKqNgNeCyrmVjNrOsIfeVM8Zc3SBjYJ6jCN2Go0h/ZeI/Bx0MC+A== X-Received: by 2002:a17:906:bc90:b0:aba:2464:ce07 with SMTP id a640c23a62f3a-aba2464df59mr704840966b.20.1739550744314; Fri, 14 Feb 2025 08:32:24 -0800 (PST) Received: from [127.0.1.1] ([2a00:79c0:653:f300:45fb:7d1a:5e4d:9727]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba5323202dsm370716266b.6.2025.02.14.08.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 08:32:23 -0800 (PST) From: Dimitri Fedrau Date: Fri, 14 Feb 2025 17:32:03 +0100 Subject: [PATCH net-next 1/3] net: phy: marvell-88q2xxx: align defines Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250214-marvell-88q2xxx-cleanup-v1-1-71d67c20f308@gmail.com> References: <20250214-marvell-88q2xxx-cleanup-v1-0-71d67c20f308@gmail.com> In-Reply-To: <20250214-marvell-88q2xxx-cleanup-v1-0-71d67c20f308@gmail.com> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?utf-8?q?Niklas_S=C3=B6derlund?= , Gregor Herburger , Stefan Eichenberger Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dimitri Fedrau X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Align some defines. Signed-off-by: Dimitri Fedrau Reviewed-by: Niklas Söderlund --- drivers/net/phy/marvell-88q2xxx.c | 62 +++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell-88q2xxx.c index bad5e7b2357da067bfd1ec6bd1307c42f5dc5c91..6e95de080bc65e8e8543d4effb9846fdd823a9d4 100644 --- a/drivers/net/phy/marvell-88q2xxx.c +++ b/drivers/net/phy/marvell-88q2xxx.c @@ -12,29 +12,29 @@ #include #include -#define PHY_ID_88Q2220_REVB0 (MARVELL_PHY_ID_88Q2220 | 0x1) -#define PHY_ID_88Q2220_REVB1 (MARVELL_PHY_ID_88Q2220 | 0x2) -#define PHY_ID_88Q2220_REVB2 (MARVELL_PHY_ID_88Q2220 | 0x3) - -#define MDIO_MMD_AN_MV_STAT 32769 -#define MDIO_MMD_AN_MV_STAT_ANEG 0x0100 -#define MDIO_MMD_AN_MV_STAT_LOCAL_RX 0x1000 -#define MDIO_MMD_AN_MV_STAT_REMOTE_RX 0x2000 -#define MDIO_MMD_AN_MV_STAT_LOCAL_MASTER 0x4000 -#define MDIO_MMD_AN_MV_STAT_MS_CONF_FAULT 0x8000 - -#define MDIO_MMD_AN_MV_STAT2 32794 -#define MDIO_MMD_AN_MV_STAT2_AN_RESOLVED 0x0800 -#define MDIO_MMD_AN_MV_STAT2_100BT1 0x2000 -#define MDIO_MMD_AN_MV_STAT2_1000BT1 0x4000 - -#define MDIO_MMD_PCS_MV_RESET_CTRL 32768 -#define MDIO_MMD_PCS_MV_RESET_CTRL_TX_DISABLE 0x8 - -#define MDIO_MMD_PCS_MV_INT_EN 32784 -#define MDIO_MMD_PCS_MV_INT_EN_LINK_UP 0x0040 -#define MDIO_MMD_PCS_MV_INT_EN_LINK_DOWN 0x0080 -#define MDIO_MMD_PCS_MV_INT_EN_100BT1 0x1000 +#define PHY_ID_88Q2220_REVB0 (MARVELL_PHY_ID_88Q2220 | 0x1) +#define PHY_ID_88Q2220_REVB1 (MARVELL_PHY_ID_88Q2220 | 0x2) +#define PHY_ID_88Q2220_REVB2 (MARVELL_PHY_ID_88Q2220 | 0x3) + +#define MDIO_MMD_AN_MV_STAT 32769 +#define MDIO_MMD_AN_MV_STAT_ANEG 0x0100 +#define MDIO_MMD_AN_MV_STAT_LOCAL_RX 0x1000 +#define MDIO_MMD_AN_MV_STAT_REMOTE_RX 0x2000 +#define MDIO_MMD_AN_MV_STAT_LOCAL_MASTER 0x4000 +#define MDIO_MMD_AN_MV_STAT_MS_CONF_FAULT 0x8000 + +#define MDIO_MMD_AN_MV_STAT2 32794 +#define MDIO_MMD_AN_MV_STAT2_AN_RESOLVED 0x0800 +#define MDIO_MMD_AN_MV_STAT2_100BT1 0x2000 +#define MDIO_MMD_AN_MV_STAT2_1000BT1 0x4000 + +#define MDIO_MMD_PCS_MV_RESET_CTRL 32768 +#define MDIO_MMD_PCS_MV_RESET_CTRL_TX_DISABLE 0x8 + +#define MDIO_MMD_PCS_MV_INT_EN 32784 +#define MDIO_MMD_PCS_MV_INT_EN_LINK_UP 0x0040 +#define MDIO_MMD_PCS_MV_INT_EN_LINK_DOWN 0x0080 +#define MDIO_MMD_PCS_MV_INT_EN_100BT1 0x1000 #define MDIO_MMD_PCS_MV_GPIO_INT_STAT 32785 #define MDIO_MMD_PCS_MV_GPIO_INT_STAT_LINK_UP 0x0040 @@ -80,11 +80,11 @@ #define MDIO_MMD_PCS_MV_100BT1_STAT1_REMOTE_RX 0x2000 #define MDIO_MMD_PCS_MV_100BT1_STAT1_LOCAL_MASTER 0x4000 -#define MDIO_MMD_PCS_MV_100BT1_STAT2 33033 -#define MDIO_MMD_PCS_MV_100BT1_STAT2_JABBER 0x0001 -#define MDIO_MMD_PCS_MV_100BT1_STAT2_POL 0x0002 -#define MDIO_MMD_PCS_MV_100BT1_STAT2_LINK 0x0004 -#define MDIO_MMD_PCS_MV_100BT1_STAT2_ANGE 0x0008 +#define MDIO_MMD_PCS_MV_100BT1_STAT2 33033 +#define MDIO_MMD_PCS_MV_100BT1_STAT2_JABBER 0x0001 +#define MDIO_MMD_PCS_MV_100BT1_STAT2_POL 0x0002 +#define MDIO_MMD_PCS_MV_100BT1_STAT2_LINK 0x0004 +#define MDIO_MMD_PCS_MV_100BT1_STAT2_ANGE 0x0008 #define MDIO_MMD_PCS_MV_100BT1_INT_EN 33042 #define MDIO_MMD_PCS_MV_100BT1_INT_EN_LINKEVENT 0x0400 @@ -92,7 +92,7 @@ #define MDIO_MMD_PCS_MV_COPPER_INT_STAT 33043 #define MDIO_MMD_PCS_MV_COPPER_INT_STAT_LINKEVENT 0x0400 -#define MDIO_MMD_PCS_MV_RX_STAT 33328 +#define MDIO_MMD_PCS_MV_RX_STAT 33328 #define MDIO_MMD_PCS_MV_TDR_RESET 65226 #define MDIO_MMD_PCS_MV_TDR_RESET_TDR_RST 0x1000 @@ -115,8 +115,8 @@ #define MDIO_MMD_PCS_MV_TDR_OFF_CUTOFF 65246 -#define MV88Q2XXX_LED_INDEX_TX_ENABLE 0 -#define MV88Q2XXX_LED_INDEX_GPIO 1 +#define MV88Q2XXX_LED_INDEX_TX_ENABLE 0 +#define MV88Q2XXX_LED_INDEX_GPIO 1 struct mv88q2xxx_priv { bool enable_temp; From patchwork Fri Feb 14 16:32:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dimitri Fedrau X-Patchwork-Id: 13975246 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 866D326770B; Fri, 14 Feb 2025 16:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550749; cv=none; b=DFrH4SlsgC/LBCd97sbhW6mt2wBqWycSYpUadbMr7wNGXmsjOxCG9yD1bQVRF/XR3ZKY8utxOQiunb0Zte7pBkd2aWkE45+7eSNr2nQKISgrvPFMN4IBXTorLrsuO+I7JfymXv8+u5kzy2vw8Yp+0oo6WaHy871pakBM099BrkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550749; c=relaxed/simple; bh=7/7IAQ8It8HjxbMXXqfT720xHoVrK4sp6wlUQESQIWo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZQcuYnYbaCX1eGg3y6WkLwgLc/YRuFj6loB5zyr356Amy7Bn8YEbM/b5OOVTadA7ScaSrycv69Qu7wAf8lwBUEilP5bYHlQ8OLeA6QxSgM/ue0cbGcq5wx/HluLNuH99qXA7asfcLkdozDkgDJRsLH3AJVnON+YS6EM7gYjg8KU= 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=c/ncjjOi; arc=none smtp.client-ip=209.85.218.53 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="c/ncjjOi" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ab7c07e8b9bso396029966b.1; Fri, 14 Feb 2025 08:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739550746; x=1740155546; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IqPz/UbwDhbLwLkq4mv8GWuHGR7t4Vk/RSI60d9yM68=; b=c/ncjjOize8CnPKKxrMMcUmOvJAQ+TEtytZxxUb0NBQhXtnBMOGuEYaq7bbT2+MQbp IXeC/uDfNU9KKroPxmK6kyrOj0UVmbDlGKmTnhTtrbGjKIhdImGq/QT68Xx5tHUyYB4q Vkmv6GLj12DnSwzN4+096xt2YNURpvyqRn3ARJVdoSB11u7HqNniy80IEbHHxObGzK8d x/bqlo0yyoGF0MEqIfzuP6dn7zFIa4MVwtqlwMytEhlAhc9tKcge1RD0eQFXPHKWJPEC PBUJkMB2jlv5LiL9UEPXlqkbYCV6ejAwd0K8LWZ3XOhAg7E6k7DX8lgHFovhXKEIV+FG 9Rpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739550746; x=1740155546; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IqPz/UbwDhbLwLkq4mv8GWuHGR7t4Vk/RSI60d9yM68=; b=Ygl6MStWVpRR6hvPRbrhuC+BcHOPH+nf2wytvjgHy4ipbSzmrMhtlHQdt7vt+uLVWk sH5MzcRTZSpO18zQfj9emd6ZkxcrBSNjN/skdqK1wYgX1Pum29S7OhUBLIrEfSxgNNR8 EBNcEeoSs9WrrnbBJW/Zc9fbaAqaHUBYxI6B64uZT3i4nRkh5AJjKsBawBsc7gPDeeCL /mevScautJ5HAJjRClNyAykz0FtbXMSMC+kS6CVVruwUAvOaRktp/BFvo/OiuTK4A95N KmJetlW8BRGFFHAMyjWINiJQjtaBQ+4hj9dVduyeLX3f34rbIu5X6RckCeH7PcHKXHiy u9bQ== X-Forwarded-Encrypted: i=1; AJvYcCU1JwGDm736W2D+Agjl+LoUCMmIF714I9lh2XB/E/smWgE/BPRrUJqz5mI5bjeBVNJx8GRHth7i0052beU=@vger.kernel.org X-Gm-Message-State: AOJu0YzZPIQvwwMpWbYfMXZRQMgGJPrlzgmrFI2kc6eK8FfDqEP6vBS+ SCNTHbym/dprMkgph47AXs6f+TY9SWxjNdvY3dormn+Seq0HOQJL X-Gm-Gg: ASbGnctbgGqgG8tVKrpv+LW8LalVOFECG4S6K3F/iLVABNdK4oRxv9iUMlBMl1SOOwP NhJ7hls16+Hw+MXkxkpMmfgoO+GRhLwlXI49G3lp1pFdewFB9vqdYL7q/pyJuFLNQgsiQPrPhyP Wf8q5FwybbZVjC0hd0IjdLdc6K1ce859j5vNzmtvylYwMI1fvNd45a+nYiTe0Oa00amu1RUz+rI KW2fUe7ijyO1lH3aTUqOOH5jsb2f0q/rCQbU87s1PyYsdKXA54p7tIKq2yfXD5FeMiqcMtucnCy wziqoHBF/Qbz2ppNAXA= X-Google-Smtp-Source: AGHT+IEd84/eqbdOzQRr76ekjrCyFk0NBRioAdlk53fcsJN7nezmxrYB1vyFVjbkEXjCGk5VSpVoDQ== X-Received: by 2002:a17:907:da5:b0:ab7:6a57:1778 with SMTP id a640c23a62f3a-ab7f31abd38mr1211491966b.0.1739550745402; Fri, 14 Feb 2025 08:32:25 -0800 (PST) Received: from [127.0.1.1] ([2a00:79c0:653:f300:45fb:7d1a:5e4d:9727]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba5323202dsm370716266b.6.2025.02.14.08.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 08:32:24 -0800 (PST) From: Dimitri Fedrau Date: Fri, 14 Feb 2025 17:32:04 +0100 Subject: [PATCH net-next 2/3] net: phy: marvell-88q2xxx: order includes alphabetically Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250214-marvell-88q2xxx-cleanup-v1-2-71d67c20f308@gmail.com> References: <20250214-marvell-88q2xxx-cleanup-v1-0-71d67c20f308@gmail.com> In-Reply-To: <20250214-marvell-88q2xxx-cleanup-v1-0-71d67c20f308@gmail.com> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?utf-8?q?Niklas_S=C3=B6derlund?= , Gregor Herburger , Stefan Eichenberger Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dimitri Fedrau X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Order includes alphabetically. Signed-off-by: Dimitri Fedrau Reviewed-by: Niklas Söderlund --- drivers/net/phy/marvell-88q2xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell-88q2xxx.c index 6e95de080bc65e8e8543d4effb9846fdd823a9d4..7b0913968bb404df1d271b040e698a4c8c391705 100644 --- a/drivers/net/phy/marvell-88q2xxx.c +++ b/drivers/net/phy/marvell-88q2xxx.c @@ -7,10 +7,10 @@ * Copyright (C) 2024 Liebherr-Electronics and Drives GmbH */ #include +#include #include #include #include -#include #define PHY_ID_88Q2220_REVB0 (MARVELL_PHY_ID_88Q2220 | 0x1) #define PHY_ID_88Q2220_REVB1 (MARVELL_PHY_ID_88Q2220 | 0x2) From patchwork Fri Feb 14 16:32:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dimitri Fedrau X-Patchwork-Id: 13975247 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (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 C6179267AE7; Fri, 14 Feb 2025 16:32:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550750; cv=none; b=ZCIN6w2akJaMYEG+VU02NCUUZEJmfNirAITko4fVfXO8MwkSdfXqnh+7U6b/mPGk+0tTfMQnYYY4wcaAL9FdAU39T+8JMVp2e6a3UCrmtgWept69lHaJ/Vy/8QLvqDrsOitI9caUXvYXdP6A3IM1Xr6kLU4HPkKWpFgI1eZcyHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550750; c=relaxed/simple; bh=7lwrx4RRpVzZCgE/TYuke3KaJPHx8rSawCREvStJyvQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mr3ZCoKBBraHR9qaeqT77TXiRhHksOrvd49B8fVya605pLwNYliVMGNA4XPj+0ICAV6iOzEm0Zwq+BU35CA8ffmFShq17bWtuHZyDllumpoFCjmAmnjTHoaWWEPcdvWBHiLrnYkqOjLqg42Zeh4yeiy42/CBhoklJjYnXc07yOk= 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=Dcc/1Si+; arc=none smtp.client-ip=209.85.208.53 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="Dcc/1Si+" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5dec996069aso3941786a12.2; Fri, 14 Feb 2025 08:32:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739550747; x=1740155547; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=HmxvbSXC9J0vj/lTBJKkcQrKbAZ26uQTzWdP7WGpRMw=; b=Dcc/1Si+Wu1fZ++JX3d5xxbATtfoYGYLprFixJ1B6SoSeJte71JHh8iP8ODfvN6SAa BN/SjffAUXrDF4It+J6ZeWdQu52iV6eRpc+giIqd6drlVpyBGiDAvGM33tPcQfhFrBU5 LlqBttyI7R4DBt3OV4jQwLHqp83FpjuQ42edOHnOqaAvr49YhTi2OY5lUSdFL/LYdvXC O+W79A4v9us0jX4G+forFzdl4oUM8X7lFwmfd+ef+izAUc4g+zEqtSRYfuHIYI+L4ZkO Ne+QIubkcIOuRrFZd7HYOPbVnSDnrGKGBLbnb6lJPd/1WgMSQT28lhfosn4zS0xekRH+ m1Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739550747; x=1740155547; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HmxvbSXC9J0vj/lTBJKkcQrKbAZ26uQTzWdP7WGpRMw=; b=BQT1cc8cRYOR4Fe6XqHKi/Fq+rRoc4NrL1Jb5GWDQSFbQYmmbiJKxPiwTnz8uCFGPD R5JQGRles6EdsmwyNq/tWUqaGvcKLClWYBu8iYpQyuUplH48s6L+UQSDJ2D6Obamj3dH dKidRsfo/9UjAM2hhUqDyZlcDyJZeR6XEsnx9jeEJfDZuDvUXuvbhBEPXC2RnZmYALef yNsZcEH0ZZEYRmfsVL0nFDN671WsCRzqyu/uqx1GN7Mc6MFxsPLUQFyb2jWdh/xtHNQM k0j3bOsasHnbx1TVIPvp8qU43jJunOe54ZMXLFr5cwAr+Mfow8lIm/ykb63JUbliBUgy BvGg== X-Forwarded-Encrypted: i=1; AJvYcCW3XwCFOULNdB9XK9gOYuc3CZvw3/GwwjIFAAaBQCxfHhthHJXIjSsoXc2BfmDHdnoNhKCr5L5eltxoVBA=@vger.kernel.org X-Gm-Message-State: AOJu0YzKJ63UdhbYyp5rv6Az3H+bC+QTN2cIftu7h7WAK3yNgdsMXkoB qpEbQlwbeUntW9FEEH8isRqnxuhmOmy6E7TV0BmXINYfMWQEYrA5 X-Gm-Gg: ASbGncvJ0lB0tPYDmV6tik5DomgII/O+saYHGyVtPDpGE9f/P8/+YedU3eesazY0AXL zc8Xsf0buOOrGgn5an3izePcBxxXlonouxdD/MurhHNX9Jj2ENiWMniFzeJxMsAJrP406728zic WKMXXARfY+aSE93pjyJJbSOzSl12HBslx2wyHIJ0EbEKGD3ct2dRxV6wZj4AD8WS0Ft9+whvyk0 Ndxb0ePEFdrr0q/3Jt8Q86xcORdLPPeOKdTHHvSU6O20n3soOI7ZSq1odd9E+F8AtbGWKK3Q4t2 +/H5rCa5pvOvAllmDEk= X-Google-Smtp-Source: AGHT+IHGRLuSZfJeXCb3dQQu1A6Yi5wnlJM4ZCRXl0irJ/FsQ5EvZnKFGPGDceSwJx2Yohsqs0noog== X-Received: by 2002:a17:907:da5:b0:ab7:e73a:f2cc with SMTP id a640c23a62f3a-ab7f33c7622mr1381130266b.27.1739550746544; Fri, 14 Feb 2025 08:32:26 -0800 (PST) Received: from [127.0.1.1] ([2a00:79c0:653:f300:45fb:7d1a:5e4d:9727]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba5323202dsm370716266b.6.2025.02.14.08.32.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 08:32:26 -0800 (PST) From: Dimitri Fedrau Date: Fri, 14 Feb 2025 17:32:05 +0100 Subject: [PATCH net-next 3/3] net: phy: marvell-88q2xxx: enable temperature sensor in mv88q2xxx_config_init Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250214-marvell-88q2xxx-cleanup-v1-3-71d67c20f308@gmail.com> References: <20250214-marvell-88q2xxx-cleanup-v1-0-71d67c20f308@gmail.com> In-Reply-To: <20250214-marvell-88q2xxx-cleanup-v1-0-71d67c20f308@gmail.com> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?utf-8?q?Niklas_S=C3=B6derlund?= , Gregor Herburger , Stefan Eichenberger Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dimitri Fedrau X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Temperature sensor gets enabled for 88Q222X devices in mv88q222x_config_init. Move enabling to mv88q2xxx_config_init because all 88Q2XXX devices support the temperature sensor. Signed-off-by: Dimitri Fedrau Tested-by: Niklas Söderlund Reviewed-by: Andrew Lunn --- drivers/net/phy/marvell-88q2xxx.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell-88q2xxx.c index 7b0913968bb404df1d271b040e698a4c8c391705..1859db10b3914f54486c7e6132b10b0353fa49e6 100644 --- a/drivers/net/phy/marvell-88q2xxx.c +++ b/drivers/net/phy/marvell-88q2xxx.c @@ -513,6 +513,15 @@ static int mv88q2xxx_config_init(struct phy_device *phydev) return ret; } + /* Enable temperature sense */ + if (priv->enable_temp) { + ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, + MDIO_MMD_PCS_MV_TEMP_SENSOR2, + MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK, 0); + if (ret < 0) + return ret; + } + return 0; } @@ -903,18 +912,6 @@ static int mv88q222x_revb1_revb2_config_init(struct phy_device *phydev) static int mv88q222x_config_init(struct phy_device *phydev) { - struct mv88q2xxx_priv *priv = phydev->priv; - int ret; - - /* Enable temperature sense */ - if (priv->enable_temp) { - ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, - MDIO_MMD_PCS_MV_TEMP_SENSOR2, - MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK, 0); - if (ret < 0) - return ret; - } - if (phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] == PHY_ID_88Q2220_REVB0) return mv88q222x_revb0_config_init(phydev); else