OSDN Git Service

arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for coachz
authorAlexandru M Stan <amstan@chromium.org>
Mon, 1 Mar 2021 21:34:31 +0000 (13:34 -0800)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Fri, 12 Mar 2021 02:22:41 +0000 (20:22 -0600)
Removed the pinctrl and pin{mux,conf} for the control pins because:
1. The only need for them is for userspace control via flash_fp_mcu
2. cros-ec doesn't know what to do with them, and even if it did,
   it would interfere with flash_fp_mcu at the most inopportune times

Since we're not using hogs, we rely on AP firmware to set all the
control pins correctly.

Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Craig Hesling <hesling@chromium.org>
Signed-off-by: Alexandru M Stan <amstan@chromium.org>
[dianders: adjusted since coachz isn't upstream yet]
Reviewed-by; Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210301133318.v2.7.Ifd7b86f826b18410eada75758a7bca1eebfa336d@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

index 8ae9606..c44be53 100644 (file)
@@ -810,7 +810,7 @@ ap_spi_fp: &spi10 {
                interrupt-parent = <&tlmm>;
                interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
-               pinctrl-0 = <&fp_to_ap_irq_l>, <&fp_rst_l>, <&fpmcu_boot0>, <&fpmcu_sel>;
+               pinctrl-0 = <&fp_to_ap_irq_l>;
                spi-max-frequency = <3000000>;
        };
 };
@@ -1235,48 +1235,6 @@ ap_spi_fp: &spi10 {
                };
        };
 
-       fpmcu_boot0: fpmcu-boot0 {
-               pinmux {
-                       pins = "gpio10";
-                       function = "gpio";
-               };
-
-               pinconf {
-                       pins = "gpio10";
-                       bias-disable;
-                       drive-strength = <2>;
-                       output-low;
-               };
-       };
-
-       fpmcu_sel: fpmcu-sel {
-               pinmux {
-                       pins = "gpio22";
-                       function = "gpio";
-               };
-
-               pinconf {
-                       pins = "gpio22";
-                       bias-disable;
-                       drive-strength = <2>;
-                       output-high;
-               };
-       };
-
-       fp_rst_l: fp-rst-l {
-               pinmux {
-                       pins = "gpio5";
-                       function = "gpio";
-               };
-
-               pinconf {
-                       pins = "gpio5";
-                       bias-disable;
-                       drive-strength = <2>;
-                       output-high;
-               };
-       };
-
        fp_to_ap_irq_l: fp-to-ap-irq-l {
                pinmux {
                        pins = "gpio4";
@@ -1292,7 +1250,6 @@ ap_spi_fp: &spi10 {
                };
        };
 
-
        h1_ap_int_odl: h1-ap-int-odl {
                pinmux {
                        pins = "gpio42";