blob: 5f0acedf4b0ada49f7f8448eedb16823ccc0ca49 [file] [log] [blame]
From afa73e66e6be2b9578933f2ca6de7f790548c8e4 Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <mka@chromium.org>
Date: Wed, 4 Nov 2020 10:05:27 -0800
Subject: [PATCH] CHROMIUM: arm64: dts: qcom: sc7180: Add sc7180-pompom-r2
Pompom rev2 changed the supply of pp3300_hub from pp3300_l7c to
pp3300_a. The actual change is done by the patch 'arm64: dts:
qcom: sc7180-trogdor: Make pp3300_a the default supply for
pp3300_hub' for all trogdor devices, so here we just add the new
revision and configure older revs to keep using pp3300_l7c.
BUG=b:166265888
TEST=USB still works on pompom r1
Change-Id: Ibfb9f7799255ddd28e1bf5857aef9331d4420752
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2523570
Reviewed-by: Douglas Anderson <dianders@chromium.org>
[swboyd@chromium.org: No trogdor-r0 in Makefile]
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r0.dts | 4 ++++
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r0.dts
index 18e3597b5343..0b203138d5f1 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r0.dts
@@ -14,6 +14,10 @@ / {
compatible = "google,pompom-rev0", "qcom,sc7180";
};
+&usb_hub {
+ vdd-supply = <&pp3300_l7c>;
+};
+
&trackpad {
interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts
index 250fae6126b6..0202f03eafe6 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts
@@ -9,6 +9,6 @@
#include "sc7180-trogdor-lte-sku.dtsi"
/ {
- model = "Google Pompom (rev1+) with LTE";
- compatible = "google,pompom-sku0", "qcom,sc7180";
+ model = "Google Pompom (rev1) with LTE";
+ compatible = "google,pompom-rev1-sku0", "qcom,sc7180";
};
--
2.31.1.607.g51e8a6a459-goog