summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-03-07 09:16:37 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-07 09:16:37 -0800
commitbbfcd05a319db36471692fab4fbcbc4f6f68ca69 (patch)
treece9e52fcb6437a02ad603e11e422bca6c692b688
parent52981940d75a6ae601f99c74c002763b09c94728 (diff)
parent7327c28169e59d94bdc6ba3be9675de334112514 (diff)
Merge "Revert "ARM: dts: msm: Disable SPI CAN controller on msm8996 CV2X boards""
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi b/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi
index 78141330915b..22c694ba5ecd 100644
--- a/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi
@@ -238,7 +238,6 @@
pinctrl-names = "active", "sleep";
pinctrl-0 = <&can_rst_on>;
pinctrl-1 = <&can_rst_off>;
- status = "disabled";
};
};