From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030657; b=v3bcAmPUTiJYz7Wjswvk0KfQz1QlGMn9R4+qi8SBq6CUuVwYIOSo3UEsGdTHJtYkzs55 vyJClTmC8zwUuAEdb7/dxkAoM5SZPvu3U5TG0NfNbeDmj2dxktlDjrDjMlbTh9cEUCOrT 6EaAKJpk0/OsghgjLd6gUCWpmsDiTbiZqsGjbNheQCMThRk929OALojkAHwDTAP63WBn3 b2gFtPRAzHW3Uew+vNmFYrK14GdtzqDh2xgVNBEoxfxDew7HFB4eehH7W+gXlwW554dcG M0Og72+LVTRIMIv1YEYvnwf6IOn2kHZzWl2WJP1IMLcYhtXOvNxNWmLMxrgKxM0P7Ng== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030657; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=XxGcDNlWHEyeYfWXCmJiACs6RRO06U5ewQIAFe6Vba4=; b=AIkRM/JCmTI5cW1m1Cw2K4UlrE9Z1jEzbeibWNZ0a9eNiFYSDcynRvzDIi9osbh4/msM XPaa0uiw9nfDBi0dlefVIvPxI+5Am0h9FbOmNjKd2ftA0hP7k3hLxzeW23RXAaSm5GpRW Gvm8HgoFtCezkfFExKZooDMxrg5Zc/HGIgH2GTrkWzK1Hr2GNkxUWmxQYJBCJRMTXREgd fJbdMCzNMxJayRsPHwamf/BIexkSknyOVDep190hmZmMpJIK8gQ1Z6jMEOAVr2HringGv X0MbS2UOSL07OlBWg98SohjaZuPUKI6LWbErJgNviDd8spHc3dbLr+/E4fuPorRyvEw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=FhSqrOxK; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69F3E606A31C; Wed, 18 Nov 2026 19:37:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=FhSqrOxK Received: by smtp.kernel.org (Postfix) with ESMTPSA id 815811F000C4; Wed, 18 Nov 2026 19:37:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030657; bh=XxGcDNlWHEyeYfWXCmJiACs6RRO06U5ewQIAFe6Vba4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FhSqrOxK5EsUz6JgWAIacJMdmdvWCM5+8WQF9141euxCK5G627dUHydKeHAUNsbT1 2wFJjA+JipbJlhqfgehQDiO+NGO2qao7GyEcfTUsFwI+BC1jVlKLUKmThiVJnXNn0T 1seqOTrNKjf0UoPEsYP2Z0xF041WZr3WzdtCIgzU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Sebastian Reichel , Manivannan Sadhasivam , Vinod Koul , Sasha Levin , Igor Paunovic Subject: [PATCH 6.12 0781/1756] phy: rockchip: usbdp: Drop seamless DP takeover Date: Wed, 18 Nov 2026 15:48:28 +0100 Message-ID: <20261118150040.703463883@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Reichel [ Upstream commit 1ab628ce8f3ab694c28dcfcd5b1eec0cf9f499b8 ] Right now the DRM drivers do not support seamless DP takeover and I'm I'm not aware of any bootloader implementing this feature either. In any case this feature would be limited to boards using the USBDP PHY for a DP or eDP connection instead of the more commonly USB-C connector. With USB-C's DP AltMode a seamless DP takeover requires handing over the state of the TCPM state machine from the bootloader to the kernel. This in turn requires a huge amount of work to keep the state machine implementations synchronized. It's very unlikely we will see somebody implementing that in the foreseeable future. As the current code is obviously buggy and untested, let's simply drop support for seamless DP takeover. It can be re-implemented cleanly once somebody adds all missing bits. Fixes: 2f70bbddeb45 ("phy: rockchip: add usbdp combo phy driver") Reported-by: Sashiko Closes: https://lore.kernel.org/linux-phy/20260612164107.C7DB21F000E9@smtp.kernel.org/ Tested-by: Igor Paunovic # Orange Pi 5 Plus Signed-off-by: Sebastian Reichel Reviewed-by: Manivannan Sadhasivam Link: https://patch.msgid.link/20260915-rockchip-usbdp-cleanup-v15-6-80e2c11d1ce8@collabora.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 31 ----------------------- 1 file changed, 31 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c index aa58b1555b9c7..022218e64f48e 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -452,11 +452,6 @@ static int rk_udphy_reset_assert_all(struct rk_udphy *udphy) return reset_control_bulk_assert(udphy->num_rsts, udphy->rsts); } -static int rk_udphy_reset_deassert_all(struct rk_udphy *udphy) -{ - return reset_control_bulk_deassert(udphy->num_rsts, udphy->rsts); -} - static int rk_udphy_reset_deassert(struct rk_udphy *udphy, char *name) { struct reset_control_bulk_data *list = udphy->rsts; @@ -924,28 +919,6 @@ static int rk_udphy_parse_lane_mux_data(struct rk_udphy *udphy) return 0; } -static int rk_udphy_get_initial_status(struct rk_udphy *udphy) -{ - int ret; - u32 value; - - ret = clk_bulk_prepare_enable(udphy->num_clks, udphy->clks); - if (ret) { - dev_err(udphy->dev, "failed to enable clk\n"); - return ret; - } - - rk_udphy_reset_deassert_all(udphy); - - regmap_read(udphy->pma_regmap, CMN_LANE_MUX_AND_EN_OFFSET, &value); - if (FIELD_GET(CMN_DP_LANE_MUX_ALL, value) && FIELD_GET(CMN_DP_LANE_EN_ALL, value)) - udphy->status = UDPHY_MODE_DP; - else - rk_udphy_disable(udphy); - - return 0; -} - static int rk_udphy_parse_dt(struct rk_udphy *udphy) { struct device *dev = udphy->dev; @@ -1496,10 +1469,6 @@ static int rk_udphy_probe(struct platform_device *pdev) if (ret) return ret; - ret = rk_udphy_get_initial_status(udphy); - if (ret) - return ret; - mutex_init(&udphy->mutex); platform_set_drvdata(pdev, udphy); -- 2.53.0