From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 901251C6FFE; Wed, 5 Mar 2025 17:56:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741197410; cv=none; b=deeUAfQc0l6c4RXGGHpK5rIZsCNC+60ta2gHLi/H9oD2Gku7IjsZ4NLMA1+uE60V0IjWawjiDH4tElzCNXhIyW5XYNlfGszwqMNzt2E24SDbHS/sMsvQ2V9nhd+R3AxgoPFxqVEj6gtZ2or0KjFQ0H0isxrKVp+baEyI3TolKNk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741197410; c=relaxed/simple; bh=AUAH+QBNbCQ4QGhpMw3o5g6pFMjLeulbEGYKE5tWskc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bdmUMutvpJXpWqRVWA/TLsHi2uYYGvzqgtu5ClquRIOamCCbITOgIaxAYsOT30EXj3RxLVBCgmZ4xwGkb5TdGUtc7fFIAUfuuUkVxl9PkpXRDYKB2Ga5T6Bo23j1yIi+fDpVzfycQHqsV0+foMzi2N8zPe+ysYvcHo05N37JlBQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WSnbScBG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WSnbScBG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7F62C4CED1; Wed, 5 Mar 2025 17:56:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741197410; bh=AUAH+QBNbCQ4QGhpMw3o5g6pFMjLeulbEGYKE5tWskc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WSnbScBGGMg9gEyPZA29xBQbtOJkrzU/QBX8KTGs7tM4wHFQ5zNlsdQylAzzyc1io 3F74GJ2KD7Zc8cFBNV+o/C85a8nxqUn/6G5781R1w1OEtGmnV0rY1TLNvShp2rYGnO r9XQcbQuGb7iDqtS3U+Q3Lo/qqLDCpPcbjA/VoZs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jianfeng Liu , Chukun Pan , Jonas Karlman , Vinod Koul , Sasha Levin Subject: [PATCH 6.1 147/176] phy: rockchip: naneng-combphy: compatible reset with old DT Date: Wed, 5 Mar 2025 18:48:36 +0100 Message-ID: <20250305174511.344938718@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250305174505.437358097@linuxfoundation.org> References: <20250305174505.437358097@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chukun Pan [ Upstream commit 3126ea9be66b53e607f87f067641ba724be24181 ] The device tree of RK3568 did not specify reset-names before. So add fallback to old behaviour to be compatible with old DT. Fixes: fbcbffbac994 ("phy: rockchip: naneng-combphy: fix phy reset") Cc: Jianfeng Liu Signed-off-by: Chukun Pan Reviewed-by: Jonas Karlman Link: https://lore.kernel.org/r/20250106100001.1344418-2-amadeus@jmu.edu.cn Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c index d97a7164c4964..2c73cc8dd1edb 100644 --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c @@ -299,7 +299,10 @@ static int rockchip_combphy_parse_dt(struct device *dev, struct rockchip_combphy priv->ext_refclk = device_property_present(dev, "rockchip,ext-refclk"); - priv->phy_rst = devm_reset_control_get(dev, "phy"); + priv->phy_rst = devm_reset_control_get_exclusive(dev, "phy"); + /* fallback to old behaviour */ + if (PTR_ERR(priv->phy_rst) == -ENOENT) + priv->phy_rst = devm_reset_control_array_get_exclusive(dev); if (IS_ERR(priv->phy_rst)) return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy reset\n"); -- 2.39.5