diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-17 06:10:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-17 06:11:03 -0800 |
| commit | 31aec1cfd0fb8dfbaf172923262b2daad25e00bb (patch) | |
| tree | 5439e0ff8080b8dd0b9ea936f9210648be1c983d | |
| parent | eb852a2c171e098f8bfa57104a673d1e22ed4940 (diff) | |
| parent | 52aec989b6d0da4940f750a6ffaf886a19896e92 (diff) | |
Merge "ARM: dts: msm: Remove NFC clock voting for sdm670" into kernel.lnx.4.9.r14-relLA.UM.7.8.r1-04000-SDM710.0
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm670-qrd.dtsi | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi b/arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi index 95fb25a7661b..b268919af831 100644 --- a/arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi @@ -72,7 +72,6 @@ qcom,nq-clkreq = <&pm660_gpios 4 0x00>; qcom,nq-esepwr = <&tlmm 116 0x00>; interrupt-parent = <&tlmm>; - qcom,clk-src = "BBCLK3"; interrupts = <44 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; @@ -80,8 +79,6 @@ &nfc_enable_active &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; - clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; - clock-names = "ref_clk"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi b/arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi index 716225737768..8b386a047048 100644 --- a/arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi @@ -74,7 +74,6 @@ qcom,nq-clkreq = <&pm660_gpios 4 0x00>; qcom,nq-esepwr = <&tlmm 116 0x00>; interrupt-parent = <&tlmm>; - qcom,clk-src = "BBCLK3"; interrupts = <44 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; @@ -82,8 +81,6 @@ &nfc_enable_active &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; - clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; - clock-names = "ref_clk"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm670-qrd.dtsi b/arch/arm64/boot/dts/qcom/sdm670-qrd.dtsi index 2b6b64156f77..87fbb747d7cf 100644 --- a/arch/arm64/boot/dts/qcom/sdm670-qrd.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm670-qrd.dtsi @@ -43,7 +43,6 @@ qcom,nq-clkreq = <&pm660_gpios 4 0x00>; qcom,nq-esepwr = <&tlmm 116 0x00>; interrupt-parent = <&tlmm>; - qcom,clk-src = "BBCLK3"; interrupts = <44 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; @@ -51,8 +50,6 @@ &nfc_enable_active &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; - clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; - clock-names = "ref_clk"; }; }; |