Merge 9bb48c82aced ("tty: implement write_iter") into tty-linus

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sc7180-trogdor-lazor-r1.dts

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
index 3151ae3..c2ef063 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
@@ -10,6 +10,17 @@
 #include "sc7180-trogdor-lazor.dtsi"
 
 / {
-       model = "Google Lazor (rev1+)";
-       compatible = "google,lazor", "qcom,sc7180";
+       model = "Google Lazor (rev1 - 2)";
+       compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180";
+};
+
+&pp3300_hub {
+       /* pp3300_l7c is used to power the USB hub */
+       /delete-property/regulator-always-on;
+       /delete-property/regulator-boot-on;
+};
+
+&pp3300_l7c {
+       regulator-always-on;
+       regulator-boot-on;
 };