From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f44.google.com (mail-dl1-f44.google.com [74.125.82.44]) (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 355B42F39C2 for ; Tue, 28 Apr 2026 04:13:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777349613; cv=none; b=XiBpofYrCZ+5W3tKlmZ5TQFqZnAWIA+f8gPguFu4FnpjLstqzwk2Gr6qX+SlfiJvffHXepXIrirQJyzVOHRiCmMy5OU8RP6ZG4Jv1ZMNwKfvRiYSeSgiT4AaKJlEwSz8n3xhvZF7xx291o4rWQaf+N/CTtPBgmifh07FCXGJI5Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777349613; c=relaxed/simple; bh=5bT8UfJeArNZ+E8PNQQNQWB3DNVEm4aD+P+/IcmcuXI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ACCkgDFPGW8SyzfNUR5duVXEFIfe6/1ZjO36gSLS/s5f6SQBhZnXVyVyJ9IH/OobXIcrVxwAgsokgpw4POjjrxyrnuoCUUP0fyLuerTyuDGsBI6egFW2aHy59yySLpEIsxK1A1coRzoPid5BHcZ5NNsw8RK6fYjvCFVHbjYJySo= 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=AxyvAyd3; arc=none smtp.client-ip=74.125.82.44 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="AxyvAyd3" Received: by mail-dl1-f44.google.com with SMTP id a92af1059eb24-12c8f9846c8so10877701c88.0 for ; Mon, 27 Apr 2026 21:13:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777349611; x=1777954411; 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=XlZ3nU9MUlD0wMKPFlp728owVuz8tYDhgx/NvIKq4VI=; b=AxyvAyd3vE640vR65LJRwSgQXZXW99xyHav9WJ1dQwn3QD/FWzFVP8bd5X9XKvXyzW udwC+KXIYfuywt0MEhmCS9iHxF6W8xpD0UjropD2eb3r2hCsLlyHBwswPFbY3zdva2Xg K1zpPy1+neyD7Kdr/VNGLdg2R8jU4P61euVUlb6/4dQwYqr0VKBsoGmFXK7gxA9hs5b7 HeH4BCMTtus62o/NZqhGipGJlZ9sIDJuBvuJce8MfSBKPm9t1UXpS84DBg1wa5JlhoET LjQi+mxOJMYFjHyMYuehllAzevQO7hX/Jk7mfON+KxKsoOmfPUN6NIW48qzFDkmfUDg3 FmIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777349611; x=1777954411; 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=XlZ3nU9MUlD0wMKPFlp728owVuz8tYDhgx/NvIKq4VI=; b=sraVSmJCaeoSGG+aaQyXyRaDfhsAjY3zAzffW6TrFAbxudAQKHpd6tPJKq7zJ7mD6r ONbqLvBAu3LZUcJc8bdgqQYsK5rVH2viO4lU8BEjFjJdgDIeLoMsFA5SDH82OUvNUz9Y geQQMuoyljR/NdslukgcAcbswAAjWHb6bz2vqqsYvxlqS9iOKZh2aH//e0Nzp2ymIRNo DjACWwA1Jg08dSAk/o3FHnXsWs1m6+hjpamTbxBoKhGi3VqfmAPl50vP4EYm8Ax+ACZQ 613FN/shfq+WKpsvUiJ9pN+/mG5+dtgtfvbhsk7nfwFQMzhB/vcsfLFkPN55Ui+7Q+qQ oX7A== X-Forwarded-Encrypted: i=1; AFNElJ8xEG4YAmo69aLrZnFH50KxljGJn5MW0P0/VZeWaHuYjJr/CQnD9QNBug6TAQ3TKODy6HxegeCsFiYQW0g=@vger.kernel.org X-Gm-Message-State: AOJu0YwntnqF3FgeCOX7CEm8Gj02Hs6DmnwjF1nrjle+WcWbxuKAOZnV cVGag71UZpdubiPsu28C2USabhkZ3cUl93/gXGmNwDtwownXjb4WlhDX X-Gm-Gg: AeBDieseZ9cj6+H3pbpo2Bto7gBCbXjol0PNuPtOwxHoaVCS3hRhV5NJejUxr23oGvJ 0X3VHAVLR6D+LsJlroEfsCx/X1RIFgL+96r6p6m1NpXeDTlio8Abf8HDrDqgCft4v+mwVoUzFZw WIcyjJ3mqj0Z5qpI7lF4vo8fKfmKH4TTEpi7krki5ulZyeGvmWsYRK8U2XJ4N+qCju8qbIly6BV ZsFVkk+EtOqjFPIlYNLu2McPdl5c61ED4iN08NfHEbN36SW8mpUIh2Azzixl7V7R7HfEpgAtikU yIC+Jyln1gnTHVovZoau9eXYLSbf3rsBysyC+1iknEctclPI+x68ApyYc4AUFzPVs2KKa95L9sY NFnpwXO4zijpJss3YZNo/ma1B8HQaQE2dG6Z5L8IZKSASWsgn3SVtg9B3ZjHAIZAqv2xAhpQZCf CAdKEX2uu/HX4FFcoCfOyebWfpySe3XOTf6Kwv+whJyfNSQdo+fQkEktwNxYLVSGHjG1yYHflRM +u1CRVJOdqrSMJm7Udwf8yVjw== X-Received: by 2002:a05:7022:23a8:b0:128:d219:e169 with SMTP id a92af1059eb24-12ddd98eee8mr693325c88.10.1777349611260; Mon, 27 Apr 2026 21:13:31 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:e678:f42a:a63c:516c]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12ddd9a64desm1843954c88.9.2026.04.27.21.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 21:13:29 -0700 (PDT) From: Dmitry Torokhov Date: Mon, 27 Apr 2026 21:13:23 -0700 Subject: [PATCH v4 1/2] mfd: rohm-bd71828: 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: <20260427-rohm-software-nodes-v4-1-ffeb5b0c4774@gmail.com> References: <20260427-rohm-software-nodes-v4-0-ffeb5b0c4774@gmail.com> In-Reply-To: <20260427-rohm-software-nodes-v4-0-ffeb5b0c4774@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-bd71828 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-bd71828.c | 122 +++++++++++++++++++++++++++++++++------------ 1 file changed, 90 insertions(+), 32 deletions(-) diff --git a/drivers/mfd/rohm-bd71828.c b/drivers/mfd/rohm-bd71828.c index a79f354bf5cb..a8bdb9c955a4 100644 --- a/drivers/mfd/rohm-bd71828.c +++ b/drivers/mfd/rohm-bd71828.c @@ -5,7 +5,8 @@ * ROHM BD718[15/28/79] and BD72720 PMIC driver */ -#include +#include +#include #include #include #include @@ -18,6 +19,7 @@ #include #include #include +#include #include #include @@ -37,19 +39,6 @@ }, \ } -static struct gpio_keys_button button = { - .code = KEY_POWER, - .gpio = -1, - .type = EV_KEY, - .wakeup = 1, -}; - -static const struct gpio_keys_platform_data bd71828_powerkey_data = { - .buttons = &button, - .nbuttons = 1, - .name = "bd71828-pwrkey", -}; - static const struct resource bd71815_rtc_irqs[] = { DEFINE_RES_IRQ_NAMED(BD71815_INT_RTC0, "bd70528-rtc-alm-0"), DEFINE_RES_IRQ_NAMED(BD71815_INT_RTC1, "bd70528-rtc-alm-1"), @@ -174,11 +163,8 @@ static struct mfd_cell bd71828_mfd_cells[] = { .name = "bd71828-rtc", .resources = bd71828_rtc_irqs, .num_resources = ARRAY_SIZE(bd71828_rtc_irqs), - }, { - .name = "gpio-keys", - .platform_data = &bd71828_powerkey_data, - .pdata_size = sizeof(bd71828_powerkey_data), }, + /* Power button is registered separately */ }; static const struct resource bd72720_power_irqs[] = { @@ -242,11 +228,8 @@ static const struct mfd_cell bd72720_mfd_cells[] = { .name = "bd72720-rtc", .resources = bd72720_rtc_irqs, .num_resources = ARRAY_SIZE(bd72720_rtc_irqs), - }, { - .name = "gpio-keys", - .platform_data = &bd71828_powerkey_data, - .pdata_size = sizeof(bd71828_powerkey_data), }, + /* Power button is registered separately */ }; static const struct regmap_range bd71815_volatile_ranges[] = { @@ -877,6 +860,80 @@ static int set_clk_mode(struct device *dev, struct regmap *regmap, OUT32K_MODE_CMOS); } +static int bd71828_i2c_register_swnodes(const struct software_node *nodes) +{ + const struct software_node * const node_group[] = { + &nodes[0], &nodes[1], NULL + }; + + return software_node_register_node_group(node_group); +} + +static void bd71828_i2c_unregister_swnodes(void *data) +{ + const struct software_node *nodes = data; + const struct software_node * const node_group[] = { + &nodes[0], &nodes[1], NULL + }; + + software_node_unregister_node_group(node_group); +} + +static int bd71828_i2c_register_pwrbutton(struct device *dev, int button_irq, + struct irq_domain *irq_domain) +{ + static const struct property_entry bd71828_powerkey_parent_props[] = { + PROPERTY_ENTRY_STRING("label", "bd71828-pwrkey"), + { } + }; + static const struct property_entry bd71828_powerkey_props[] = { + PROPERTY_ENTRY_U32("linux,code", KEY_POWER), + PROPERTY_ENTRY_BOOL("wakeup-source"), + { } + }; + const struct resource res[] = { + DEFINE_RES_IRQ_NAMED(button_irq, "bd71828-pwrkey"), + }; + struct mfd_cell gpio_keys_cell = { + .name = "gpio-keys", + .resources = res, + .num_resources = ARRAY_SIZE(res), + }; + struct software_node *nodes; + int error; + + nodes = devm_kcalloc(dev, 2, sizeof(*nodes), GFP_KERNEL); + if (!nodes) + return -ENOMEM; + + /* Node corresponding to gpio-keys device itself */ + nodes[0].name = devm_kasprintf(dev, GFP_KERNEL, "%s-power-key", dev_name(dev)); + if (!nodes[0].name) + return -ENOMEM; + + nodes[0].properties = bd71828_powerkey_parent_props; + + /* Node representing power button within gpio-keys device */ + nodes[1].parent = &nodes[0]; + nodes[1].properties = bd71828_powerkey_props; + + error = bd71828_i2c_register_swnodes(nodes); + if (error) + return error; + + error = devm_add_action_or_reset(dev, bd71828_i2c_unregister_swnodes, nodes); + if (error) + return error; + + gpio_keys_cell.swnode = &nodes[0]; + error = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, &gpio_keys_cell, 1, + NULL, 0, irq_domain); + if (error) + return dev_err_probe(dev, error, "Failed to create power button subdevice"); + + return 0; +} + static struct i2c_client *bd71828_dev; static void bd71828_power_off(void) { @@ -929,6 +986,7 @@ static struct regmap *bd72720_do_regmaps(struct i2c_client *i2c) static int bd71828_i2c_probe(struct i2c_client *i2c) { struct regmap_irq_chip_data *irq_data; + struct irq_domain *irq_domain; int ret; struct regmap *regmap = NULL; const struct regmap_config *regmap_config; @@ -1022,23 +1080,23 @@ static int bd71828_i2c_probe(struct i2c_client *i2c) "Failed to enable main level IRQs\n"); } } - if (button_irq) { - ret = regmap_irq_get_virq(irq_data, button_irq); - if (ret < 0) - return dev_err_probe(&i2c->dev, ret, - "Failed to get the power-key IRQ\n"); - - button.irq = ret; - } ret = set_clk_mode(&i2c->dev, regmap, clkmode_reg); if (ret) return 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)); + NULL, 0, irq_domain); if (ret) - return dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + return dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + + if (button_irq) { + ret = bd71828_i2c_register_pwrbutton(&i2c->dev, button_irq, irq_domain); + if (ret) + return ret; + } if (of_device_is_system_power_controller(i2c->dev.of_node) && chip_type == ROHM_CHIP_TYPE_BD71828) { -- 2.54.0.545.g6539524ca2-goog