From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 B7AAB3ECBDA for ; Wed, 6 May 2026 14:53:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778079192; cv=none; b=HQeSu7LCgx6L3m0zmdg0bLfljvTmojm4H01WKCVhBswxf6x6jR1/A9DrQo4FPDws/jk39ieEDC6d16YfB+feRfSVexM7oxDAuMQQ0sqRdOIRp4dbWwlEHE2aDljnv9lfxCU8daIKmylD7LubbEmKBgFH1T4OeaR2vavDerfBJWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778079192; c=relaxed/simple; bh=R3SSPJXvpf5OjuYx5rEIzWzUqFNGK3pdIYU6G3MlSWY=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=BGnVqwL++v76IOSK0A0WEO5T8TbYqi19TG9etFNNgFrjmN6VY1ef4AfqqV5ucP9g2ItnR/ZFdXvdcmt+EOcjx9izoz7mEKD77PymKPLl3Ba22bFdutGJfA/NJ/zMwLCh8rd3Ubw5w76okCjS0FASjQCnK5ujslh53o12SmxuIqY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=svFgNIxr; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="svFgNIxr" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-488b0046078so57900135e9.1 for ; Wed, 06 May 2026 07:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778079189; x=1778683989; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=ZAySrM3bN8yQAz+pyh9tgVeeAYL6w3U2oSQp8JsglNA=; b=svFgNIxrI44E9oB59OC+yyeWhEZ+IG6CPbV/0/iGVK120i0UMNuBifv6fEf6wI3Nn3 bxEUyBqEe3BPPdW4vgciOqgbA42kc1BZhYAtNnWHv/3cSs8Qh8Q0EoPLvePpyCA+G2U1 yMxOZlKwFgvnjAhQu9Nt4A1onD/QbE7CijAwNXpjgivw6A+80/C+KR+HN2h2LDkdEp8M Ayx/zZOTfWYS8zmTlgWkPYJnR7Vl4ca+RN7jW3/DvzlSSFO7s/y1z1o4BJ+UCTGcEpKI H7fA0FbM3uU/9MOH5dSP08Bi6S4GHtSsOzy9ZHe9QahjKPd0zotZl+DDeOkIO3bHKndB 0jLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778079189; x=1778683989; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZAySrM3bN8yQAz+pyh9tgVeeAYL6w3U2oSQp8JsglNA=; b=F6jdIzl41u3vk0MnUCq/wpuf7ippZA0B7ctgJ2/C2A6cS0ftnScEG4yv/YPxuLAfij +yFybapTNajPpKKiN67T6ThaBFI4yWH7xyYbSMUYIGE2fZplKgyVjDmuws29gDwjmSkp UKVcI0MxcoM+r/6Gfw4NzGMTmtDSiCW6IxUtWzTcpXtPygEdE3loBr4MX/g5RxE5LFwc 0BRKtj2CuKCCo7/Yv8ll0Prp76fEgb57ecYqFScmiRjyGCxnUNTEya9cj6hEHNEcZgQ+ UiRlleb6qN+s+a4lL4z07F4gbvDQPItXT/mpMHnAsJxgCe9vK4fkyPIsSOLC6QIrW0FQ 26aw== X-Forwarded-Encrypted: i=1; AFNElJ+X2NjXNL60bLTUpx5rd1Yc7uVt50d6+p0vxaPUTUlqjlKJRIKbP9oKDpBeKyguL48QFvQKs265B0bsB24=@vger.kernel.org X-Gm-Message-State: AOJu0YwTivgHJY8P2DUpJc2nbdyPChzff6KQqjpb+Trwm8YyRnNuetvT 1eYOtzB4RQ3EQ3QJVxsWUf73lMKuVsFiReKOrRHAaKBPS3v/Qyp8r92e/cBfZV7obFo= X-Gm-Gg: AeBDieuD2wAZNvvla4C+a/eklnky5aT6XHW8oMPV/HU5JqLrMfPRxdFVfWlGxYuvZ9d Ya6egP+6JXgwAUNVMNDLNQmHu/T6XjSO02fS3vyTVtj8cHOSOEN+/744yRBEEXk/nuAPj5e6EC0 I2gr3kI7IFJErST1lU6EutK7LHZ4ynHSaiKfi5OK+7dI/MxLEAszR9r8tcREYHbqIzTc95NAge4 WJAXrOrey7JFDmFhfCU2q+gCpAYTEhMPCMidAEQB8RZT2tiYXtlB2Ss3dnZWjDU+cQTziuKKLUJ odbGolm7wQE762bGoYBs8eYBFNAUsRW78bD7z27+1A1gD4F6CGKiBkwbh0+OaNnCMUjUKL/ClKu nNCPbtEaZstN/k1HKdlwP3aNCM/g6owGLcjLvvPN3bsCGuRAiyBh7k2s9WPgMC1JT3SnR6iQNCD sn+T/JuF0sED00lIQvOMXC3Z8kxT1jWPOvv3ECeKuwCj/4CYLBS45XjrYCsLXRmTMRjAycAOUWm rVicw4lB2WXUTgETQ== X-Received: by 2002:a05:600c:3e8d:b0:48a:6268:18a9 with SMTP id 5b1f17b1804b1-48e51f32797mr68799045e9.13.1778079188986; Wed, 06 May 2026 07:53:08 -0700 (PDT) Received: from ?IPV6:2a01:e0a:106d:1080:5798:67fd:c866:b378? ([2a01:e0a:106d:1080:5798:67fd:c866:b378]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530b05d9sm25672695e9.3.2026.05.06.07.53.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 May 2026 07:53:08 -0700 (PDT) Message-ID: Date: Wed, 6 May 2026 16:53:07 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Reply-To: Neil Armstrong Subject: Re: [PATCH v4 07/16] phy: rockchip: usbdp: Support single-lane DP To: Sebastian Reichel , Vinod Koul , Heiko Stuebner , Frank Wang , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Andy Yan , Dmitry Baryshkov , Yubing Zhang , Alexey Charkov , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, devicetree@vger.kernel.org References: <20260428-rockchip-usbdp-cleanup-v4-0-7775671ece22@collabora.com> <20260428-rockchip-usbdp-cleanup-v4-7-7775671ece22@collabora.com> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20260428-rockchip-usbdp-cleanup-v4-7-7775671ece22@collabora.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/28/26 18:13, Sebastian Reichel wrote: > From: Zhang Yubing > > Implement support for using just a single DisplayPort line. > > Signed-off-by: Zhang Yubing > Signed-off-by: Sebastian Reichel > --- > drivers/phy/rockchip/phy-rockchip-usbdp.c | 61 +++++++++++++------------------ > 1 file changed, 25 insertions(+), 36 deletions(-) > > diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c > index febc148a754e..bf8394174294 100644 > --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c > +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c > @@ -193,6 +193,7 @@ struct rk_udphy { > int id; > > bool dp_in_use; > + int dp_lanes; > > /* PHY const config */ > const struct rk_udphy_cfg *cfgs; > @@ -537,6 +538,13 @@ static void rk_udphy_usb_bvalid_enable(struct rk_udphy *udphy, u8 enable) > * <0 1> dpln0 dpln1 usbrx usbtx > * <2 3> usbrx usbtx dpln0 dpln1 > * --------------------------------------------------------------------------- > + * if 1 lane for dp function, 2 lane for usb function, define rockchip,dp-lane-mux = ; > + * sample as follow: > + * --------------------------------------------------------------------------- > + * B11-B10 A2-A3 A11-A10 B2-B3 > + * rockchip,dp-lane-mux ln0(tx/rx) ln1(tx) ln2(tx/rx) ln3(tx) > + * <0> dpln0 \ usbrx usbtx > + * --------------------------------------------------------------------------- > */ > > static void rk_udphy_dplane_select(struct rk_udphy *udphy) > @@ -544,18 +552,18 @@ static void rk_udphy_dplane_select(struct rk_udphy *udphy) > const struct rk_udphy_cfg *cfg = udphy->cfgs; > u32 value = 0; > > - switch (udphy->mode) { > - case UDPHY_MODE_DP: > - value |= 2 << udphy->dp_lane_sel[2] * 2; > + switch (udphy->dp_lanes) { > + case 4: > value |= 3 << udphy->dp_lane_sel[3] * 2; > + value |= 2 << udphy->dp_lane_sel[2] * 2; > fallthrough; > > - case UDPHY_MODE_DP_USB: > - value |= 0 << udphy->dp_lane_sel[0] * 2; > + case 2: > value |= 1 << udphy->dp_lane_sel[1] * 2; > - break; > + fallthrough; > > - case UDPHY_MODE_USB: > + case 1: > + value |= 0 << udphy->dp_lane_sel[0] * 2; What's the point of keeping this no-op calculation ? > break; > > default: > @@ -568,28 +576,6 @@ static void rk_udphy_dplane_select(struct rk_udphy *udphy) > FIELD_PREP(DP_AUX_DOUT_SEL, udphy->dp_aux_dout_sel) | value); > } > > -static int rk_udphy_dplane_get(struct rk_udphy *udphy) > -{ > - int dp_lanes; > - > - switch (udphy->mode) { > - case UDPHY_MODE_DP: > - dp_lanes = 4; > - break; > - > - case UDPHY_MODE_DP_USB: > - dp_lanes = 2; > - break; > - > - case UDPHY_MODE_USB: > - default: > - dp_lanes = 0; > - break; > - } > - > - return dp_lanes; > -} > - > static void rk_udphy_dplane_enable(struct rk_udphy *udphy, int dp_lanes) > { > u32 val = 0; > @@ -659,6 +645,7 @@ static void rk_udphy_set_typec_default_mapping(struct rk_udphy *udphy) > } > > rk_udphy_mode_set(udphy, UDPHY_MODE_DP_USB); > + udphy->dp_lanes = 2; > } > > static int rk_udphy_orien_sw_set(struct typec_switch_dev *sw, > @@ -897,7 +884,7 @@ static int rk_udphy_parse_lane_mux_data(struct rk_udphy *udphy) > return 0; > } > > - if (num_lanes != 2 && num_lanes != 4) > + if (num_lanes != 1 && num_lanes != 2 && num_lanes != 4) > return dev_err_probe(udphy->dev, -EINVAL, > "invalid number of lane mux\n"); > > @@ -923,7 +910,8 @@ static int rk_udphy_parse_lane_mux_data(struct rk_udphy *udphy) > } > > udphy->mode = UDPHY_MODE_DP; > - if (num_lanes == 2) { > + udphy->dp_lanes = num_lanes; > + if (num_lanes == 1 || num_lanes == 2) { > udphy->mode |= UDPHY_MODE_USB; > udphy->flip = (udphy->lane_mux_sel[0] == PHY_LANE_MUX_DP); > } > @@ -1074,18 +1062,17 @@ static int rk_udphy_dp_phy_exit(struct phy *phy) > static int rk_udphy_dp_phy_power_on(struct phy *phy) > { > struct rk_udphy *udphy = phy_get_drvdata(phy); > - int ret, dp_lanes; > + int ret; > > mutex_lock(&udphy->mutex); > > - dp_lanes = rk_udphy_dplane_get(udphy); > - phy_set_bus_width(phy, dp_lanes); > + phy_set_bus_width(phy, udphy->dp_lanes); > > ret = rk_udphy_power_on(udphy, UDPHY_MODE_DP); > if (ret) > goto unlock; > > - rk_udphy_dplane_enable(udphy, dp_lanes); > + rk_udphy_dplane_enable(udphy, udphy->dp_lanes); > > rk_udphy_dplane_select(udphy); > > @@ -1365,6 +1352,7 @@ static int rk_udphy_typec_mux_set(struct typec_mux_dev *mux, > udphy->lane_mux_sel[2] = PHY_LANE_MUX_DP; > udphy->lane_mux_sel[3] = PHY_LANE_MUX_DP; > mode = UDPHY_MODE_DP; > + udphy->dp_lanes = 4; > break; > > case TYPEC_DP_STATE_D: > @@ -1381,6 +1369,7 @@ static int rk_udphy_typec_mux_set(struct typec_mux_dev *mux, > udphy->lane_mux_sel[3] = PHY_LANE_MUX_DP; > } > mode = UDPHY_MODE_DP_USB; > + udphy->dp_lanes = 2; > break; > } > > @@ -1529,7 +1518,7 @@ static int rk_udphy_probe(struct platform_device *pdev) > ret = PTR_ERR(udphy->phy_dp); > return dev_err_probe(dev, ret, "failed to create DP phy\n"); > } > - phy_set_bus_width(udphy->phy_dp, rk_udphy_dplane_get(udphy)); > + phy_set_bus_width(udphy->phy_dp, udphy->dp_lanes); > udphy->phy_dp->attrs.max_link_rate = 8100; > phy_set_drvdata(udphy->phy_dp, udphy); > >