From 0bf264c2cfbe9d406930f94ac48fd135dd61d88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Thu, 27 Oct 2016 21:57:56 +0200 Subject: [PATCH 1/2] BCM270X_DT: Use raspberrypi-power to turn on USB power MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the raspberrypi-power driver to turn on USB power. Signed-off-by: Noralf Trønnes --- arch/arm/boot/dts/bcm2708-rpi.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi index d85c05901c8f55..46cf8602c3b96e 100644 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi @@ -103,3 +103,7 @@ &hdmi { power-domains = <&power RPI_POWER_DOMAIN_HDMI>; }; + +&usb { + power-domains = <&power RPI_POWER_DOMAIN_USB>; +}; From 9fdbef169edacc970cae67c618fad61933139814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Thu, 27 Oct 2016 21:58:09 +0200 Subject: [PATCH 2/2] firmware: bcm2835: Don't turn on USB power MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- drivers/firmware/raspberrypi.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index b980d531b35b99..3f070bd38a9151 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -185,25 +185,6 @@ 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; @@ -232,9 +213,6 @@ static int rpi_firmware_probe(struct platform_device *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; }