Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
- index c2d198b02357..8ec33a99dc6c 100644
- --- a/arch/arm/boot/dts/qcom/Makefile
- +++ b/arch/arm/boot/dts/qcom/Makefile
- @@ -1,4 +1,4 @@
- -dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
- +dtb-$(CONFIG_ARCH_MSM89961) += msm8996-v2-pmi8994-cdp.dtb \
- msm8996-v2-pmi8994-mtp.dtb \
- msm8996-v2-pmi8994-pmk8001-cdp.dtb \
- msm8996-v2-pmi8994-pmk8001-mtp.dtb \
- diff --git a/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi
- index 5579ac813ce7..d39c7532eee0 100644
- --- a/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi
- +++ b/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi
- @@ -196,7 +196,7 @@
- qcom,mdss-dsi-lane-2-state;
- qcom,mdss-dsi-lane-3-state;
- qcom,mdss-dsi-panel-timings = [f9 3d 34 00 58 4d 36 3f 53 03 04 00];
- - qcom,mdss-dsi-panel-timings-8996 = [23 1F 07 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- diff --git a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi
- index f6b852708534..b7646eb6cf32 100644
- --- a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi
- +++ b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi
- @@ -85,7 +85,7 @@
- qcom,oled-hbm-mode;
- qcom,cont-splash-enabled;
- qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
- - qcom,mdss-dsi-panel-timings-8996 = [
- + qcom,mdss-dsi-panel-timings-phy-v2 = [
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- diff --git a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi
- index 5102d292febf..bc432b0994d8 100644
- --- a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi
- +++ b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi
- @@ -85,7 +85,7 @@
- qcom,oled-hbm-mode;
- qcom,cont-splash-enabled;
- qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
- - qcom,mdss-dsi-panel-timings-8996 = [
- + qcom,mdss-dsi-panel-timings-phy-v2 = [
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- diff --git a/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi
- index 2924f92a72d3..db64c3a0d61f 100644
- --- a/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi
- +++ b/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi
- @@ -92,7 +92,7 @@
- qcom,mdss-dsi-lp11-init;
- qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
- - qcom,mdss-dsi-panel-timings-8996 = [
- + qcom,mdss-dsi-panel-timings-phy-v2 = [
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- diff --git a/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi
- index 0b7f456844e2..7325a4a38af5 100644
- --- a/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi
- +++ b/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi
- @@ -93,7 +93,7 @@
- qcom,esd-err-irq-gpio = <&tlmm 29 0x2001>;
- qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
- - qcom,mdss-dsi-panel-timings-8996 = [
- + qcom,mdss-dsi-panel-timings-phy-v2 = [
- 23 1e 07 08 05 03 04 a0
- 23 1e 07 08 05 03 04 a0
- 23 1e 07 08 05 03 04 a0
- diff --git a/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi
- index 40666d2d8223..f423eaa92106 100644
- --- a/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi
- +++ b/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi
- @@ -139,7 +139,7 @@
- qcom,mdss-dsi-lane-2-state;
- qcom,mdss-dsi-lane-3-state;
- qcom,mdss-dsi-panel-timings = [f9 3d 34 00 58 4d 36 3f 53 03 04 00];
- - qcom,mdss-dsi-panel-timings-8996 = [23 1F 07 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- 23 1F 07 09 05 03 04 a0
- diff --git a/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi b/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
- index c912f7deb035..e3b50bbe5ff0 100644
- --- a/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
- +++ b/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
- @@ -275,7 +275,7 @@
- };
- &dsi_jdi_fhd_r63452_video {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -283,7 +283,7 @@
- };
- &dsi_jdi_fhd_r63452_cmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -291,7 +291,7 @@
- };
- &dsi_jdi_fhd_r63452_j1_cmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -299,7 +299,7 @@
- };
- &dsi_jdi_fhd_r63452_pro_cmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -307,7 +307,7 @@
- };
- &dsi_jdi_fhd_r63452_j1_pro_cmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -315,7 +315,7 @@
- };
- &dsi_lgd_fhd_td4322_cmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -323,7 +323,7 @@
- };
- &dsi_lgd_fhd_td4722_cmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -331,7 +331,7 @@
- };
- &dsi_sharp_fhd_nt35695_video {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -339,7 +339,7 @@
- };
- &dsi_sharp_fhd_nt35695_cmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -347,7 +347,7 @@
- };
- &dsi_jdi_fhd_r63452_xcmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- @@ -355,7 +355,7 @@
- };
- &dsi_sharp_fhd_td4722_xcmd {
- - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
- + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- 23 20 06 09 05 03 04 a0
- diff --git a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi
- index e704f93d25fe..2278079bbce3 100644
- --- a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi
- +++ b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi
- @@ -1715,87 +1715,6 @@
- };
- };
- - sec_mi2s {
- - sec_mi2s_sleep: sec_mi2s_sleep {
- - mux {
- - pins = "gpio80", "gpio81";
- - function = "sec_mi2s";
- - };
- -
- - config {
- - pins = "gpio80", "gpio81";
- - drive-strength = <2>; /* 2 mA */
- - bias-disable; /* NO PULL */
- - };
- - };
- - sec_mi2s_active: sec_mi2s_active {
- - mux {
- - pins = "gpio80", "gpio81";
- - function = "sec_mi2s";
- - };
- -
- - config {
- - pins = "gpio80", "gpio81";
- - drive-strength = <8>; /* 8 mA */
- - bias-disable; /* NO PULL */
- - };
- - };
- - };
- -
- - sec_mi2s_sd0 {
- - sec_mi2s_sd0_sleep: sec_mi2s_sd0_sleep {
- - mux {
- - pins = "gpio82";
- - function = "sec_mi2s";
- - };
- -
- - config {
- - pins = "gpio82";
- - drive-strength = <2>; /* 2 mA */
- - bias-pull-down; /* PULL DOWN */
- - };
- - };
- - sec_mi2s_sd0_active: sec_mi2s_sd0_active {
- - mux {
- - pins = "gpio82";
- - function = "sec_mi2s";
- - };
- -
- - config {
- - pins = "gpio82";
- - drive-strength = <8>; /* 8 mA */
- - bias-disable; /* NO PULL */
- - };
- - };
- - };
- -
- - sec_mi2s_sd1 {
- - sec_mi2s_sd1_sleep: sec_mi2s_sd1_sleep {
- - mux {
- - pins = "gpio83";
- - function = "sec_mi2s";
- - };
- -
- - config {
- - pins = "gpio83";
- - drive-strength = <2>; /* 2 mA */
- - bias-pull-down; /* PULL DOWN */
- - };
- - };
- - sec_mi2s_sd1_active: sec_mi2s_sd1_active {
- - mux {
- - pins = "gpio83";
- - function = "sec_mi2s";
- - };
- -
- - config {
- - pins = "gpio83";
- - drive-strength = <8>; /* 8 mA */
- - bias-disable; /* NO PULL */
- - };
- - };
- - };
- -
- tert_mi2s {
- tert_mi2s_sleep: tert_mi2s_sleep {
- mux {
- diff --git a/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi
- index 8389c0458c8e..7a905f4cca3d 100644
- --- a/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi
- +++ b/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi
- @@ -1932,6 +1932,21 @@
- regulator-boot-on;
- gpio = <&tlmm 40 0>;
- };
- +
- + wlan_en_vreg: wlan_en_vreg {
- + compatible = "regulator-fixed";
- + regulator-name = "wlan_en_vreg";
- + enable-active-high;
- + gpio = <&pm8994_gpios 8 0>;
- + };
- +
- + hl7509_en_vreg: hl7509_en_vreg {
- + compatible = "regulator-fixed";
- + regulator-name = "hl7509_en_vreg";
- + gpio = <&pm8994_mpps 6 0>;
- + enable-active-high;
- + status = "disabled";
- + };
- };
- &pmi8994_charger {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement