From fcefff116fffbd2ed830bb5b47e4b012f87e1211 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Thu, 17 Aug 2017 21:21:16 +0200 Subject: [PATCH 1/2] cheeseburger: sound: properly configure wsa properties Properly configure wsa properties in dt and remove hack on msm_init_wsa_dev. Setting property "qcom,wsa-max-devs" to "0" results in same behaviour as the "return hack". Makes it easier and faster to merge upstream changes because we'll have less conflicts to resolve. --- arch/arm/boot/dts/qcom/cheeseburger.dtsi | 6 +++--- sound/soc/msm/msm8998.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/qcom/cheeseburger.dtsi b/arch/arm/boot/dts/qcom/cheeseburger.dtsi index b1349bad6c28f..99cc3619e3015 100644 --- a/arch/arm/boot/dts/qcom/cheeseburger.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger.dtsi @@ -600,9 +600,9 @@ qcom,us-euro-gpios = <>; qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>; - qcom,wsa-max-devs = <>; - qcom,wsa-devs = <>; - qcom,wsa-aux-dev-prefix = <>; + qcom,wsa-max-devs = <0>; + qcom,wsa-devs = <0>; + qcom,wsa-aux-dev-prefix = <0>; }; sound-tavil { diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c index f4b56005b70f1..8d6b0cb9246dd 100755 --- a/sound/soc/msm/msm8998.c +++ b/sound/soc/msm/msm8998.c @@ -6946,8 +6946,7 @@ static int msm_init_wsa_dev(struct platform_device *pdev, char *dev_name_str = NULL; int found = 0; int ret = 0; -/*wangdongdong@MultiMediaService,add to avoid wsa init*/ - return ret; + /* Get maximum WSA device count for this platform */ ret = of_property_read_u32(pdev->dev.of_node, "qcom,wsa-max-devs", &wsa_max_devs); From 12bdb705e369a82c314314d4d08f8473a5e986fa Mon Sep 17 00:00:00 2001 From: codeworkx Date: Thu, 17 Aug 2017 21:29:18 +0200 Subject: [PATCH 2/2] cheeseburger: dt: introduce a common file for panel setup Create a common file for inclusion of panels and properties to avoid unneeded duplication. --- .../boot/dts/qcom/cheeseburger-backup.dtsi | 23 ++----------- arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi | 23 ++----------- arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi | 25 +-------------- arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi | 21 +----------- arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi | 23 ++----------- arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi | 23 ++----------- .../boot/dts/qcom/cheeseburger-panels.dtsi | 32 +++++++++++++++++++ arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi | 23 ++----------- arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi | 23 ++----------- arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi | 21 +----------- arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi | 21 +----------- 11 files changed, 48 insertions(+), 210 deletions(-) create mode 100644 arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi diff --git a/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi index 659cc429ca436..ed388bcb106a7 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { @@ -1191,4 +1172,4 @@ qcom,master-en = <1>; /* Enable GPIO */ status = "ok"; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi index 659cc429ca436..ed388bcb106a7 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { @@ -1191,4 +1172,4 @@ qcom,master-en = <1>; /* Enable GPIO */ status = "ok"; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi index ec593c743516a..04456448d654c 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -60,26 +57,6 @@ "px_ext_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; - #include "pxlw-iris-samsung_s6e3fa3.dtsi" -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; - #include "pxlw-iris-samsung_s6e3fa3.dtsi" -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; - #include "pxlw-iris-samsung_s6e3fa3.dtsi" -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; - #include "pxlw-iris-samsung_s6e3fa3.dtsi" -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi index a7b10fa19b938..bb0126de3ec2c 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi index 659cc429ca436..ed388bcb106a7 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { @@ -1191,4 +1172,4 @@ qcom,master-en = <1>; /* Enable GPIO */ status = "ok"; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi index 659cc429ca436..ed388bcb106a7 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { @@ -1191,4 +1172,4 @@ qcom,master-en = <1>; /* Enable GPIO */ status = "ok"; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi new file mode 100644 index 0000000000000..fff152f3d94d9 --- /dev/null +++ b/arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi @@ -0,0 +1,32 @@ +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" +#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" +#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" +#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" + +&dsi_samsung_s6e3fa3_1080p_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; +}; + +&dsi_samsung_s6e3fa3_1080p_video { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; +}; + +&dsi_samsung_s6e3fa5_1080p_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; +}; + +&dsi_samsung_s6e3fa6_1080p_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; +}; diff --git a/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi index 659cc429ca436..ed388bcb106a7 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { @@ -1191,4 +1172,4 @@ qcom,master-en = <1>; /* Enable GPIO */ status = "ok"; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi index 659cc429ca436..ed388bcb106a7 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { @@ -1191,4 +1172,4 @@ qcom,master-en = <1>; /* Enable GPIO */ status = "ok"; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi index d0b68b5c05f6d..e172a5266da76 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 { diff --git a/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi b/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi index a7b10fa19b938..bb0126de3ec2c 100755 --- a/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi +++ b/arch/arm/boot/dts/qcom/cheeseburger-t1.dtsi @@ -10,10 +10,7 @@ * GNU General Public License for more details. */ -#include "dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa3_1080p_video.dtsi" -#include "dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi" -#include "dsi-panel-samsung_s6e3fa6_1080p_cmd.dtsi" +#include "cheeseburger-panels.dtsi" &mdss_dsi_active { mux { @@ -55,22 +52,6 @@ "byte_intf_clk"; }; -&dsi_samsung_s6e3fa3_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa3_1080p_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa5_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - -&dsi_samsung_s6e3fa6_1080p_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>; -}; - /* Charging */ &soc { tlmm: pinctrl@03400000 {