mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			88 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			88 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 8dc768cc732449f7d86228efb53ef6129085f7f7 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 052/277] 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(-)
 | |
| 
 | |
| 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 <eric@anholt.net>");
 | |
|  MODULE_DESCRIPTION("Raspberry Pi firmware driver");
 | |
| -- 
 | |
| 2.16.1
 | |
| 
 |