From 95a5d72cee099fa45c139f66013f7ce96463fc80 Mon Sep 17 00:00:00 2001 From: Faiz Nabi Kuchay Date: Tue, 25 May 2021 12:24:06 +0530 Subject: [PATCH] ARM: dts: msm: Remove unused static supplies for holi-pm6125 Remove unused static supplies for holi MTP, CDP, MTP-USBC, platforms with PM6125 pmic. Change-Id: Ia5aa80d102c5b4649553810d12dc0ddea9c77443 --- qcom/holi-cdp-pm6125.dtsi | 22 ++++++++++++++++------ qcom/holi-mtp-pm6125.dtsi | 22 ++++++++++++++++------ qcom/holi-mtp-usbc-pm6125.dtsi | 22 ++++++++++++++++------ 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/qcom/holi-cdp-pm6125.dtsi b/qcom/holi-cdp-pm6125.dtsi index 4e49a2f06448..0d81b604e052 100644 --- a/qcom/holi-cdp-pm6125.dtsi +++ b/qcom/holi-cdp-pm6125.dtsi @@ -7,19 +7,29 @@ #include "camera/holi-camera-pm6125-overlay.dtsi" &wcd938x_codec { - /delete-property/ cdc-vdd-mic-bias-supply; - /delete-property/ qcom,cdc-vdd-mic-bias-voltage; - /delete-property/ qcom,cdc-vdd-mic-bias-current; cdc-vdd-rxtx-supply = <&L9A>; cdc-vddio-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddio"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; }; &wcd937x_codec { - /delete-property/ cdc-vdd-mic-bias-supply; - /delete-property/ qcom,cdc-vdd-mic-bias-voltage; - /delete-property/ qcom,cdc-vdd-mic-bias-current; cdc-vdd-rxtx-supply = <&L9A>; cdc-vddio-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddpx"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; }; &wsa881x_i2c_e { diff --git a/qcom/holi-mtp-pm6125.dtsi b/qcom/holi-mtp-pm6125.dtsi index 9238fc933bd2..47fd159bd53d 100644 --- a/qcom/holi-mtp-pm6125.dtsi +++ b/qcom/holi-mtp-pm6125.dtsi @@ -7,19 +7,29 @@ #include "camera/holi-camera-pm6125-overlay.dtsi" &wcd938x_codec { - /delete-property/ cdc-vdd-mic-bias-supply; - /delete-property/ qcom,cdc-vdd-mic-bias-voltage; - /delete-property/ qcom,cdc-vdd-mic-bias-current; cdc-vdd-rxtx-supply = <&L9A>; cdc-vddio-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddio"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; }; &wcd937x_codec { - /delete-property/ cdc-vdd-mic-bias-supply; - /delete-property/ qcom,cdc-vdd-mic-bias-voltage; - /delete-property/ qcom,cdc-vdd-mic-bias-current; cdc-vdd-rxtx-supply = <&L9A>; cdc-vddio-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddpx"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; }; &wsa881x_i2c_e { diff --git a/qcom/holi-mtp-usbc-pm6125.dtsi b/qcom/holi-mtp-usbc-pm6125.dtsi index 7513687694f9..3f45b33c1e22 100644 --- a/qcom/holi-mtp-usbc-pm6125.dtsi +++ b/qcom/holi-mtp-usbc-pm6125.dtsi @@ -7,19 +7,29 @@ #include "camera/holi-camera-pm6125-overlay.dtsi" &wcd938x_codec { - /delete-property/ cdc-vdd-mic-bias-supply; - /delete-property/ qcom,cdc-vdd-mic-bias-voltage; - /delete-property/ qcom,cdc-vdd-mic-bias-current; cdc-vdd-rxtx-supply = <&L9A>; cdc-vddio-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddio"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; }; &wcd937x_codec { - /delete-property/ cdc-vdd-mic-bias-supply; - /delete-property/ qcom,cdc-vdd-mic-bias-voltage; - /delete-property/ qcom,cdc-vdd-mic-bias-current; cdc-vdd-rxtx-supply = <&L9A>; cdc-vddio-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddpx"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; }; &wsa881x_i2c_e {