Google Git
Sign in
chromium / chromiumos / third_party / kernel-rebase-patches / ba418e97732e54f14a683795e612e8b91d4b5134 / . / 54d13ce10e1024f187ce18782b0e78cf33733ec3a5b41a0542959d94.patch
blob: 3a7de8e635e145385900ba1c33bb459d04d45865 [file] [log] [blame]
From be9daf80c461bc80e1d36ba75871d0605b7cd284 Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <mka@chromium.org>
Date: Thu, 5 Nov 2020 16:27:59 -0800
Subject: [PATCH] CHROMIUM: arm64: dts: qcom: sc7180: Add sc7180-coachz-r1
CoachZ rev1 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 rev0 to keep using pp3300_l7c.
BUG=b:166265888
TEST=build for trogdor
Change-Id: I55ea6cf2f861cd9f8ccafc0790be293099bc365f
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2523880
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
arch/arm64/boot/dts/qcom/Makefile | 4 +-
...e.dts => sc7180-trogdor-coachz-r0-lte.dts} | 6 +-
.../dts/qcom/sc7180-trogdor-coachz-r0.dts | 19 ++
.../boot/dts/qcom/sc7180-trogdor-coachz.dts | 238 ------------------
4 files changed, 24 insertions(+), 243 deletions(-)
rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-coachz-lte.dts => sc7180-trogdor-coachz-r0-lte.dts} (56%)
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r0.dts
delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dts
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index b033efe8788b..c0c4dabf9229 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -33,8 +33,8 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb
dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
-dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz.dtb
-dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-lte.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r0.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r0-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r2.dtb
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r0-lte.dts
similarity index 56%
rename from arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-lte.dts
rename to arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r0-lte.dts
index 33629acdd47b..d0ef2f1805c1 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-lte.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r0-lte.dts
@@ -5,10 +5,10 @@
* Copyright 2020 Google LLC.
*/
-#include "sc7180-trogdor-coachz.dts"
+#include "sc7180-trogdor-coachz-r0.dts"
#include "sc7180-trogdor-lte-sku.dtsi"
/ {
- model = "Google CoachZ with LTE";
- compatible = "google,coachz-sku0", "qcom,sc7180";
+ model = "Google CoachZ (rev0) with LTE";
+ compatible = "google,coachz-rev0-sku0", "qcom,sc7180";
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r0.dts
new file mode 100644
index 000000000000..f9bc31e8c618
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r0.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google CoachZ board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180-trogdor-coachz.dtsi"
+
+/ {
+ model = "Google CoachZ (rev0)";
+ compatible = "google,coachz-rev0", "qcom,sc7180";
+};
+
+&usb_hub {
+ vdd-supply = <&pp3300_l7c>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dts
deleted file mode 100644
index 2c08cd80a4c2..000000000000
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dts
+++ /dev/null
@@ -1,238 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Google CoachZ board device tree source
- *
- * Copyright 2020 Google LLC.
- */
-
-/dts-v1/;
-
-#include "sc7180.dtsi"
-
-ap_ec_spi: &spi6 {};
-ap_h1_spi: &spi0 {};
-
-#include "sc7180-trogdor.dtsi"
-
-/ {
- model = "Google CoachZ";
- compatible = "google,coachz", "qcom,sc7180";
-};
-
-&alc5682 {
- status = "disabled";
-};
-
-&ap_tp_i2c {
- status = "disabled";
-};
-
-&ap_spi_fp {
- status = "okay";
-};
-
-&backlight {
- pwms = <&cros_ec_pwm 0>;
-};
-
-&hp_i2c {
- status = "disabled";
-};
-
-ap_ts_pen_1v8: &i2c4 {
- status = "okay";
- clock-frequency = <400000>;
-
- ap_ts: touchscreen@5d {
- compatible = "goodix,gt7375p";
- reg = <0x5d>;
- pinctrl-names = "default";
- pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
-
- interrupt-parent = <&tlmm>;
- interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
-
- reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
-
- vdd-supply = <&pp3300_ts>;
- };
-};
-
-/*
- * There's no SAR sensor, so i2c5 is re-purposed. We leave the
- * proximity@28 node under i2c5 (from trogdor.dtsi) since it's "disabled"
- * and doesn't hurt.
- */
-i2c_wlc: &i2c5 {
- /* Currently not connected to anything; see b/168652326 */
-};
-
-&panel {
- compatible = "boe,nv110wtm-n61";
-};
-
-&pp3300_codec {
- status = "disabled";
-};
-
-&pp3300_dx_edp {
- gpio = <&tlmm 52 GPIO_ACTIVE_HIGH>;
-};
-
-&sdhc_2 {
- status = "okay";
-};
-
-&sn65dsi86_out {
- data-lanes = <0 1 2 3>;
-};
-
-/* PINCTRL - modifications to sc7180-trogdor.dtsi */
-
-&en_pp3300_dx_edp {
- pinmux {
- pins = "gpio52";
- };
-
- pinconf {
- pins = "gpio52";
- };
-};
-
-&ts_reset_l {
- pinconf {
- /*
- * We want reset state by default and it will be up to the
- * driver to disable this when it's ready.
- */
- output-low;
- };
-};
-
-/* PINCTRL - board-specific pinctrl */
-
-&tlmm {
- gpio-line-names = "HUB_RST_L",
- "AP_RAM_ID0",
- "AP_SKU_ID2",
- "AP_RAM_ID1",
- "FP_TO_AP_IRQ_L",
- "AP_RAM_ID2",
- "UF_CAM_EN",
- "WF_CAM_EN",
- "TS_RESET_L",
- "TS_INT_L",
- "FPMCU_BOOT0",
- "EDP_BRIJ_IRQ",
- "AP_EDP_BKLTEN",
- "UF_CAM_MCLK",
- "WF_CAM_CLK",
- "EDP_BRIJ_I2C_SDA",
- "EDP_BRIJ_I2C_SCL",
- "UF_CAM_SDA",
- "UF_CAM_SCL",
- "WF_CAM_SDA",
- "WF_CAM_SCL",
- "WLC_IRQ",
- "FP_RST_L",
- "AMP_EN",
- "WLC_NRST",
- "AP_SAR_SENSOR_SDA",
- "AP_SAR_SENSOR_SCL",
- "",
- "",
- "WF_CAM_RST_L",
- "UF_CAM_RST_L",
- "AP_BRD_ID2",
- "BRIJ_SUSPEND",
- "AP_BRD_ID0",
- "AP_H1_SPI_MISO",
- "AP_H1_SPI_MOSI",
- "AP_H1_SPI_CLK",
- "AP_H1_SPI_CS_L",
- "",
- "",
- "",
- "",
- "H1_AP_INT_ODL",
- "",
- "UART_AP_TX_DBG_RX",
- "UART_DBG_TX_AP_RX",
- "",
- "",
- "FORCED_USB_BOOT",
- "AMP_BCLK",
- "AMP_LRCLK",
- "AMP_DIN",
- "EN_PP3300_DX_EDP",
- "HP_BCLK",
- "HP_LRCLK",
- "HP_DOUT",
- "HP_DIN",
- "HP_MCLK",
- "AP_SKU_ID0",
- "AP_EC_SPI_MISO",
- "AP_EC_SPI_MOSI",
- "AP_EC_SPI_CLK",
- "AP_EC_SPI_CS_L",
- "AP_SPI_CLK",
- "AP_SPI_MOSI",
- "AP_SPI_MISO",
- /*
- * AP_FLASH_WP_L is crossystem ABI. Schematics
- * call it BIOS_FLASH_WP_L.
- */
- "AP_FLASH_WP_L",
- "",
- "AP_SPI_CS0_L",
- "SD_CD_ODL",
- "",
- "",
- "",
- "",
- "FPMCU_SEL",
- "UIM2_DATA",
- "UIM2_CLK",
- "UIM2_RST",
- "UIM2_PRESENT_L",
- "UIM1_DATA",
- "UIM1_CLK",
- "UIM1_RST",
- "",
- "DMIC_CLK_EN",
- "HUB_EN",
- "",
- "AP_SPI_FP_MISO",
- "AP_SPI_FP_MOSI",
- "AP_SPI_FP_CLK",
- "AP_SPI_FP_CS_L",
- "AP_SKU_ID1",
- "AP_RST_REQ",
- "",
- "AP_BRD_ID1",
- "AP_EC_INT_L",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "EDP_BRIJ_EN",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "AP_TS_PEN_I2C_SDA",
- "AP_TS_PEN_I2C_SCL",
- "DP_HOT_PLUG_DET",
- "EC_IN_RW_ODL";
-};
--
2.31.1.607.g51e8a6a459-goog