Commit 53207aa1 authored Mar 12, 2021 by Linus Walleij Committed by Lee Jones Mar 22, 2021

power: ab8500: Require device tree



The core AB8500 driver and the whole platform is completely
dependent on being probed from device tree so remove the
non-DT probe paths.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent a38fd874

drivers/power/supply/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -698,7 +698,7 @@ config BATTERY_GAUGE_LTC2941

		config AB8500_BM
		bool "AB8500 Battery Management Driver"
		depends on AB8500_CORE && AB8500_GPADC && (IIO = y)
		depends on AB8500_CORE && AB8500_GPADC && (IIO = y) && OF
		help
		Say Y to include support for AB8500 battery management.

drivers/power/supply/ab8500_btemp.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1008,13 +1008,11 @@ static int ab8500_btemp_probe(struct platform_device *pdev)
		}
		di->bm = plat;

		if (np) {
		ret = ab8500_bm_of_probe(dev, np, di->bm);
		if (ret) {
		dev_err(dev, "failed to get battery information\n");
		return ret;
		}
		}

		/* get parent data */
		di->dev = dev;

drivers/power/supply/ab8500_charger.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -3360,15 +3360,12 @@ static int ab8500_charger_probe(struct platform_device *pdev)
		}
		di->bm = plat;

		if (np) {
		ret = ab8500_bm_of_probe(dev, np, di->bm);
		if (ret) {
		dev_err(dev, "failed to get battery information\n");
		return ret;
		}
		di->autopower_cfg = of_property_read_bool(np, "autopower_cfg");
		} else
		di->autopower_cfg = false;

		/* get parent data */
		di->dev = dev;

drivers/power/supply/ab8500_fg.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -3043,13 +3043,11 @@ static int ab8500_fg_probe(struct platform_device *pdev)
		}
		di->bm = plat;

		if (np) {
		ret = ab8500_bm_of_probe(dev, np, di->bm);
		if (ret) {
		dev_err(dev, "failed to get battery information\n");
		return ret;
		}
		}

		mutex_init(&di->cc_lock);

drivers/power/supply/abx500_chargalg.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1997,13 +1997,11 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
		}
		di->bm = plat;

		if (np) {
		ret = ab8500_bm_of_probe(&pdev->dev, np, di->bm);
		if (ret) {
		dev_err(&pdev->dev, "failed to get battery information\n");
		return ret;
		}
		}

		/* get device struct and parent */
		di->dev = &pdev->dev;