Commit a98688d2 authored by Linus Walleij's avatar Linus Walleij Committed by Lee Jones
Browse files

mfd: ab8500: Drop bm disable parameter 



Nobody is passing the module parameter to disable the
battery management portions so just drop this parameter.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent cb9e880a

drivers/mfd/ab8500-core.c

+6 −14
Original line number Diff line number Diff line
@@ -120,12 +120,6 @@ 
static DEFINE_SPINLOCK(on_stat_lock);

static u8 turn_on_stat_mask = 0xFF;

static u8 turn_on_stat_set;

static bool no_bm; /* No battery management */

/*

 * not really modular, but the easiest way to keep compat with existing

 * bootargs behaviour is to continue using module_param here.

 */

module_param(no_bm, bool, S_IRUGO);



#define AB9540_MODEM_CTRL2_REG			0x23

#define AB9540_MODEM_CTRL2_SWDBBRSTN_BIT	BIT(2)
@@ -1254,14 +1248,12 @@ static int ab8500_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	if (!no_bm) {

	/* Add battery management devices */

	ret = mfd_add_devices(ab8500->dev, 0, ab8500_bm_devs,

			      ARRAY_SIZE(ab8500_bm_devs), NULL,

			      0, ab8500->domain);

	if (ret)

		dev_err(ab8500->dev, "error adding bm devices\n");

	}



	if (((is_ab8505(ab8500) || is_ab9540(ab8500)) &&

			ab8500->chip_id >= AB8500_CUT2P0) || is_ab8540(ab8500))