Skip to content

remove wsa init hack, deduplicate panel setup #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codeworkx wants to merge 2 commits into
base: oneplus/QC8998_N_7.1
Choose a base branch
from
Open

remove wsa init hack, deduplicate panel setup #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcefff1
cheeseburger: sound: properly configure wsa properties
codeworkx Aug 17, 2017
12bdb70
cheeseburger: dt: introduce a common file for panel setup
codeworkx Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions arch/arm/boot/dts/qcom/cheeseburger-backup.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1191,4 +1172,4 @@
qcom,master-en = <1>; /* Enable GPIO */
status = "ok";
};
};
};
23 changes: 2 additions & 21 deletions arch/arm/boot/dts/qcom/cheeseburger-dvt1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1191,4 +1172,4 @@
qcom,master-en = <1>; /* Enable GPIO */
status = "ok";
};
};
};
25 changes: 1 addition & 24 deletions arch/arm/boot/dts/qcom/cheeseburger-evb.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
21 changes: 1 addition & 20 deletions arch/arm/boot/dts/qcom/cheeseburger-evt1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
23 changes: 2 additions & 21 deletions arch/arm/boot/dts/qcom/cheeseburger-evt2.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1191,4 +1172,4 @@
qcom,master-en = <1>; /* Enable GPIO */
status = "ok";
};
};
};
23 changes: 2 additions & 21 deletions arch/arm/boot/dts/qcom/cheeseburger-evt3.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1191,4 +1172,4 @@
qcom,master-en = <1>; /* Enable GPIO */
status = "ok";
};
};
};
32 changes: 32 additions & 0 deletions arch/arm/boot/dts/qcom/cheeseburger-panels.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>;
};
23 changes: 2 additions & 21 deletions arch/arm/boot/dts/qcom/cheeseburger-pvt.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1191,4 +1172,4 @@
qcom,master-en = <1>; /* Enable GPIO */
status = "ok";
};
};
};
23 changes: 2 additions & 21 deletions arch/arm/boot/dts/qcom/cheeseburger-pvt1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1191,4 +1172,4 @@
qcom,master-en = <1>; /* Enable GPIO */
status = "ok";
};
};
};
21 changes: 1 addition & 20 deletions arch/arm/boot/dts/qcom/cheeseburger-t0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading