Merge pull request #1700 from notro/raspberrypi-power-1

Use raspberrypi-power to turn on USB power
raspberrypi · Oct 30, 2016 · d8f7c2d · d8f7c2d
2 parents 7ede3d5 + 9fdbef1
commit d8f7c2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git 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>;
+};
diff --git 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;
 }