CHROMIUM: arm64: dts: qcom: sc7180: Fix formatting of selected trogdor dts files.
Fix formatting issues, such as extra newlines, underscores in node names, incorrect indentation, and nodes not alphabetically sorted.
These are changes requested when trying to upstream these files.
Adding these changes to v5.4 makes it easier to avoid accidentally
reverting the changes in the upstream patches when diffing upstream
against v5.4.
BUG=b:213201630
TEST=none
Signed-off-by: Joseph S. Barrera III <joebar@chromium.org>
Change-Id: Ib38e8a35975148b6233c24746d3a9ef887683012
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3716984
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Joseph Barrera <joebar@google.com>
Commit-Queue: Joseph Barrera <joebar@google.com>
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
index 1d59765..76f863b 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
@@ -77,6 +77,7 @@
&dsi0 {
panel: panel@0 {
+ /* Compatible will be filled in per-board */
reg = <0>;
enable-gpios = <&tlmm 87 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
@@ -171,7 +172,8 @@
tp_en: &en_pp3300_dx_edp {
pinmux {
pins = "gpio85";
- };
+ };
+
pinconf {
pins = "gpio85";
};
@@ -304,19 +306,6 @@
"DP_HOT_PLUG_DET",
"EC_IN_RW_ODL";
- vdd_reset_1800: vdd-reset-1800 {
- pinmux {
- pins = "gpio87";
- function = "gpio";
- };
-
- pinconf {
- pins = "gpio87";
- drive-strength = <2>;
- bias-disable;
- };
- };
-
avdd_lcd_en: avdd-lcd-en {
pinmux {
pins = "gpio88";
@@ -330,7 +319,7 @@
};
};
- avee_lcd_en: avee-lcd_en {
+ avee_lcd_en: avee-lcd-en {
pinmux {
pins = "gpio21";
function = "gpio";
@@ -355,4 +344,17 @@
bias-disable;
};
};
+
+ vdd_reset_1800: vdd-reset-1800 {
+ pinmux {
+ pins = "gpio87";
+ function = "gpio";
+ };
+
+ pinconf {
+ pins = "gpio87";
+ drive-strength = <2>;
+ bias-disable;
+ };
+ };
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
index 2672b815..4bed231 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * Google Quankingstick board device tree source
+ * Google Quackingstick board device tree source
*
* Copyright 2021 Google LLC.
*/
@@ -70,8 +70,8 @@
};
&dsi0 {
-
panel: panel@0 {
+ /* Compatible will be filled in per-board */
reg = <0>;
enable-gpios = <&tlmm 87 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
@@ -166,7 +166,8 @@
tp_en: &en_pp3300_dx_edp {
pinmux {
pins = "gpio67";
- };
+ };
+
pinconf {
pins = "gpio67";
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
index f03c538b..c5dc3d5 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
@@ -234,7 +234,8 @@
tp_en: &en_pp3300_dx_edp {
pinmux {
pins = "gpio85";
- };
+ };
+
pinconf {
pins = "gpio85";
};
@@ -367,19 +368,6 @@
"DP_HOT_PLUG_DET",
"EC_IN_RW_ODL";
- vdd_reset_1800: vdd-reset-1800 {
- pinmux {
- pins = "gpio87";
- function = "gpio";
- };
-
- pinconf {
- pins = "gpio87";
- drive-strength = <2>;
- bias-disable;
- };
- };
-
avdd_lcd_en: avdd-lcd-en {
pinmux {
pins = "gpio88";
@@ -393,7 +381,7 @@
};
};
- avee_lcd_en: avee-lcd_en {
+ avee_lcd_en: avee-lcd-en {
pinmux {
pins = "gpio21";
function = "gpio";
@@ -418,4 +406,17 @@
bias-disable;
};
};
+
+ vdd_reset_1800: vdd-reset-1800 {
+ pinmux {
+ pins = "gpio87";
+ function = "gpio";
+ };
+
+ pinconf {
+ pins = "gpio87";
+ drive-strength = <2>;
+ bias-disable;
+ };
+ };
};
