From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E5DC52512DE for ; Sun, 21 Sep 2025 23:30:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758497401; cv=none; b=M2ibopV64Q8W/WQFGWnnFUCvm4MqtJn7Ri+WcuvmlbzPVGWXJob5YJqm7YzdR+SAaTObazx9WuDnveCxqldjHZiK8E2HzqQfapxQtkhGpomTAzRNARvGWgomufVrBXoIPhXXDg4bfUc9RHlZ+BWDSPNSYZPCHW6ejK6yIvHebPA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758497401; c=relaxed/simple; bh=XouJ6O1G6ZSvMQwFa7wkigVRDoR32BtWV0QXd0gOb6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BeQl48sw2AoO3j1ngQP/lDcWIDeW5zq11FMq6hEEmye4fBnZ6qn8WKZjgoX9QXmQbEkjfQRYdzUI1pfeT0v44ibA+REj+t1tUMmjQ7jOU0Xsr9baE9aKpJjV4p+krMztuTRxpeeIXbTXqZz9wVn3sHWQKRzIX8uJ+nIlyBlhxnE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tmIDig3B; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tmIDig3B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC408C4CEE7; Sun, 21 Sep 2025 23:29:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758497400; bh=XouJ6O1G6ZSvMQwFa7wkigVRDoR32BtWV0QXd0gOb6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tmIDig3B2xvj6wFmuzQ9AevEdD25nhceOX8lzkoCi+h7uTUr90hlclZKLv89m+Ps+ qyY8NIzjP9Lo8bMLWaUkiWYFlGwHFahn5SbqSUWZu3H5vlFVK9/sA0Rt5SOlNJbyAT p1Yv4FCBwQ9dD1MF1vuEkHDYy5HIbsPO0qlo/RxFykJhIeg5qhj9/wDrg5hWkGRUPC YotRUjv4DiJ6V8N3wlHvww9niwJdhynk4afjA+SWXg3kYuXqFEduK5vPCO1J8iDgko BVv/pgwZkw0qorNcNFzrIU0W6HFPfvzUMvnS341XMCtIXJiQUsOliXqN8qQ8+vxQMJ ueK1X1gxbB7zg== From: Sasha Levin To: stable@vger.kernel.org Cc: Philipp Zabel , Johannes Berg , Sasha Levin Subject: [PATCH 6.1.y 1/2] net: rfkill: gpio: add DT support Date: Sun, 21 Sep 2025 19:29:57 -0400 Message-ID: <20250921232958.3084822-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025092155-evacuate-condition-525e@gregkh> References: <2025092155-evacuate-condition-525e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Philipp Zabel [ Upstream commit d64c732dfc9edcd57feb693c23162117737e426b ] Allow probing rfkill-gpio via device tree. This hooks up the already existing support that was started in commit 262c91ee5e52 ("net: rfkill: gpio: prepare for DT and ACPI support") via the "rfkill-gpio" compatible, with the "name" and "type" properties renamed to "label" and "radio-type", respectively, in the device tree case. Signed-off-by: Philipp Zabel Link: https://lore.kernel.org/r/20230102-rfkill-gpio-dt-v2-2-d1b83758c16d@pengutronix.de Signed-off-by: Johannes Berg Stable-dep-of: b6f56a44e4c1 ("net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer") Signed-off-by: Sasha Levin --- net/rfkill/rfkill-gpio.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 2df5bf240b64a..ecfb766c47d08 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -79,6 +79,8 @@ static int rfkill_gpio_probe(struct platform_device *pdev) { struct rfkill_gpio_data *rfkill; struct gpio_desc *gpio; + const char *name_property; + const char *type_property; const char *type_name; int ret; @@ -86,8 +88,15 @@ static int rfkill_gpio_probe(struct platform_device *pdev) if (!rfkill) return -ENOMEM; - device_property_read_string(&pdev->dev, "name", &rfkill->name); - device_property_read_string(&pdev->dev, "type", &type_name); + if (dev_of_node(&pdev->dev)) { + name_property = "label"; + type_property = "radio-type"; + } else { + name_property = "name"; + type_property = "type"; + } + device_property_read_string(&pdev->dev, name_property, &rfkill->name); + device_property_read_string(&pdev->dev, type_property, &type_name); if (!rfkill->name) rfkill->name = dev_name(&pdev->dev); @@ -169,12 +178,19 @@ static const struct acpi_device_id rfkill_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, rfkill_acpi_match); #endif +static const struct of_device_id rfkill_of_match[] __maybe_unused = { + { .compatible = "rfkill-gpio", }, + { }, +}; +MODULE_DEVICE_TABLE(of, rfkill_of_match); + static struct platform_driver rfkill_gpio_driver = { .probe = rfkill_gpio_probe, .remove = rfkill_gpio_remove, .driver = { .name = "rfkill_gpio", .acpi_match_table = ACPI_PTR(rfkill_acpi_match), + .of_match_table = of_match_ptr(rfkill_of_match), }, }; -- 2.51.0