From: Noralf Trønnes Date: Fri, 26 Jun 2015 12:25:01 +0000 (+0200) Subject: firmware: bcm2835: Support ARCH_BCM270x X-Git-Tag: archive/raspbian/4.9.82-1+deb9u3+rpi1_jessie~5^2~436 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4c2b285ed626a5027ab658199ba7b08d16abdc5c;p=linux-4.9.git firmware: bcm2835: Support ARCH_BCM270x 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 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 --- diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index dd506cd3a5b8..3f070bd38a91 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) @@ -207,6 +209,7 @@ 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); @@ -218,6 +221,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 +234,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 +257,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");