From 150d8a3bad9e6ffb6b80bdac3d9b681520aa0850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 26 Jun 2015 14:25:01 +0200 Subject: [PATCH] firmware: bcm2835: Support ARCH_BCM270x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Support booting without Device Tree. Turn on USB power. Load driver early because of lacking support for deferred probing in many drivers. Signed-off-by: Noralf Trønnes --- drivers/firmware/raspberrypi.c | 41 ++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index dd506cd3a5b8..b980d531b35b 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -28,6 +28,8 @@ struct rpi_firmware { u32 enabled; }; +static struct platform_device *g_pdev; + static DEFINE_MUTEX(transaction_lock); static void response_callback(struct mbox_client *cl, void *msg) @@ -183,6 +185,25 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) } } +static int raspberrypi_firmware_set_power(struct rpi_firmware *fw, + u32 domain, bool on) +{ + struct { + u32 domain; + u32 on; + } packet; + int ret; + + packet.domain = domain; + packet.on = on; + ret = rpi_firmware_property(fw, RPI_FIRMWARE_SET_POWER_STATE, + &packet, sizeof(packet)); + if (!ret && packet.on != on) + ret = -EINVAL; + + return ret; +} + static int rpi_firmware_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -207,9 +228,13 @@ static int rpi_firmware_probe(struct platform_device *pdev) init_completion(&fw->c); platform_set_drvdata(pdev, fw); + g_pdev = pdev; rpi_firmware_print_firmware_revision(fw); + if (raspberrypi_firmware_set_power(fw, 3, true)) + dev_err(dev, "failed to turn on USB power\n"); + return 0; } @@ -218,6 +243,7 @@ static int rpi_firmware_remove(struct platform_device *pdev) struct rpi_firmware *fw = platform_get_drvdata(pdev); mbox_free_channel(fw->chan); + g_pdev = NULL; return 0; } @@ -230,7 +256,7 @@ static int rpi_firmware_remove(struct platform_device *pdev) */ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) { - struct platform_device *pdev = of_find_device_by_node(firmware_node); + struct platform_device *pdev = g_pdev; if (!pdev) return NULL; @@ -253,7 +279,18 @@ static struct platform_driver rpi_firmware_driver = { .probe = rpi_firmware_probe, .remove = rpi_firmware_remove, }; -module_platform_driver(rpi_firmware_driver); + +static int __init rpi_firmware_init(void) +{ + return platform_driver_register(&rpi_firmware_driver); +} +subsys_initcall(rpi_firmware_init); + +static void __init rpi_firmware_exit(void) +{ + platform_driver_unregister(&rpi_firmware_driver); +} +module_exit(rpi_firmware_exit); MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("Raspberry Pi firmware driver");