summaryrefslogtreecommitdiff
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-04-19 10:50:42 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 13:54:25 +0200
commit4d3ab5ec205472c79a6efb4be6fdf4817f0405e2 (patch)
tree4530c323c0b833ff86aeb293f8e851bb96a9d846 /arch/arm/mach-u300
parentae87bb8ef751bf8a2b664cb2ea7cdd54affa14c0 (diff)
ARM: u300: set up board power from device tree
This adds support for setting up the board power from the device tree on the U300. We use a board-specific node in the device tree for the S365 board and bind a regulator for the board power to this node. Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/regulator.c42
1 files changed, 39 insertions, 3 deletions
diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c
index 9c53f01c62eb..8a67dc604576 100644
--- a/arch/arm/mach-u300/regulator.c
+++ b/arch/arm/mach-u300/regulator.c
@@ -10,9 +10,14 @@
#include <linux/device.h>
#include <linux/signal.h>
#include <linux/err.h>
+#include <linux/of.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/machine.h>
#include <linux/regulator/consumer.h>
/* Those are just for writing in syscon */
#include <linux/io.h>
+#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <mach/syscon.h>
@@ -47,13 +52,17 @@ void u300_pm_poweroff(void)
/*
* Hog the regulators needed to power up the board.
*/
-static int __init u300_init_boardpower(void)
+static int __init __u300_init_boardpower(struct platform_device *pdev)
{
int err;
u32 val;
pr_info("U300: setting up board power\n");
- main_power_15 = regulator_get(NULL, "vana15");
+ if (pdev)
+ main_power_15 = regulator_get(&pdev->dev, "vana15");
+ else
+ main_power_15 = regulator_get(NULL, "vana15");
+
if (IS_ERR(main_power_15)) {
pr_err("could not get vana15");
return PTR_ERR(main_power_15);
@@ -82,7 +91,34 @@ static int __init u300_init_boardpower(void)
return 0;
}
+static int __init s365_board_probe(struct platform_device *pdev)
+{
+ return __u300_init_boardpower(pdev);
+}
+
+static const struct of_device_id s365_board_match[] = {
+ { .compatible = "stericsson,s365" },
+ {},
+};
+
+static struct platform_driver s365_board_driver = {
+ .driver = {
+ .name = "s365-board",
+ .owner = THIS_MODULE,
+ .of_match_table = s365_board_match,
+ },
+};
+
/*
* So at module init time we hog the regulator!
*/
-module_init(u300_init_boardpower);
+static int __init u300_init_boardpower(void)
+{
+ if (of_have_populated_dt())
+ return platform_driver_probe(&s365_board_driver,
+ s365_board_probe);
+ /* Only call this on non-DT boots */
+ return __u300_init_boardpower(NULL);
+}
+
+device_initcall(u300_init_boardpower);