From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 A02EB40E8E7 for ; Wed, 22 Jul 2026 20:00:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784750460; cv=none; b=nmx1BvRM4iRexEeKHhqIrV/2n7lJ5HeOI26FFT5S5TF5stgn4nsM0S/2mj1/Q22xjRh/00hO1z+k1sSOQBAeUbKkQOmb5p7l5hDZXjJ/Htmy4lEDLifc5xHTDUdOX6wGMaYfcMKQpx7h/mkfs9b7wXNxwPV5YtQdrHtlNRTTwtg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784750460; c=relaxed/simple; bh=+FNQ6n1imGfvLZaaJ0gYvCsqPfIIGV34Q1tWzoRYnzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dlPPtky2jDJ+on9F8yZFmR1KDGR1lOGK3CqTF5DtgLUjYiLeK++CqPaI1VSHciB0gwOaerEzPtuakX5hN26bp6IBAAM89VoSv7xuj/2n0UgohmeAVNXyfg86uHdoB9QJyvWCknaFiFE6Ubf8TIn3Nz0tR+DYMzEljdjEBvXWVFQ= 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=A4hm1FFV; arc=none smtp.client-ip=209.85.221.49 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="A4hm1FFV" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-47f633e6058so5375223f8f.0 for ; Wed, 22 Jul 2026 13:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784750452; x=1785355252; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=s29qcbdL5lOTVW/MJURIjCxSBqBwRZtgjPoJbiMT+oo=; b=A4hm1FFVlxZjKQPk5SqoGoSzFSUVJ65UVtgJ42apisEAW4Iv4kJcGcoQ7KT3g90NbS 0LKYGKCp30PmQZCZjfXRSMm5xr1TT81Y9crJlYkzlI+pDWVeIJC8vb468DkBQnbnHrY3 iij5VY4ZCfNC72gVMbbMuzFnNRNzxmpz1szRqPbCX66w20WVazVdemL8ogTCZK2TYQjS 1OZbgZ2cpIwqXbyx9+HeY+dKgVAU7rq0d6+1/c3VSPilyFsYQdiaa/qFO6uomYCMqsE0 Yxgu6yffdymqu806r/md0nhAd/8zHFngl69u83fviUKr8lrx66qVL3t7AZindhDG1fnz zDQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784750452; x=1785355252; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=s29qcbdL5lOTVW/MJURIjCxSBqBwRZtgjPoJbiMT+oo=; b=gQeL57c93GQ5NJuLlUh/8mCc4HgYbKWHHPOe9d1RafsrzxHxBN9u9zg0d1v/8FV95Q SMokD/avlXnT8z6hCuil132FNQ8YhjUK0UwqhxE/dXnBeReGz9xRH3JnY9plRFp0oz5x xVs0hFEE6rkQc4uP9YdBo/aDoNY4MthSIPjUG6i/CR6TbHoKielVMxU0739cBg6ltkVV 5bGHZUY/byLe+2kpwvQnNIBmZuGAI6sIPwTCNdcuxFAncEwtQtQMQ+si9XKs3Q3KKj6l hFLvGrjo16N1lUFhbZleePtNOkh1aAv3orpJ8+d3j05y7b/LPPWcx34ccLAbg6FLn7qp lpyA== X-Gm-Message-State: AOJu0YxP1sOtrLBUqwY+RxcFfvegBCvtw/qPI+wCoXNTDNyXKd2IALur XpXRF+kz/r1BKxh+JGCLwQW6heNCRYAVp4ymGQDldN4PKlFyWCo8pT07 X-Gm-Gg: AR+sD11xni787JVWSQvGE+HYRo6JCQ60w1Tg9qHTOm8V9uq1tY7OcHxnJF/0eNylmHb wXfjUTdZNXr3692qkhe7oIq12wglGCKJCHSq9ayy7WHqc7F/gVyU0oQStQ7016PMX0egbAhJvyQ YDrpsqnKBdqB79EFL4j1pqGDvUWXSA77wSI8fYZbkS0d4a/xf03Dwm04Id5buMDqDHL+ugay6rt Dkt0yFJFZmxw1VngILPz8jBzUMWtgLKhyqEBqw2iaRooN+HAVpP8mnzu1YBGHdof+FzCGpF96ER B+DBw4OyJtzLeQIswuvDHE1AT1mrD3kwUfwMl4G0279CZeL9nFv0lfiuo1WAubb2qDEIx5j0L0D 9NSgQTpLCWqDSAjx3dTdGwgxS+yzO773XefFdyQ16PDBhptF8rFWvYZiI1julSvDBVIiKA14KUL 4F9mQuTd44QFm2NpTl6LeUhpKsn+I= X-Received: by 2002:a05:6000:4282:b0:47f:7fda:6c7b with SMTP id ffacd0b85a97d-47f8d76ce8emr355468f8f.49.1784750451925; Wed, 22 Jul 2026 13:00:51 -0700 (PDT) Received: from antoniarch ([78.210.252.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f85c52fa9sm9532851f8f.20.2026.07.22.13.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 13:00:51 -0700 (PDT) From: Antoni Pokusinski To: alexandre.belloni@bootlin.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, Antoni Pokusinski Subject: [PATCH 5/6] rtc: abx80x: create abx80x_i2c_probe() Date: Wed, 22 Jul 2026 21:58:13 +0200 Message-ID: <20260722195814.298552-6-apokusinski01@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260722195814.298552-1-apokusinski01@gmail.com> References: <20260722195814.298552-1-apokusinski01@gmail.com> Precedence: bulk X-Mailing-List: linux-rtc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move the I2C-specific code from abx80x_probe() to the newly created function. This is a preparation for introducing the support for ABX81X RTCs which use SPI interface. Signed-off-by: Antoni Pokusinski --- drivers/rtc/rtc-abx80x.c | 165 ++++++++++++++++++++++++--------------- 1 file changed, 102 insertions(+), 63 deletions(-) diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c index 7761cb353994..6e0c14695bdf 100644 --- a/drivers/rtc/rtc-abx80x.c +++ b/drivers/rtc/rtc-abx80x.c @@ -740,70 +740,35 @@ static const struct regmap_access_table abx80x_write_table = { .n_no_ranges = ARRAY_SIZE(abx80x_no_write_ranges), }; -static const struct regmap_config abx80x_regmap_config_i2c = { - .reg_bits = 8, - .val_bits = 8, - .max_register = ABX8XX_SRAM_BASE + ABX8XX_SRAM_WIN_SIZE - 1, - - .rd_table = &abx80x_read_table, - .wr_table = &abx80x_write_table, -}; - -static const struct i2c_device_id abx80x_id[] = { - { .name = "abx80x", .driver_data = ABX80X }, - { .name = "ab0801", .driver_data = AB0801 }, - { .name = "ab0803", .driver_data = AB0803 }, - { .name = "ab0804", .driver_data = AB0804 }, - { .name = "ab0805", .driver_data = AB0805 }, - { .name = "ab1801", .driver_data = AB1801 }, - { .name = "ab1803", .driver_data = AB1803 }, - { .name = "ab1804", .driver_data = AB1804 }, - { .name = "ab1805", .driver_data = AB1805 }, - { .name = "rv1805", .driver_data = RV1805 }, - { } -}; -MODULE_DEVICE_TABLE(i2c, abx80x_id); - -static int abx80x_probe(struct i2c_client *client) +static int abx80x_probe(struct device *dev, struct regmap *regmap, int irq, + struct device_node *np, unsigned int part) { - struct regmap *regmap; - struct device_node *np = client->dev.of_node; struct abx80x_priv *priv; int i, err, trickle_cfg = -EINVAL; char buf[7]; - unsigned int part = (uintptr_t)i2c_get_match_data(client); unsigned int partnumber; unsigned int majrev, minrev; unsigned int lot; unsigned int wafer; unsigned int uid; - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) - return -ENODEV; - - regmap = devm_regmap_init_i2c(client, &abx80x_regmap_config_i2c); - if (IS_ERR(regmap)) { - dev_err(&client->dev, "Unable to allocate regmap\n"); - return -EIO; - } - - priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL); + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (priv == NULL) return -ENOMEM; - priv->rtc = devm_rtc_allocate_device(&client->dev); + priv->rtc = devm_rtc_allocate_device(dev); if (IS_ERR(priv->rtc)) return PTR_ERR(priv->rtc); priv->rtc->ops = &abx80x_rtc_ops; - priv->irq = client->irq; + priv->irq = irq; priv->regmap = regmap; - dev_set_drvdata(&client->dev, priv); + dev_set_drvdata(dev, priv); err = regmap_bulk_read(regmap, ABX8XX_REG_ID0, buf, sizeof(buf)); if (err < 0) { - dev_err(&client->dev, "Unable to read partnumber\n"); + dev_err(dev, "Unable to read partnumber\n"); return -EIO; } @@ -813,14 +778,14 @@ static int abx80x_probe(struct i2c_client *client) lot = ((buf[4] & 0x80) << 2) | ((buf[6] & 0x80) << 1) | buf[3]; uid = ((buf[4] & 0x7f) << 8) | buf[5]; wafer = (buf[6] & 0x7c) >> 2; - dev_info(&client->dev, "model %04x, revision %u.%u, lot %x, wafer %x, uid %x\n", + dev_info(dev, "model %04x, revision %u.%u, lot %x, wafer %x, uid %x\n", partnumber, majrev, minrev, lot, wafer, uid); err = regmap_update_bits(regmap, ABX8XX_REG_CTRL1, ABX8XX_CTRL_12_24 | ABX8XX_CTRL_ARST | ABX8XX_CTRL_WRITE, ABX8XX_CTRL_WRITE); if (err < 0) { - dev_err(&client->dev, "Unable to write control register\n"); + dev_err(dev, "Unable to write control register\n"); return -EIO; } @@ -835,7 +800,7 @@ static int abx80x_probe(struct i2c_client *client) err = regmap_update_bits(regmap, ABX8XX_REG_CTRL2, ABX8XX_CTRL2_RSVD, 0); if (err < 0) { - dev_err(&client->dev, "Unable to write control2 register\n"); + dev_err(dev, "Unable to write control2 register\n"); return -EIO; } @@ -843,7 +808,7 @@ static int abx80x_probe(struct i2c_client *client) * Write the configuration key register to enable access to * the config2 register */ - if (abx80x_write_config_key(&client->dev, ABX8XX_CFG_KEY_MISC) < 0) + if (abx80x_write_config_key(dev, ABX8XX_CFG_KEY_MISC) < 0) return -EIO; /* @@ -855,7 +820,7 @@ static int abx80x_probe(struct i2c_client *client) ABX8XX_OUT_CTRL_EXDS, ABX8XX_OUT_CTRL_EXDS); if (err < 0) { - dev_err(&client->dev, + dev_err(dev, "Unable to write output control register\n"); return -EIO; } @@ -867,26 +832,24 @@ static int abx80x_probe(struct i2c_client *client) if (partnumber == abx80x_caps[i].pn) break; if (abx80x_caps[i].pn == 0) { - dev_err(&client->dev, "Unknown part: %04x\n", - partnumber); + dev_err(dev, "Unknown part: %04x\n", partnumber); return -EINVAL; } part = i; } if (partnumber != abx80x_caps[part].pn) { - dev_err(&client->dev, "partnumber mismatch %04x != %04x\n", + dev_err(dev, "partnumber mismatch %04x != %04x\n", partnumber, abx80x_caps[part].pn); return -EINVAL; } if (np && abx80x_caps[part].has_tc) - trickle_cfg = abx80x_dt_trickle_cfg(&client->dev); + trickle_cfg = abx80x_dt_trickle_cfg(dev); if (trickle_cfg > 0) { - dev_info(&client->dev, "Enabling trickle charger: %02x\n", - trickle_cfg); - abx80x_enable_trickle_charger(&client->dev, trickle_cfg); + dev_info(dev, "Enabling trickle charger: %02x\n", trickle_cfg); + abx80x_enable_trickle_charger(dev, trickle_cfg); } err = regmap_write(regmap, ABX8XX_REG_CD_TIMER_CTL, BIT(2)); @@ -894,7 +857,7 @@ static int abx80x_probe(struct i2c_client *client) return err; if (abx80x_caps[part].has_wdog) { - err = abx80x_setup_watchdog(&client->dev); + err = abx80x_setup_watchdog(dev); if (err) return err; } @@ -904,14 +867,14 @@ static int abx80x_probe(struct i2c_client *client) return err; if (priv->irq > 0) { - dev_info(&client->dev, "IRQ %d supplied\n", priv->irq); - err = devm_request_threaded_irq(&client->dev, priv->irq, NULL, + dev_info(dev, "IRQ %d supplied\n", priv->irq); + err = devm_request_threaded_irq(dev, priv->irq, NULL, abx80x_handle_irq, IRQF_SHARED | IRQF_ONESHOT, "abx8xx", - &client->dev); + dev); if (err) { - dev_err(&client->dev, "unable to request IRQ, alarms disabled\n"); + dev_err(dev, "unable to request IRQ, alarms disabled\n"); priv->irq = 0; } } @@ -920,14 +883,39 @@ static int abx80x_probe(struct i2c_client *client) err = rtc_add_group(priv->rtc, &rtc_calib_attr_group); if (err) { - dev_err(&client->dev, "Failed to create sysfs group: %d\n", - err); + dev_err(dev, "Failed to create sysfs group: %d\n", err); return err; } return devm_rtc_register_device(priv->rtc); } +#if IS_ENABLED(CONFIG_I2C) + +static const struct regmap_config abx80x_regmap_config_i2c = { + .reg_bits = 8, + .val_bits = 8, + .max_register = ABX8XX_SRAM_BASE + ABX8XX_SRAM_WIN_SIZE - 1, + + .rd_table = &abx80x_read_table, + .wr_table = &abx80x_write_table, +}; + +static const struct i2c_device_id abx80x_id[] = { + { .name = "abx80x", .driver_data = ABX80X }, + { .name = "ab0801", .driver_data = AB0801 }, + { .name = "ab0803", .driver_data = AB0803 }, + { .name = "ab0804", .driver_data = AB0804 }, + { .name = "ab0805", .driver_data = AB0805 }, + { .name = "ab1801", .driver_data = AB1801 }, + { .name = "ab1803", .driver_data = AB1803 }, + { .name = "ab1804", .driver_data = AB1804 }, + { .name = "ab1805", .driver_data = AB1805 }, + { .name = "rv1805", .driver_data = RV1805 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, abx80x_id); + #ifdef CONFIG_OF static const struct of_device_id abx80x_of_match[] = { { @@ -975,16 +963,67 @@ static const struct of_device_id abx80x_of_match[] = { MODULE_DEVICE_TABLE(of, abx80x_of_match); #endif +static int abx80x_i2c_probe(struct i2c_client *client) +{ + unsigned int part = (uintptr_t)i2c_get_match_data(client); + struct regmap *regmap; + + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) + return -ENODEV; + + regmap = devm_regmap_init_i2c(client, &abx80x_regmap_config_i2c); + if (IS_ERR(regmap)) { + dev_err(&client->dev, "Unable to allocate regmap\n"); + return -EIO; + } + + return abx80x_probe(&client->dev, regmap, client->irq, + client->dev.of_node, part); +} + static struct i2c_driver abx80x_driver = { .driver = { .name = "rtc-abx80x", .of_match_table = of_match_ptr(abx80x_of_match), }, - .probe = abx80x_probe, + .probe = abx80x_i2c_probe, .id_table = abx80x_id, }; -module_i2c_driver(abx80x_driver); +static int abx80x_register_driver(void) +{ + return i2c_add_driver(&abx80x_driver); +} + +static void abx80x_unregister_driver(void) +{ + i2c_del_driver(&abx80x_driver); +} + +#else + +static int abx80x_register_driver(void) +{ + return 0; +} + +static void abx80x_unregister_driver(void) +{ +} + +#endif /* IS_ENABLED(CONFIG_I2C) */ + +static int __init abx80x_init(void) +{ + return abx80x_register_driver(); +} +module_init(abx80x_init); + +static void __exit abx80x_exit(void) +{ + abx80x_unregister_driver(); +} +module_exit(abx80x_exit); MODULE_AUTHOR("Philippe De Muyter "); MODULE_AUTHOR("Alexandre Belloni "); -- 2.55.0