From nobody Mon Apr 6 12:13:36 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 644683DCD9F for ; Thu, 2 Apr 2026 12:54:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775134506; cv=none; b=G2VmzuH5zQwtK58WuSp9Ut1cWyXgEkvLOT3mvDLg3kK3M1aVOLM6D//OoWO5Ep4J4IX5U2jhe+yd0KxSHq8QssrDJyDG74xhIDRRkr3qkC1BTw/wWTOgUZCzceJ4iG23MprU+2DbxrMDfT9vYgtq282p4+es0fcFt+r7xMtoSuE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775134506; c=relaxed/simple; bh=l4lnny3dGBJZoHOBatk5qgjCf18AZd9xMDIK67fuBWk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QgPC5TC1IpLE6eXBXjXXepso/ynrG41biH8yrf1LjCIWV7z17sO5FYD6CLARgRv7WqL9+SlX/eJOEkW/HwEYmC6TxK6GQqhEdd0x2GkdLPCBpV5tIpETZjN3i4AvEOoecXQ4Weg45H4yPogGoQqehP/4IM8OJzfNvs3OgpnWafk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Gjy5tC9H; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZRbqAa7l; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Gjy5tC9H"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZRbqAa7l" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 632CCdCm1964880 for ; Thu, 2 Apr 2026 12:54:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= iM/iRe3Y9krYEM1ss3kFNB7NzrAjyV60b2tj+n+iAZU=; b=Gjy5tC9HSrvA4MBe ft7EyL8vxe85ZjKbVY2cC7FBFLVBxAs/u8oR3EWpZ4Jtb562VrkBB+ACGPv/hCkW C+5kNFh1NBq2jZN/KQr+OHx2qgxwPzRFwxHGkMLyFJi7WvlNtdtH+XsWbLD1GVt9 Re8qJc1OvAlsHGWWAamMs6vmnFlkhcOVygQiQk5/cybCxoojB0j0mqRKPAkaFpbk JUGNaQXxAcF3/y0qMFzWiEZhuEoZSYuxr8gwVADixo9XVMoAjDUt0eJ7ElJBuyZu CwL5GF3JKk8T6dVDAgLwJhgUX/aZLyp8vuS9WCJFk3oFsUcoJ9NqqozMU4sXxGU3 0079mA== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d9b9h38gt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 02 Apr 2026 12:54:55 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-5094ba09affso22181931cf.2 for ; Thu, 02 Apr 2026 05:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775134494; x=1775739294; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=iM/iRe3Y9krYEM1ss3kFNB7NzrAjyV60b2tj+n+iAZU=; b=ZRbqAa7lUEpayD57Igl2dXFVIE43Ti/FaSALIbp+u5OipNMC8HAXIgp8mp5LH+xV2u 6sz/6Ski6Fi9zz3MtuVI1LUZoGoXIMKFEmmIm9G5rniYtGyVx2L8jbNgGXQ6DEKd6c3o 6sSM4LecdySn9k8VGVK4KymdjVwYzrJ/5/5rk8nj68ItqdJEFSw012VApFqwx6Le05Cl 0EWsKr1owWQ0MeCRBNsBGh0QbTkdugRdUgpXtRCHbU0cM1ZFZjhDj9FPy0qaFcvzEIQ6 MSDfgQCqGbvkbyUne1hLM47ThKmCRAINpaPi0GRem1cIjIT5kHS1WbtiTCFNHllw9r8i iXxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775134494; x=1775739294; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iM/iRe3Y9krYEM1ss3kFNB7NzrAjyV60b2tj+n+iAZU=; b=jYgnhq6tcZiuda4to2VXl3NAPiHfrSmbFXPh6J9Zdp7ZvA2y+VKwhsbUgr0q+dfV+v Tm1AYrd+mvntAC/RXUDLq2PCWosWgXfSPWf/LBoS6Ewmw26GciS7S9I7gnsSA17QCwXh epjmwPf50CoWKkmcTMswJCyR5Bm4a7Vg4/tk2dBxl9dXLAJt4S3IkaQOMI4Gc6bNOgXh Xh7gCwbB08yWlnBxkmyUCPRQVB6GFhvZRKgFLbMNZTlcExuuGteanRAVzVyJQlAqF9ZA PKXX4QuTsRBq6jfk85fuMWww/hdZahpxD0glrToUEfE8Zn20FllKS5IWSZ1/BwojAIvi UqMg== X-Forwarded-Encrypted: i=1; AJvYcCXFt3lk9D1gt970usw14okkv6n+7CWfaYLj1wCF6owV+azD1e0DVeWdmZAWQJ/F0azFI0Itu8vMIvsoobs=@vger.kernel.org X-Gm-Message-State: AOJu0Yzf3c4kcE0iB++9Z8HPQc7n7BihqU/HJNAT6Ww52f0YDzOW5D8E FRXWGGGmbkVCinBiu5T4rmg6fneJPo+bu1rCkPWp7+1nq0joMiKcNfDqXB29k85x3+QYNJujPlX n9J+zNMlIZhl/b4u+LfLjIIZT5GWNUH1WJtajFV+W4keGsmczg6e3YacTWXQPRTFwx1E= X-Gm-Gg: ATEYQzzB1Xk0ZyY0jt2OewAdfP0E+/mEb20Ii2g2WW6k/14jf9sa/q4dtfPquXoo4zr qbhXTb7BphYnGPcdutbHBm5E20Hh1+IBK0qZ5gJrKJ/tXWiILQxNC4eHZqG0aTaaZUj05oW6T98 GuhJ+l9RI0HoCBw2JNwRBzLGhI/c2V0J4oj3+LSwCLP9WTQ13wZqq2+VnJzN0Y3WaK0Tyy1k1Of MZG0Dfh5ND1lifbuvYwonVEVfv5wRNEmp6mxdzPSFFI90eOoxwZZWNb4HwCN2N5BuPAHqrTNZ/p OPBSB/6Lt9VXr3Jm7SM9h5dRjzUmVvDA07sVbm27n30DEn79ag/aAx5SZFqlHpcd0iYm2hOQFIM h7hrWfusgklq6YMVnU1FRW6th1n9z0rCzxBKLqboGKSFk/IgJjB36 X-Received: by 2002:a05:622a:8c4:b0:509:61:b22 with SMTP id d75a77b69052e-50d3bdfce67mr102813181cf.57.1775134494000; Thu, 02 Apr 2026 05:54:54 -0700 (PDT) X-Received: by 2002:a05:622a:8c4:b0:509:61:b22 with SMTP id d75a77b69052e-50d3bdfce67mr102812851cf.57.1775134493581; Thu, 02 Apr 2026 05:54:53 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:4ff1:3e57:22ec:dadc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887e735532sm235790765e9.0.2026.04.02.05.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 05:54:52 -0700 (PDT) From: Bartosz Golaszewski Date: Thu, 02 Apr 2026 14:54:29 +0200 Subject: [PATCH v2 4/4] platform/x86: x86-android-tablets: enable fwnode matching of GPIO chips 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: <20260402-baytrail-real-swnode-v2-4-6f5054a4cc07@oss.qualcomm.com> References: <20260402-baytrail-real-swnode-v2-0-6f5054a4cc07@oss.qualcomm.com> In-Reply-To: <20260402-baytrail-real-swnode-v2-0-6f5054a4cc07@oss.qualcomm.com> To: Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Mika Westerberg , Andy Shevchenko , Linus Walleij , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Dmitry Torokhov , Len Brown Cc: linux-acpi@vger.kernel.org, driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, platform-driver-x86@vger.kernel.org, brgl@kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5641; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=l4lnny3dGBJZoHOBatk5qgjCf18AZd9xMDIK67fuBWk=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBpzmcSDJFevJiDAeVlynB8mr3GoSDutTpLPSkiz e/4bjE89PSJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCac5nEgAKCRAFnS7L/zaE w1vnD/9rZfMZ2QuxGkRgddz00Bqvn0zAJcdUasDuGcCPuP4CeV/PY+00l1VWHuhkhdujGGkeX7/ +9v1S5Htf3bM+YuVWITrs0Gv6er0+m6fv4RwUkPUz1NWTyrh1TChJ+abvmEfhp0cTeOBbcpIrBY gI8DJ8d+MGIl0aRWaj2kJm5alDN8NS0IbtXLabnZh52KHuqB0mQLstLgHsw13mnDtQdXoZRcMH2 lnWGI2vnj/IN3HNTJszaoznfzEkzk8e9bVTejROmslYLUUSUgm2HNhJ33OaGRiDiSMJEQd36qHv rG8suBE6nX/CQWMitTpEP7X2sR/COz+9iZwg+yT1Trq4+t2TfsBTUTSkMUiF39UcVQPIgaSQCV+ 2rSOasJKGEx7NbUi6f9XoD/Ut/beI549qYEWrxi1+UHLbsgnqqUS8J15f9NC2U05ynruz0xtTPo kQRhdnqesm4ftCZcFzn8666KmOaI22QQ5S1hgRyoG3vcd6qTR4ryjO78K5ysvOzlJNt+FTfWatS XenNDc846EDPJPHgFgiAC9Tv5ctleTUIHarEgimgatG6M88BX1qRv5YdiIAl5FTvrunIo9ST2wD 8jjbTxwHNqdYVzz2OUecmpL2OPeE4gXggVc4R3uosGasezJtGDFh6jjnuFGPifvcYwAA/G6R0nT 4acWO63D4oXa/Gg== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Authority-Analysis: v=2.4 cv=TqLrRTXh c=1 sm=1 tr=0 ts=69ce671f cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=6VCG6zWJw881NgsJBYMA:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-ORIG-GUID: 30yvp3D2G1pW8TYklvyHEifAsgco5H4A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDAyMDExNSBTYWx0ZWRfX3GCgNG1ljosD dlKA3r8girpAsq/rLlr8WrBvMsYMxwgVSt18tjHPw5lLjV1SlCwno0qnVYHR4um2Y5n5B2R2yjc zAJd0RD11eGxSNIprjQEBs6BquRBOnK3gpyXMEInHLjqfnviqLK2jd+40qPslV08cBn5TrAUI4C +T2CZj8PNnDosGwAbSGPBr4iDYRVK9gZ9sABGLBBen6IRfhAs/GdFrv1+LWYMUguFOOHLR37hUE /+PpJDkCvZ4YVq4zmGAbNZcbXs0hsOrriN2+kVExIx/Nly53tnJiqWGUHX3KQkfdt/Zr8EqLkto jhOnxDWdaSumaAvYa0+WfDF6LRc3Bxb2ZD1+EA1iiR6teOpjoqV06uTcBiyC2hbdzjTfuqtgVwY FW/6K+efzyo6tIhYAJdg5Yn/MC47x1pc7xwa3HwCrKa9M0Jj45/OP7tvQFuCbJmRi9mqCtnpOOp Yd5h4OB/MTfl6t0vAhg== X-Proofpoint-GUID: 30yvp3D2G1pW8TYklvyHEifAsgco5H4A X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-02_01,2026-04-02_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2604020115 In order to allow GPIOLIB to match cherryview and baytrail GPIO controllers by their firmware nodes instead of their names, we need to attach the - currently "dangling" - existing software nodes to their target devices dynamically. We deal with devices described in ACPI so set up a bus notifier waiting for the ADD events. We know the name of the device we're waiting for so match against it and - on match - assign the appropriate software node as the secondary firmware node of the underlying ACPI node. In case the event was emitted earlier than this driver's probe: also make sure the device was not added before. Scheduling fine-grained devres actions allows for proper teardown and unsetting of the secondary firmware nodes. Signed-off-by: Bartosz Golaszewski --- drivers/platform/x86/x86-android-tablets/core.c | 127 ++++++++++++++++++++= +++- 1 file changed, 124 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/plat= form/x86/x86-android-tablets/core.c index 021009e9085bec3db9c4daa1f6235600210a6099..9e6e8f272dfe16cda421b569802= 045c3d94fc0ab 100644 --- a/drivers/platform/x86/x86-android-tablets/core.c +++ b/drivers/platform/x86/x86-android-tablets/core.c @@ -13,10 +13,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -360,6 +362,124 @@ static const struct software_node *cherryview_gpiochi= p_node_group[] =3D { NULL }; =20 +struct auto_secondary_data { + struct notifier_block nb; + struct device *parent; +}; + +static void auto_secondary_unset(void *data) +{ + struct fwnode_handle *fwnode =3D data; + + fwnode->secondary =3D NULL; +} + +static int acpi_set_secondary_fwnode(struct device *parent, struct device = *dev, + const struct software_node *const swnode) +{ + struct acpi_device *device =3D to_acpi_device(dev); + struct fwnode_handle *fwnode; + int ret; + + fwnode =3D software_node_fwnode(swnode); + if (WARN_ON(!fwnode)) + return -ENOENT; + + fwnode->secondary =3D ERR_PTR(-ENODEV); + device->fwnode.secondary =3D fwnode; + + ret =3D devm_add_action_or_reset(parent, auto_secondary_unset, &device->f= wnode); + if (ret) + dev_err(parent, "Failed to schedule the unset action for secondary fwnod= e\n"); + + return ret; +} + +static int acpi_auto_secondary_notifier(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct auto_secondary_data *auto_sec =3D container_of(nb, struct auto_sec= ondary_data, nb); + const struct software_node *const *swnode; + struct device *dev =3D data; + int ret; + + switch (action) { + case BUS_NOTIFY_ADD_DEVICE: + for (swnode =3D gpiochip_node_group; *swnode; swnode++) { + if (strcmp((*swnode)->name, dev_name(dev)) =3D=3D 0) { + ret =3D acpi_set_secondary_fwnode(auto_sec->parent, dev, *swnode); + return ret ? NOTIFY_BAD : NOTIFY_OK; + } + } + break; + default: + break; + } + + return NOTIFY_DONE; +} + +static void auto_secondary_unregister_node_group(void *data) +{ + const struct software_node **nodes =3D data; + + software_node_unregister_node_group(nodes); +} + +static void auto_secondary_unregister_notifier(void *data) +{ + struct notifier_block *nb =3D data; + + bus_unregister_notifier(&acpi_bus_type, nb); +} + +static int auto_secondary_fwnode_init(struct device *parent) +{ + const struct software_node *const *swnode; + struct auto_secondary_data *data; + int ret; + + ret =3D software_node_register_node_group(gpiochip_node_group); + if (ret) + return ret; + + ret =3D devm_add_action_or_reset(parent, + auto_secondary_unregister_node_group, + gpiochip_node_group); + if (ret) + return ret; + + data =3D devm_kzalloc(parent, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->nb.notifier_call =3D acpi_auto_secondary_notifier; + data->parent =3D parent; + + ret =3D bus_register_notifier(&acpi_bus_type, &data->nb); + if (ret) + return ret; + + ret =3D devm_add_action_or_reset(parent, + auto_secondary_unregister_notifier, + &data->nb); + if (ret) + return ret; + + /* Device may have been already added. */ + for (swnode =3D gpiochip_node_group; *swnode; swnode++) { + struct device *dev __free(put_device) =3D + bus_find_device_by_name(&acpi_bus_type, NULL, (*swnode)->name); + if (dev) { + ret =3D acpi_set_secondary_fwnode(parent, dev, *swnode); + if (ret) + return ret; + } + } + + return 0; +} + static void x86_android_tablet_remove(struct platform_device *pdev) { int i; @@ -391,7 +511,6 @@ static void x86_android_tablet_remove(struct platform_d= evice *pdev) =20 software_node_unregister_node_group(gpio_button_swnodes); software_node_unregister_node_group(swnode_group); - software_node_unregister_node_group(gpiochip_node_group); } =20 static __init int x86_android_tablet_probe(struct platform_device *pdev) @@ -427,9 +546,11 @@ static __init int x86_android_tablet_probe(struct plat= form_device *pdev) break; } =20 - ret =3D software_node_register_node_group(gpiochip_node_group); - if (ret) + ret =3D auto_secondary_fwnode_init(&pdev->dev); + if (ret) { + x86_android_tablet_remove(pdev); return ret; + } =20 ret =3D software_node_register_node_group(dev_info->swnode_group); if (ret) { --=20 2.47.3