arm64: dts: qcom: sc7280: Rename crd to crd-r3

There are multiple revisions of CRD boards. The current sc7280-crd.dts
describes revision 3 and 4 (aka CRD 1.0 and 2.0). Support for a newer
version will be added by another patch. Add the revision number to
distinguish it from the versionn. Also add the revision numbers to
the compatible string.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Rajendra Nayak <quic_rjendra@quicinc.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220316172814.v1.1.I2deda8f2cd6adfbb525a97d8fee008a8477b7b0e@changeid

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index f1b597512352b16aa16f65d3466d6e0384ba6c02..d91fdae814874169cccb2cae95c4e17adc74b05b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -88,7 +88,7 @@ dtb-$(CONFIG_ARCH_QCOM)       += sc7280-herobrine-herobrine-r1.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sc7280-herobrine-villager-r0.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sc7280-idp.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sc7280-idp2.dtb
-dtb-$(CONFIG_ARCH_QCOM)        += sc7280-crd.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += sc7280-crd-r3.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm630-sony-xperia-ganges-kirin.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm630-sony-xperia-nile-discovery.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm630-sony-xperia-nile-pioneer.dtb

diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
new file mode 100644 (file)
index 0000000..7a028b9
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * sc7280 CRD board device tree source
+ *
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "sc7280-idp.dtsi"
+#include "sc7280-idp-ec-h1.dtsi"
+
+/ {
+       model = "Qualcomm Technologies, Inc. sc7280 CRD platform (rev3 - 4)";
+       compatible = "qcom,sc7280-crd", "google,hoglin-rev3", "google,hoglin-rev4", "qcom,sc7280";
+
+       aliases {
+               serial0 = &uart5;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+};
+
+&apps_rsc {
+       pmg1110-regulators {
+               compatible = "qcom,pmg1110-rpmh-regulators";
+               qcom,pmic-id = "k";
+
+               vreg_s1k_1p0: smps1 {
+                       regulator-min-microvolt = <1010000>;
+                       regulator-max-microvolt = <1170000>;
+               };
+       };
+};
+
+ap_tp_i2c: &i2c0 {
+       status = "okay";
+       clock-frequency = <400000>;
+
+       trackpad: trackpad@15 {
+               compatible = "hid-over-i2c";
+               reg = <0x15>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&tp_int_odl>;
+
+               interrupt-parent = <&tlmm>;
+               interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+
+               post-power-on-delay-ms = <20>;
+               hid-descr-addr = <0x0001>;
+               vdd-supply = <&vreg_l18b_1p8>;
+
+               wakeup-source;
+       };
+};
+
+ap_ts_pen_1v8: &i2c13 {
+       status = "okay";
+       clock-frequency = <400000>;
+
+       ap_ts: touchscreen@5c {
+               compatible = "hid-over-i2c";
+               reg = <0x5c>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
+
+               interrupt-parent = <&tlmm>;
+               interrupts = <55 IRQ_TYPE_LEVEL_LOW>;
+
+               post-power-on-delay-ms = <500>;
+               hid-descr-addr = <0x0000>;
+
+               vdd-supply = <&vreg_l19b_1p8>;
+       };
+};
+
+&nvme_3v3_regulator {
+       gpio = <&tlmm 51 GPIO_ACTIVE_HIGH>;
+};
+
+&nvme_pwren {
+       pins = "gpio51";
+};
+
+&tlmm {
+       tp_int_odl: tp-int-odl {
+               pins = "gpio7";
+               function = "gpio";
+               bias-disable;
+       };
+
+       ts_int_l: ts-int-l {
+               pins = "gpio55";
+               function = "gpio";
+               bias-pull-up;
+       };
+
+       ts_reset_l: ts-reset-l {
+               pins = "gpio54";
+               function = "gpio";
+               bias-disable;
+       };
+};

diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-crd.dts
deleted file mode 100644 (file)
index e2efbdd..0000000
--- a/arch/arm64/boot/dts/qcom/sc7280-crd.dts
+++ /dev/null
@@ -1,105 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * sc7280 CRD board device tree source
- *
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-
-#include "sc7280-idp.dtsi"
-#include "sc7280-idp-ec-h1.dtsi"
-
-/ {
-       model = "Qualcomm Technologies, Inc. sc7280 CRD platform";
-       compatible = "qcom,sc7280-crd", "google,hoglin", "qcom,sc7280";
-
-       aliases {
-               serial0 = &uart5;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-};
-
-&apps_rsc {
-       pmg1110-regulators {
-               compatible = "qcom,pmg1110-rpmh-regulators";
-               qcom,pmic-id = "k";
-
-               vreg_s1k_1p0: smps1 {
-                       regulator-min-microvolt = <1010000>;
-                       regulator-max-microvolt = <1170000>;
-               };
-       };
-};
-
-ap_tp_i2c: &i2c0 {
-       status = "okay";
-       clock-frequency = <400000>;
-
-       trackpad: trackpad@15 {
-               compatible = "hid-over-i2c";
-               reg = <0x15>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&tp_int_odl>;
-
-               interrupt-parent = <&tlmm>;
-               interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
-
-               post-power-on-delay-ms = <20>;
-               hid-descr-addr = <0x0001>;
-               vdd-supply = <&vreg_l18b_1p8>;
-
-               wakeup-source;
-       };
-};
-
-ap_ts_pen_1v8: &i2c13 {
-       status = "okay";
-       clock-frequency = <400000>;
-
-       ap_ts: touchscreen@5c {
-               compatible = "hid-over-i2c";
-               reg = <0x5c>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
-
-               interrupt-parent = <&tlmm>;
-               interrupts = <55 IRQ_TYPE_LEVEL_LOW>;
-
-               post-power-on-delay-ms = <500>;
-               hid-descr-addr = <0x0000>;
-
-               vdd-supply = <&vreg_l19b_1p8>;
-       };
-};
-
-&nvme_3v3_regulator {
-       gpio = <&tlmm 51 GPIO_ACTIVE_HIGH>;
-};
-
-&nvme_pwren {
-       pins = "gpio51";
-};
-
-&tlmm {
-       tp_int_odl: tp-int-odl {
-               pins = "gpio7";
-               function = "gpio";
-               bias-disable;
-       };
-
-       ts_int_l: ts-int-l {
-               pins = "gpio55";
-               function = "gpio";
-               bias-pull-up;
-       };
-
-       ts_reset_l: ts-reset-l {
-               pins = "gpio54";
-               function = "gpio";
-               bias-disable;
-       };
-};