From nobody Thu Dec 18 12:52:26 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 528DD28AAE6; Wed, 7 May 2025 13:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623286; cv=pass; b=p01U1YYcXtzPWMSRbLs2PEx6YWN8xbgrAYzIRknYDvsTRaUBP4fL5jb+xiihCegaGqQ3nSSdCe9MUqqjFYa5Bq3U/0/tIh469aIBqzE1Ga5i0aLex5WomE6cxtmE70f/rr1ZVamP58wF/5C1uq3m9ycn/mcKE5NEEiDqt03hDAY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623286; c=relaxed/simple; bh=uJMB3RmoFmNJqBV7ekNdfelHXQHZizUIa4ub+tYRYMc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VvWG3oBBLgYYSzaO/iEYQ30PVH0HdKldyIBkiQbok6r69eiiWOU8hWAoYVG+OxhB1a8TZY7/9wEpO0QuQwtiN5zFhohX9NIrY5kl/kJPevVphVsHswOZEHMUvb8dMzSJrm7y64vEgZxa6xOcbGwl7J9UMC7DddAflyV/sqREmq8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=MMrB5YH4; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="MMrB5YH4" ARC-Seal: i=1; a=rsa-sha256; t=1746623262; cv=none; d=zohomail.com; s=zohoarc; b=HdnFSLWhLu6H7HSSh83mU07cjLAxRclIi+UzVJ+UdF1xf2zTzP9u0D2KJbK2TjylO9LPKA7ShJmnRa/kThaROykiN2l80hJZmVTjtL0clxl2JiIq7knLTXPEszJ/cpqitY6e6MNNiN9AFtj8nkSrkKbmGCsoOAVglOPgichZOvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746623262; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=j1pxA+bc+vNKzjIaRT1KaTq/RuyMnrlK34dQ5cfd5BU=; b=Ptes6V5LO56MGZtXuccCUZDQL1cgzVmJ41LBRUHt+FjmzPPpahNJ4sJ9lMednd4rF9MOMgQ9QDOlI46c4tOwN8ds6xSGVGwaFWRe7Uqb6lpro+M9F+74U0hovIsUrDbSeqxU+sMiKDQgVCJ9mebcfCsuGIg/NlQh18/mSIoP6LQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1746623262; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=j1pxA+bc+vNKzjIaRT1KaTq/RuyMnrlK34dQ5cfd5BU=; b=MMrB5YH4SUdN6PCgMBoj9MyJjalxqRg4HAthoRQj1y9cR9FztjldERdypO0JoSr9 5gS/Ek2eQzHdDagLy3qFlrCtkpqgAcO9bHiJQlIdBsSoyDDOXKarUWy9z6l5QNVX4Go 0EEyDm3tac2uENhl3mYE8XKAR2iUGxQWI/lYj8xA= Received: by mx.zohomail.com with SMTPS id 1746623261487983.5963452814216; Wed, 7 May 2025 06:07:41 -0700 (PDT) From: Nicolas Frattaroli Date: Wed, 07 May 2025 15:07:22 +0200 Subject: [PATCH v3 2/4] phy: rockchip: usbdp: move orientation handling further down Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250507-rk3576-sige5-usb-v3-2-89bf5a614ccf@collabora.com> References: <20250507-rk3576-sige5-usb-v3-0-89bf5a614ccf@collabora.com> In-Reply-To: <20250507-rk3576-sige5-usb-v3-0-89bf5a614ccf@collabora.com> To: Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Kever Yang , Frank Wang Cc: Sebastian Reichel , kernel@collabora.com, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.2 The orientation handling code isn't referenced until very far down the driver code. Move it down some ways so it can later reference other driver functions without needing forward declarations. Signed-off-by: Nicolas Frattaroli --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 100 +++++++++++++++-----------= ---- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index c066cc0a7b4f10fc3cd8779323c369360893520d..fff54900feea601c8fe6bf4c712= 3dfebc5661a15 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -651,56 +651,6 @@ static void rk_udphy_set_typec_default_mapping(struct = rk_udphy *udphy) udphy->mode =3D UDPHY_MODE_DP_USB; } =20 -static int rk_udphy_orien_sw_set(struct typec_switch_dev *sw, - enum typec_orientation orien) -{ - struct rk_udphy *udphy =3D typec_switch_get_drvdata(sw); - - mutex_lock(&udphy->mutex); - - if (orien =3D=3D TYPEC_ORIENTATION_NONE) { - gpiod_set_value_cansleep(udphy->sbu1_dc_gpio, 0); - gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 0); - /* unattached */ - rk_udphy_usb_bvalid_enable(udphy, false); - goto unlock_ret; - } - - udphy->flip =3D (orien =3D=3D TYPEC_ORIENTATION_REVERSE) ? true : false; - rk_udphy_set_typec_default_mapping(udphy); - rk_udphy_usb_bvalid_enable(udphy, true); - -unlock_ret: - mutex_unlock(&udphy->mutex); - return 0; -} - -static void rk_udphy_orien_switch_unregister(void *data) -{ - struct rk_udphy *udphy =3D data; - - typec_switch_unregister(udphy->sw); -} - -static int rk_udphy_setup_orien_switch(struct rk_udphy *udphy) -{ - struct typec_switch_desc sw_desc =3D { }; - - sw_desc.drvdata =3D udphy; - sw_desc.fwnode =3D dev_fwnode(udphy->dev); - sw_desc.set =3D rk_udphy_orien_sw_set; - - udphy->sw =3D typec_switch_register(udphy->dev, &sw_desc); - if (IS_ERR(udphy->sw)) { - dev_err(udphy->dev, "Error register typec orientation switch: %ld\n", - PTR_ERR(udphy->sw)); - return PTR_ERR(udphy->sw); - } - - return devm_add_action_or_reset(udphy->dev, - rk_udphy_orien_switch_unregister, udphy); -} - static int rk_udphy_refclk_set(struct rk_udphy *udphy) { unsigned long rate; @@ -1451,6 +1401,56 @@ static struct phy *rk_udphy_phy_xlate(struct device = *dev, const struct of_phandl return ERR_PTR(-EINVAL); } =20 +static int rk_udphy_orien_sw_set(struct typec_switch_dev *sw, + enum typec_orientation orien) +{ + struct rk_udphy *udphy =3D typec_switch_get_drvdata(sw); + + mutex_lock(&udphy->mutex); + + if (orien =3D=3D TYPEC_ORIENTATION_NONE) { + gpiod_set_value_cansleep(udphy->sbu1_dc_gpio, 0); + gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 0); + /* unattached */ + rk_udphy_usb_bvalid_enable(udphy, false); + goto unlock_ret; + } + + udphy->flip =3D (orien =3D=3D TYPEC_ORIENTATION_REVERSE) ? true : false; + rk_udphy_set_typec_default_mapping(udphy); + rk_udphy_usb_bvalid_enable(udphy, true); + +unlock_ret: + mutex_unlock(&udphy->mutex); + return 0; +} + +static void rk_udphy_orien_switch_unregister(void *data) +{ + struct rk_udphy *udphy =3D data; + + typec_switch_unregister(udphy->sw); +} + +static int rk_udphy_setup_orien_switch(struct rk_udphy *udphy) +{ + struct typec_switch_desc sw_desc =3D { }; + + sw_desc.drvdata =3D udphy; + sw_desc.fwnode =3D dev_fwnode(udphy->dev); + sw_desc.set =3D rk_udphy_orien_sw_set; + + udphy->sw =3D typec_switch_register(udphy->dev, &sw_desc); + if (IS_ERR(udphy->sw)) { + dev_err(udphy->dev, "Error register typec orientation switch: %ld\n", + PTR_ERR(udphy->sw)); + return PTR_ERR(udphy->sw); + } + + return devm_add_action_or_reset(udphy->dev, + rk_udphy_orien_switch_unregister, udphy); +} + static int rk_udphy_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; --=20 2.49.0