84 lines
2.3 KiB
Diff
84 lines
2.3 KiB
Diff
|
From 2838aca7eb2ef14cb94ac43921fc2db291af96a7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
|
||
|
|
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 <noralf@tronnes.org>
|
||
|
|
|
||
|
|
firmware: bcm2835: Don't turn on USB power
|
||
|
|
|
||
|
|
The raspberrypi-power driver is now used to turn on USB power.
|
||
|
|
|
||
|
|
This partly reverts commit:
|
||
|
|
firmware: bcm2835: Support ARCH_BCM270x
|
||
|
|
|
||
|
|
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
||
|
|
---
|
||
|
|
drivers/firmware/raspberrypi.c | 19 +++++++++++++++++--
|
||
|
|
1 file changed, 17 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- 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)
|
||
|
|
@@ -207,6 +209,7 @@ static int rpi_firmware_probe(struct pla
|
||
|
|
init_completion(&fw->c);
|
||
|
|
|
||
|
|
platform_set_drvdata(pdev, fw);
|
||
|
|
+ g_pdev = pdev;
|
||
|
|
|
||
|
|
rpi_firmware_print_firmware_revision(fw);
|
||
|
|
|
||
|
|
@@ -218,6 +221,7 @@ static int rpi_firmware_remove(struct pl
|
||
|
|
struct rpi_firmware *fw = platform_get_drvdata(pdev);
|
||
|
|
|
||
|
|
mbox_free_channel(fw->chan);
|
||
|
|
+ g_pdev = NULL;
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
@@ -230,7 +234,7 @@ static int rpi_firmware_remove(struct pl
|
||
|
|
*/
|
||
|
|
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 +257,18 @@ static struct platform_driver rpi_firmwa
|
||
|
|
.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 <eric@anholt.net>");
|
||
|
|
MODULE_DESCRIPTION("Raspberry Pi firmware driver");
|