From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (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 4B86236F411 for ; Mon, 13 Jul 2026 21:58:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783979912; cv=none; b=XS4UamvP3lL629R0AcSc8hYVK5Doq3DDoP2n26oBZsNZzbaazDG2z77mdhqkvqDd1Cmz3ou20BuNSuJsC++olUEIUZj4+Y3uAYVNwD2MLmLFamxSKS6TsRk0CRurBcefgEyCsBnAS+nhF9h6Kh1PCqT7p/vwNJdEOBXEOMtY60A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783979912; c=relaxed/simple; bh=YrpLPHBD1J0GQmK89CSL4Gy6M2t6Tszp23YYmEbriXg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sYAXjPc6AtHC9baPs8hq19cb/rUfREu8ZM2pyt0/m6CqJgC7QdMSEdwpLsg/lIkGbqh6eC0SaDp/qI+isoXKafUG576FQ6q/5WZTpaBmz57BC0Rx0cyj+EIRvewipSslx2lgTMsfg+EGK2NBcHcFlSEuSLeJRhi/mctOFhgW5m4= 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=FLJoZXDs; arc=none smtp.client-ip=209.85.215.175 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="FLJoZXDs" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-ca12086c06eso3060864a12.0 for ; Mon, 13 Jul 2026 14:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783979910; x=1784584710; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FTIRIedZIUsEUdvn5iYSlLCj+0D+t4h6dGSrNv3pQhE=; b=FLJoZXDsHXormQvcGyNUwHqCd2us6Mc0xgZbuXQzgR04iaGtAX7mC06+dPiq4lYrB2 s6y2QnIDQarcKFE+B7ttPILoH24AGykVYxsNWtaBlPpz4zlKBwCNP0NrcwuTuFonAONa CmgMtlh9lnJfTU+kB7Q7gsRPFbgUNvvucEMzXdTU+dPK+TQi94z1h8gyl4vET0Qrpwbv PgDuR2U2yTtbghqNRSpCuvtarln1DPvYE7UOsQd1BGH3UsqPTSydlbvxUR5RrcCsMgTX SJTbXkeBIX83U4P8kQYKVwBmobZzdm3NMrxSTpRENylni86CQhNHTm/aDx+AEd+4SZ+c LuwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783979910; x=1784584710; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=FTIRIedZIUsEUdvn5iYSlLCj+0D+t4h6dGSrNv3pQhE=; b=DxO8W/VCh4phvPpdHvnleezAuysrOn38sj7e0MNIMqFRPc4X/dfTtNOxh6UBaMSFWw s8FI+LNClc0jgqohww8NdP3CpWwt2mS06iIZWA0mZQkJ2E2ZQQrPfavlkqViiDkU5Nr/ In08mZAX08zy6VO26weeNGq8lhxsMyLdJYUzQU/XuuOwkTMF7a69XAO4YWfiQcqQCG+R +1oKM4ZMy2GFCDYyPh1KZkRvItSIcx3n+R1ThZAKJk1MAa66/9ujDQRYmsKGsVFSZkYp EUkIpj30OiS2kIz+ekImwwNjBs6Y9LFoRuN8OxvRHvYkEjuQ23MCTcP149DI0QHyonA9 xnhA== X-Forwarded-Encrypted: i=1; AHgh+Rqj2F/U9jnpBNDva9cG1dx6KfGNani0rUeVk65LYG86qmMfMCuXRs5khAxM4W2Fonw2qLCNgaI+7r1oVOk=@vger.kernel.org X-Gm-Message-State: AOJu0YzWF8cjvmZgwagl/67ejx8YvG1aIIBq7Nh55jWZDk4LYBrKWfMR 7E4B7mwO94tpEGuiFJDElS2LqYnhq/pFfJCZKKGNkwBWTaiUoTC9UXU4ZFbxhQ== X-Gm-Gg: AfdE7clnUideMuRe5tCLm5ylBwq0dXWKFgVtqKVS6R59ZWOwFzDjD/4SBQfKZ1OaPm7 rvQOy5uN4B0iARE3UT7WfnbNuWehaLJsW392lKGe59ZTufedRRiseEm/OtEQQs9Zud/hrurv3DB kfNs5Msc/T9APlGvt0vXH5IXweVajgS9+Bopl7/zWaQNNpeD4MaqbmlcwWsETRyo1qFf+4/s2Iz ZQkHXZ+s1ZFrW0waQzC/fv6utfGeURxlxkO9Zp5D2WjlUzV4aZAKf16k54H4gxDgFbxC3zxw8z6 QgFD4PGJOkkoAxqovJmDskEBft6FlLGf9s2oOhLKMx7KxMgOcZQ1ptz67+NBo23UWbGdp1JZnl9 oyV1BFYydiRHNafW78YchkJQ+1NWAnSnGgxzghmXnAyXBaunB3g+oE/0muJesMNO2DD0HoJqOpf ynkUzFQ/G8GtfhWSivqtSYfXyo1hjN5EA0SPrxiAk1v9D15AT5f7Ve1KvEtv7IgE7J7/9+2pWxH qmH X-Received: by 2002:a05:6a20:5491:b0:3a0:b781:4c78 with SMTP id adf61e73a8af0-3c11003090dmr14016770637.15.1783979909685; Mon, 13 Jul 2026 14:58:29 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:e15f:5d5f:580b:f2e9]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b8a5992c9sm28371487c88.4.2026.07.13.14.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 14:58:28 -0700 (PDT) From: Dmitry Torokhov Date: Mon, 13 Jul 2026 14:58:22 -0700 Subject: [PATCH v2 1/3] bcma: gpio: Add and register software node for GPIO controller 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: <20260713-b4-bcm47xx-swnode-v2-1-2b879f0c193c@gmail.com> References: <20260713-b4-bcm47xx-swnode-v2-0-2b879f0c193c@gmail.com> In-Reply-To: <20260713-b4-bcm47xx-swnode-v2-0-2b879f0c193c@gmail.com> To: =?utf-8?q?Rafa=C5=82_Mi=C5=82ecki?= , Michael Buesch , Hauke Mehrtens , Thomas Bogendoerfer Cc: Bartosz Golaszewski , Arnd Bergmann , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org X-Mailer: b4 0.16-dev-b242f We want to convert the legacy gpio-keys platform device on BCM47XX boards to use software nodes. To do this properly and allow referencing the GPIO controller by address rather than relying on name-based matching (which is being removed from the gpiolib core), we need to associate the GPIO controller with a software node. Introduce bcma_gpio_swnode, register it if the device does not already have a firmware node, and associate it with the gpio_chip. Assisted-by: Antigravity:gemini-3.5-flash Signed-off-by: Dmitry Torokhov --- drivers/bcma/driver_gpio.c | 43 +++++++++++++++++++++++++++++++++++++------ include/linux/bcma/bcma.h | 2 ++ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c index 658c7e2ac8bf..ea45222f2fa0 100644 --- a/drivers/bcma/driver_gpio.c +++ b/drivers/bcma/driver_gpio.c @@ -19,6 +19,11 @@ #define BCMA_GPIO_MAX_PINS 32 +const struct software_node bcma_gpio_swnode = { + .name = "bcma-gpio", +}; +EXPORT_SYMBOL_GPL(bcma_gpio_swnode); + static int bcma_gpio_get_value(struct gpio_chip *chip, unsigned gpio) { struct bcma_drv_cc *cc = gpiochip_get_data(chip); @@ -190,7 +195,20 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) chip->direction_input = bcma_gpio_direction_input; chip->direction_output = bcma_gpio_direction_output; chip->parent = bus->dev; - chip->fwnode = dev_fwnode(&cc->core->dev); + + /* + * Register software node only for the host SoC bus, unless there is + * already a firmware node assigned. There is only one SoC instance + * in the system, so there are no concerns with registration conflicts. + */ + if (bus->hosttype == BCMA_HOSTTYPE_SOC && !dev_fwnode(&cc->core->dev)) { + err = software_node_register(&bcma_gpio_swnode); + if (err) + return err; + chip->fwnode = software_node_fwnode(&bcma_gpio_swnode); + } else { + chip->fwnode = dev_fwnode(&cc->core->dev); + } switch (bus->chipinfo.id) { case BCMA_CHIP_ID_BCM4707: @@ -219,20 +237,33 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) err = bcma_gpio_irq_init(cc); if (err) - return err; + goto err_unregister_swnode; err = gpiochip_add_data(chip, cc); - if (err) { - bcma_gpio_irq_exit(cc); - return err; - } + if (err) + goto err_irq_exit; return 0; + +err_irq_exit: + bcma_gpio_irq_exit(cc); +err_unregister_swnode: + if (bus->hosttype == BCMA_HOSTTYPE_SOC && + chip->fwnode && is_software_node(chip->fwnode)) { + software_node_unregister(&bcma_gpio_swnode); + chip->fwnode = NULL; + } + return err; } int bcma_gpio_unregister(struct bcma_drv_cc *cc) { bcma_gpio_irq_exit(cc); gpiochip_remove(&cc->gpio); + if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC && + cc->gpio.fwnode && is_software_node(cc->gpio.fwnode)) { + software_node_unregister(&bcma_gpio_swnode); + cc->gpio.fwnode = NULL; + } return 0; } diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index f02cb3909375..17fc50190014 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -486,4 +486,6 @@ extern u32 bcma_core_dma_translation(struct bcma_device *core); extern unsigned int bcma_core_irq(struct bcma_device *core, int num); +extern const struct software_node bcma_gpio_swnode; + #endif /* LINUX_BCMA_H_ */ -- 2.55.0.795.g602f6c329a-goog