From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (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 91781400E0F for ; Thu, 11 Jun 2026 15:48:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781192915; cv=none; b=GKV/bbsyyh9eFv6UOL+w+ol/ktbN4ZAt7rESLlH+8vARo0KruyM9/4jIr7rJ6R6A9uX3tRqugXRFjhAkpPeGoIyA8+65E77suezEZiN08Sb02vGPHlOnEwWpuVhrBb8mXhCqIIM65bJWcLGFrjVruk12BccrD2c+GgnjTe9vlyc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781192915; c=relaxed/simple; bh=Lh7L2h/Knyh3RSfwZqkIZ1XNshlGMUTdSu1o2qAlzXg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FVhGUVE+sO1T1xz8ngo/PYmcvbxalhGy1ym+7+QYtjuafZRv8dR83pX5u8ynBIDDXWOMZ4LOKHWfkPOO0BTYd6xJV8sZU29ik/QHdUm7vPFovNyWxJUkmPUVUl4EADBOYrpT8YOb70hPEciI/SbczakC4WnHZYWe7SnG/VYDlb4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BXDif3DP; arc=none smtp.client-ip=74.125.82.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BXDif3DP" Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-307263ad0cbso51284eec.0 for ; Thu, 11 Jun 2026 08:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781192913; x=1781797713; 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=cHM9ksniuUhqTAVTpdb7IEp6BHP9lExgqgKDsZXSpKU=; b=BXDif3DPjodZso+iIyabhVdyd53D9QZEQh1urps37gl/WaPNIcEEXRW70FQcXlhL6q kR3eEnPa04uHcc2yPyvROvfv2as+uMJvBK6ABpUFgcLOBZVEa5QT5jPJoUeMYtx+fgFF y91GvUH0ABsu2gilJ/awnkmb/RMI6zsdD1OjO96URkfdHOUtsNRJ910wt0m72EPBSGRO lQVN47rLixBXgb8kKXxU8u4sur4GZTSWEJCfZhRytF9tshtFVNZDl/rPqwOJ+U98xKe1 /y2zRmZoTXy6IJk1MvWOngX/Rue4D1GvWM8ozxeY6LnNoBcwGlVZFZnOUMe8ushAQqq6 3zOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781192913; x=1781797713; 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=cHM9ksniuUhqTAVTpdb7IEp6BHP9lExgqgKDsZXSpKU=; b=cCadfInje73a+X0Nc/h/V8NotClOn7gsf/wLGP0QurmPJyg5vio5XU4ZtJTTRJDiD6 u3xWjHsl3cl//R+ypxz4MX8xVFqrOSZbG/K6QpvqdohbrjsALMZMYJpWiArmAHTwR9SF rZ7wNXvoV38xDXTTqCPYb9ul+zG2v3OV6w4ED8xKleqXUW2h3iPIvQCKHiyqMHKjMx8e Q06y2iYBY9+UX6Cab2cKU6cT3JNQ93pZTtWIIiSKt3p04ZJSPsCzXgs3gCtTFTlgbSd6 CxZ/GSHdCH2n1myGvyuPbtFh/4D3KQG4GsdJ7xCFacl++8P6+AeuiDvjPWI+pRA5dsDV tLVg== X-Forwarded-Encrypted: i=1; AFNElJ/7KYIS+AXwA4QpHVze7BXT/3DtD3Sd/LmByZQUbstu4l4jkX8UkYAaEVUS9AeREJpWUM1ofFV+NGQ7pOk=@vger.kernel.org X-Gm-Message-State: AOJu0YyTXhoEizKQsIoqRvYcSlRLFf/ekLw1PC3XB7pT8YvL0WyBiq17 hIU0hFRLusfUheXv758iq/k4U72tF+XIsMxnfsHw0bM9ZrtNGcMAf6kF X-Gm-Gg: Acq92OHUcpgEVN7gFg3bM4rF/k2CM6V0aYfdADA3ZGvov3ghfeEoogpb0t1k0VzYFxV /YydK4nTGUpWqM4UyV3WzA+utAMHa1FijblR56QyJuUl1ByWgCLXTvy19dt6snmaGaK5bM5lr9D ynctaVtdvMU3AEPwoUmgt3G7RdrIK8MwhjLw0hedebu95kakxE2UBGcsRrtRJ9Y7UfqWSsg592l LntvQHhAXeCHxMeJwr56Xqsm0v07UFot82T1qovO0BdzGDvuCYOO2hL+Aud00aF8IGsq9L0w6jf PiPDS+cuMllGov4r4zZEChHVsJtZXOYSC5W9WXt1bGOS3dEbeBbt500wSrN88OB+pxHtTIEKXpI 3VburdB3uglmukzJ+pKN1dOiAiIR/xTSnUm3L09llmbuwlaOZuRHx6UIHO/clxoTjeshYYXBtUk d4coETtq1xoPV6B3RYbK+5bIUMmP7cKK1RcKNnMBGY3xxEKZeqXKJHu7p/4YXSFdbm+KnMydIj+ LB0OoAYhEQbl5V2H+PILLQ/yA== X-Received: by 2002:a05:7300:6c25:b0:307:934e:da79 with SMTP id 5a478bee46e88-30804b769b7mr2834662eec.34.1781192912515; Thu, 11 Jun 2026 08:48:32 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:ae0e:e075:91c8:6570]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30806aa88a7sm2184492eec.0.2026.06.11.08.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 08:48:32 -0700 (PDT) From: Dmitry Torokhov Date: Thu, 11 Jun 2026 08:48:26 -0700 Subject: [PATCH v5 2/2] mfd: rohm-bd718x7: Use software nodes for gpio-keys 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: 7bit Message-Id: <20260611-rohm-software-nodes-v5-2-0244664a3b65@gmail.com> References: <20260611-rohm-software-nodes-v5-0-0244664a3b65@gmail.com> In-Reply-To: <20260611-rohm-software-nodes-v5-0-0244664a3b65@gmail.com> To: Matti Vaittinen , Lee Jones Cc: Arnd Bergmann , linux-kernel@vger.kernel.org X-Mailer: b4 0.16-dev-6911d Refactor the rohm-bd7182x7 MFD driver to use software nodes for instantiating the gpio-keys child device, replacing the old platform_data mechanism. The power key's properties are now defined using software nodes and property entries. The IRQ is passed as a resource attached to the platform device. This will allow dropping support for using platform data for configuring gpio-keys in the future. Signed-off-by: Dmitry Torokhov --- drivers/mfd/rohm-bd718x7.c | 123 +++++++++++++++++++++++++++++++++------------ 1 file changed, 90 insertions(+), 33 deletions(-) diff --git a/drivers/mfd/rohm-bd718x7.c b/drivers/mfd/rohm-bd718x7.c index ff714fd4f54d..be2acc429fe3 100644 --- a/drivers/mfd/rohm-bd718x7.c +++ b/drivers/mfd/rohm-bd718x7.c @@ -7,7 +7,8 @@ // Datasheet for BD71837MWV available from // https://www.rohm.com/datasheet/BD71837MWV/bd71837mwv-e -#include +#include +#include #include #include #include @@ -15,37 +16,16 @@ #include #include #include +#include #include #include -static struct gpio_keys_button button = { - .code = KEY_POWER, - .gpio = -1, - .type = EV_KEY, -}; - -static struct gpio_keys_platform_data bd718xx_powerkey_data = { - .buttons = &button, - .nbuttons = 1, - .name = "bd718xx-pwrkey", -}; - static struct mfd_cell bd71837_mfd_cells[] = { - { - .name = "gpio-keys", - .platform_data = &bd718xx_powerkey_data, - .pdata_size = sizeof(bd718xx_powerkey_data), - }, { .name = "bd71837-clk", }, { .name = "bd71837-pmic", }, }; static struct mfd_cell bd71847_mfd_cells[] = { - { - .name = "gpio-keys", - .platform_data = &bd718xx_powerkey_data, - .pdata_size = sizeof(bd718xx_powerkey_data), - }, { .name = "bd71847-clk", }, { .name = "bd71847-pmic", }, }; @@ -125,10 +105,89 @@ static int bd718xx_init_press_duration(struct regmap *regmap, return 0; } +static const struct property_entry bd718xx_powerkey_parent_props[] = { + PROPERTY_ENTRY_STRING("label", "bd718xx-pwrkey"), + { } +}; + +static const struct property_entry bd718xx_powerkey_props[] = { + PROPERTY_ENTRY_U32("linux,code", KEY_POWER), + { } +}; + +static const struct resource bd718xx_powerkey_resources[] = { + DEFINE_RES_IRQ_NAMED(BD718XX_INT_PWRBTN_S, "bd718xx-pwrkey"), +}; + +#define GPIO_KEYS 0 /* Node corresponding to gpio-keys device itself */ +#define PWRON_KEY 1 /* Node describing power button in gpio-keys */ + +static int bd718xx_i2c_register_swnodes(const struct software_node *nodes) +{ + const struct software_node * const node_group[] = { + &nodes[GPIO_KEYS], &nodes[PWRON_KEY], NULL + }; + + return software_node_register_node_group(node_group); +} + +static void bd718xx_i2c_unregister_swnodes(void *data) +{ + const struct software_node *nodes = data; + const struct software_node * const node_group[] = { + &nodes[GPIO_KEYS], &nodes[PWRON_KEY], NULL + }; + + software_node_unregister_node_group(node_group); +} + +static int bd718xx_i2c_register_pwrbutton(struct device *dev, + struct irq_domain *irq_domain) +{ + struct mfd_cell gpio_keys_cell = { + .name = "gpio-keys", + .resources = bd718xx_powerkey_resources, + .num_resources = ARRAY_SIZE(bd718xx_powerkey_resources), + }; + struct software_node *nodes; + int ret; + + nodes = devm_kcalloc(dev, 2, sizeof(*nodes), GFP_KERNEL); + if (!nodes) + return -ENOMEM; + + nodes[GPIO_KEYS].name = devm_kasprintf(dev, GFP_KERNEL, "%s-power-key", dev_name(dev)); + if (!nodes[GPIO_KEYS].name) + return -ENOMEM; + + nodes[GPIO_KEYS].properties = bd718xx_powerkey_parent_props; + + nodes[PWRON_KEY].parent = &nodes[GPIO_KEYS]; + nodes[PWRON_KEY].properties = bd718xx_powerkey_props; + + ret = bd718xx_i2c_register_swnodes(nodes); + if (ret) + return ret; + + ret = devm_add_action_or_reset(dev, bd718xx_i2c_unregister_swnodes, nodes); + if (ret) + return ret; + + gpio_keys_cell.swnode = &nodes[GPIO_KEYS]; + + ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, &gpio_keys_cell, 1, + NULL, 0, irq_domain); + if (ret) + return dev_err_probe(dev, ret, "Failed to register power-button"); + + return 0; +} + static int bd718xx_i2c_probe(struct i2c_client *i2c) { struct regmap *regmap; struct regmap_irq_chip_data *irq_data; + struct irq_domain *irq_domain; int ret; unsigned int chip_type; struct mfd_cell *mfd; @@ -169,20 +228,18 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c) if (ret) return ret; - ret = regmap_irq_get_virq(irq_data, BD718XX_INT_PWRBTN_S); - - if (ret < 0) - return dev_err_probe(&i2c->dev, ret, "Failed to get the IRQ\n"); - - button.irq = ret; + irq_domain = regmap_irq_get_domain(irq_data); ret = devm_mfd_add_devices(&i2c->dev, PLATFORM_DEVID_AUTO, - mfd, cells, NULL, 0, - regmap_irq_get_domain(irq_data)); + mfd, cells, NULL, 0, irq_domain); + if (ret) + return dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + + ret = bd718xx_i2c_register_pwrbutton(&i2c->dev, irq_domain); if (ret) - dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + return ret; - return ret; + return 0; } static const struct of_device_id bd718xx_of_match[] = { -- 2.54.0.1099.g489fc7bff1-goog