From nobody Thu Dec 25 06:46:21 2025 Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) (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 A1D80745EB for ; Mon, 22 Jan 2024 16:32:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705941167; cv=none; b=SsDHXjzFCourhIgwYVUdMkp3lkMv8/obJ6GuaV+hEO7R+30O1sLnC49FpcvqdmvBMbJVgeKIJVAp1ohj24+xIZz+ijc1TLqycc/mCnGiZcPzelQ9E6DQaLxTnOKt+4FpjmWgeog+YClH5puJ+RQwt/O+CgXkimoBnRwzsnD9VFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705941167; c=relaxed/simple; bh=daoJsQAfP2xBV0kNNJW/Stmycgsu9aQruTbKytRGKp8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tq9O4RKCn65p6k/XXmKzbLO/nVYNhVGYNHFpL+Jcgz0gVDxk9vG8sjgvw5EIoooqkXIHpkPib4CN5sdrmTuZM+MUvjoHC7v8w+5/B4QMfGok8gnr6Bg67vebaMFimLCpOl/OWv0IEq2lFihW4x/ZZJLFfCRdrsQIblR5cFffWHU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=IfhvQlpG; arc=none smtp.client-ip=95.215.58.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="IfhvQlpG" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1705941163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SaW0Gpay7iBfH7QtKRfcxFikX4DDF/x/sLLBI1Dwvao=; b=IfhvQlpGNlQH5yBLfh+N0DpfnsOJwHsPBE+HPFPkGI36lhsRVKljNc2gz732ufGYS1a8N/ Cp1np5uq5zTMjfcXhxUR5Q8HOnYcgFSem8OOOG6jd0ad3tj35dzAL+Lrj1rEARoUqnLRPB dcCzHGrWbN+29ww2QrD4poINOgtdrAI= From: Sui Jingfeng To: David Airlie Cc: Neil Armstrong , Maxime Ripard , Thomas Zimmermann , Daniel Vetter , Laurent Pinchart , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Sui Jingfeng Subject: [PATCH 5/5] drm-bridge: display-connector: Switch to use fwnode API Date: Tue, 23 Jan 2024 00:32:20 +0800 Message-Id: <20240122163220.110788-6-sui.jingfeng@linux.dev> In-Reply-To: <20240122163220.110788-1-sui.jingfeng@linux.dev> References: <20240122163220.110788-1-sui.jingfeng@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Sui Jingfeng Because API has wider coverage, it can be used on non-DT systems as well. Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/bridge/display-connector.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/b= ridge/display-connector.c index eb7e194e7735..2c3e54a458e8 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -243,8 +243,8 @@ static int display_connector_probe(struct platform_devi= ce *pdev) case DRM_MODE_CONNECTOR_DVII: { bool analog, digital; =20 - analog =3D of_property_read_bool(pdev->dev.of_node, "analog"); - digital =3D of_property_read_bool(pdev->dev.of_node, "digital"); + analog =3D fwnode_property_present(pdev->dev.fwnode, "analog"); + digital =3D fwnode_property_present(pdev->dev.fwnode, "digital"); if (analog && !digital) { conn->bridge.type =3D DRM_MODE_CONNECTOR_DVIA; } else if (!analog && digital) { @@ -261,8 +261,8 @@ static int display_connector_probe(struct platform_devi= ce *pdev) case DRM_MODE_CONNECTOR_HDMIA: { const char *hdmi_type; =20 - ret =3D of_property_read_string(pdev->dev.of_node, "type", - &hdmi_type); + ret =3D fwnode_property_read_string(pdev->dev.fwnode, "type", + &hdmi_type); if (ret < 0) { dev_err(&pdev->dev, "HDMI connector with no type\n"); return -EINVAL; @@ -292,7 +292,7 @@ static int display_connector_probe(struct platform_devi= ce *pdev) conn->bridge.interlace_allowed =3D true; =20 /* Get the optional connector label. */ - of_property_read_string(pdev->dev.of_node, "label", &label); + fwnode_property_read_string(pdev->dev.fwnode, "label", &label); =20 /* * Get the HPD GPIO for DVI, HDMI and DP connectors. If the GPIO can prov= ide @@ -330,12 +330,13 @@ static int display_connector_probe(struct platform_de= vice *pdev) if (type =3D=3D DRM_MODE_CONNECTOR_DVII || type =3D=3D DRM_MODE_CONNECTOR_HDMIA || type =3D=3D DRM_MODE_CONNECTOR_VGA) { - struct device_node *phandle; + struct fwnode_handle *fwnode; =20 - phandle =3D of_parse_phandle(pdev->dev.of_node, "ddc-i2c-bus", 0); - if (phandle) { - conn->bridge.ddc =3D of_get_i2c_adapter_by_node(phandle); - of_node_put(phandle); + fwnode =3D fwnode_find_reference(pdev->dev.fwnode, "ddc-i2c-bus", 0); + if (!IS_ERR_OR_NULL(fwnode)) { + dev_info(&pdev->dev, "has I2C bus property\n"); + conn->bridge.ddc =3D i2c_get_adapter_by_fwnode(fwnode); + fwnode_handle_put(fwnode); if (!conn->bridge.ddc) return -EPROBE_DEFER; } else { @@ -380,6 +381,7 @@ static int display_connector_probe(struct platform_devi= ce *pdev) =20 conn->bridge.funcs =3D &display_connector_bridge_funcs; conn->bridge.of_node =3D pdev->dev.of_node; + conn->bridge.fwnode =3D pdev->dev.fwnode; =20 if (conn->bridge.ddc) conn->bridge.ops |=3D DRM_BRIDGE_OP_EDID --=20 2.25.1