Commit f4ed950a authored Jun 10, 2015 by Frans Klaver Committed by Sebastian Reichel Jun 10, 2015

sbs-battery: add option to always register battery

Commit a22b41a3 ("sbs-battery: Probe should try talking to the
device") introduced a step in probing the SBS battery, that tries to
talk to the device before actually registering it, saying:

this driver doesn't actually try talking to the device at probe
time, so if it's incorrectly configured in the device tree or
platform data (or if the battery has been removed from the system),
then probe will succeed and every access will sit there and time
out. The end result is a possibly laggy system that thinks it has a
battery but can never read status, which isn't very useful.

Which is of course reasonable. However, it is also very well possible
for a device to boot up on wall-power and be connected to a battery
later on. This is a scenario that the driver supported before said patch
was applied, and even easily achieved by booting up with the battery
attached and removing it later on. sbs-battery's 'present' sysfs file
can be used to determine if the device is available or not.

So with automated device detection lacking for now, in some cases it is
possible that one wants to register a battery, even if none are attached
at the moment. To facilitate this, add a module parameter that can be
used to configure forced loading module loading time. If set, the battery
will always be registered without checking the sanity of the connection.

Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

parent fe27e1df

drivers/power/sbs-battery.c

+15 −6

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <linux/interrupt.h>
		#include <linux/gpio.h>
		#include <linux/of.h>
		#include <linux/stat.h>

		#include <linux/power/sbs-battery.h>

		@@ -170,6 +171,7 @@ struct sbs_info {

		static char model_name[I2C_SMBUS_BLOCK_MAX + 1];
		static char manufacturer[I2C_SMBUS_BLOCK_MAX + 1];
		static bool force_load;

		static int sbs_read_word_data(struct i2c_client *client, u8 address)
		{
		@@ -885,15 +887,18 @@ static int sbs_probe(struct i2c_client *client,

		skip_gpio:
		/*
		* Before we register, we need to make sure we can actually talk
		* Before we register, we might need to make sure we can actually talk
		* to the battery.
		*/
		if (!force_load) {
		rc = sbs_read_word_data(client, sbs_data[REG_STATUS].addr);

		if (rc < 0) {
		dev_err(&client->dev, "%s: Failed to get device status\n",
		__func__);
		goto exit_psupply;
		}
		}

		chip->power_supply = power_supply_register(&client->dev, sbs_desc,
		&psy_cfg);
		@@ -991,3 +996,7 @@ module_i2c_driver(sbs_battery_driver);

		MODULE_DESCRIPTION("SBS battery monitor driver");
		MODULE_LICENSE("GPL");

		module_param(force_load, bool, S_IRUSR \| S_IRGRP \| S_IROTH);
		MODULE_PARM_DESC(force_load,
		"Attempt to load the driver even if no battery is connected");

Admin message