diff --git a/qcom/sa6155p-v2-adp-air-lxc-overlay.dts b/qcom/sa6155p-v2-adp-air-lxc-overlay.dts new file mode 100644 index 000000000000..6e45ada0cdc8 --- /dev/null +++ b/qcom/sa6155p-v2-adp-air-lxc-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "sa6155-adp-air.dtsi" +#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2"; + compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air"; + qcom,msm-id = <377 0x0>, <380 0>; + qcom,board-id = <0x03020019 0>; +}; diff --git a/qcom/sa8155-adp-star-overlay.dts b/qcom/sa8155-adp-star-overlay.dts index 13d64ac124da..7a9369b949a0 100644 --- a/qcom/sa8155-adp-star-overlay.dts +++ b/qcom/sa8155-adp-star-overlay.dts @@ -2,6 +2,7 @@ /plugin/; #include "sa8155-adp-star.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "ADP-STAR"; diff --git a/qcom/sa8155-adp-star.dts b/qcom/sa8155-adp-star.dts index 1be5c92116a7..b6a703a985b5 100644 --- a/qcom/sa8155-adp-star.dts +++ b/qcom/sa8155-adp-star.dts @@ -2,6 +2,7 @@ #include "sa8155-v1.dtsi" #include "sa8155-adp-star.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8155 ADP-STAR"; diff --git a/qcom/sa8155-adp-star.dtsi b/qcom/sa8155-adp-star.dtsi index 3fd19bf8fb86..bf2bd25f3846 100644 --- a/qcom/sa8155-adp-star.dtsi +++ b/qcom/sa8155-adp-star.dtsi @@ -1 +1,2 @@ #include "sa8155-adp-common.dtsi" +#include "display/sa8155-adp-star-display.dtsi" diff --git a/qcom/sa8155-v2-adp-air-lxc-overlay.dts b/qcom/sa8155-v2-adp-air-lxc-overlay.dts new file mode 100644 index 000000000000..afc71383d737 --- /dev/null +++ b/qcom/sa8155-v2-adp-air-lxc-overlay.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; + +#include "sa8155-adp-common.dtsi" +#include "display/sa8155-adp-star-display.dtsi" +#include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "ADP-AIR"; + compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155", + "qcom,adp-air"; + qcom,board-id = <0X01000019 0>; +}; diff --git a/qcom/sa8155-v2-adp-air-overlay.dts b/qcom/sa8155-v2-adp-air-overlay.dts index a342483d71af..9512d6154682 100644 --- a/qcom/sa8155-v2-adp-air-overlay.dts +++ b/qcom/sa8155-v2-adp-air-overlay.dts @@ -2,6 +2,8 @@ /plugin/; #include "sa8155-adp-common.dtsi" +#include "display/sa8155-adp-star-display.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "ADP-AIR"; diff --git a/qcom/sa8155-v2-adp-air.dts b/qcom/sa8155-v2-adp-air.dts index c0c93a3a12ac..fb99004d2e49 100644 --- a/qcom/sa8155-v2-adp-air.dts +++ b/qcom/sa8155-v2-adp-air.dts @@ -2,6 +2,8 @@ #include "sa8155-v2.dtsi" #include "sa8155-adp-common.dtsi" +#include "display/sa8155-adp-star-display.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8155 V2 ADP AIR"; diff --git a/qcom/sa8155-v2-adp-star.dts b/qcom/sa8155-v2-adp-star.dts index bb5b257a53a3..59fd12b62ecb 100644 --- a/qcom/sa8155-v2-adp-star.dts +++ b/qcom/sa8155-v2-adp-star.dts @@ -2,6 +2,7 @@ #include "sa8155-v2.dtsi" #include "sa8155-adp-star.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8155 V2 ADP STAR"; diff --git a/qcom/sa8155p-adp-star-overlay.dts b/qcom/sa8155p-adp-star-overlay.dts index db8d3b48f01e..9c32e380748e 100644 --- a/qcom/sa8155p-adp-star-overlay.dts +++ b/qcom/sa8155p-adp-star-overlay.dts @@ -2,6 +2,7 @@ /plugin/; #include "sa8155-adp-star.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "ADP-STAR"; diff --git a/qcom/sa8155p-adp-star.dts b/qcom/sa8155p-adp-star.dts index 3472b77f72c0..a6f77a6b13e2 100644 --- a/qcom/sa8155p-adp-star.dts +++ b/qcom/sa8155p-adp-star.dts @@ -2,6 +2,7 @@ #include "sa8155p.dtsi" #include "sa8155-adp-star.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8155P ADP-STAR"; diff --git a/qcom/sa8155p-v2-adp-air-lxc-overlay.dts b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts new file mode 100644 index 000000000000..08e7c1a4b79a --- /dev/null +++ b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; + +#include "sa8155-adp-common.dtsi" +#include "display/sa8155-adp-star-display.dtsi" +#include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "ADP-AIR"; + compatible = "qcom,sa8155p-v2-adp-air", "qcom,sa8155p", + "qcom,adp-air"; + qcom,board-id = <0x01000019 0>; +}; diff --git a/qcom/sa8155p-v2-adp-air-overlay.dts b/qcom/sa8155p-v2-adp-air-overlay.dts index 57ac3cae9aff..fd881bfdaa06 100644 --- a/qcom/sa8155p-v2-adp-air-overlay.dts +++ b/qcom/sa8155p-v2-adp-air-overlay.dts @@ -2,6 +2,8 @@ /plugin/; #include "sa8155-adp-common.dtsi" +#include "display/sa8155-adp-star-display.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "ADP-AIR"; diff --git a/qcom/sa8155p-v2-adp-air.dts b/qcom/sa8155p-v2-adp-air.dts index 954e155b7673..56731ff9e3af 100644 --- a/qcom/sa8155p-v2-adp-air.dts +++ b/qcom/sa8155p-v2-adp-air.dts @@ -2,6 +2,8 @@ #include "sa8155p-v2.dtsi" #include "sa8155-adp-common.dtsi" +#include "display/sa8155-adp-star-display.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8155P V2 ADP AIR"; diff --git a/qcom/sa8155p-v2-adp-star.dts b/qcom/sa8155p-v2-adp-star.dts index ef21fb5e1883..4f9780a53a42 100644 --- a/qcom/sa8155p-v2-adp-star.dts +++ b/qcom/sa8155p-v2-adp-star.dts @@ -2,6 +2,7 @@ #include "sa8155p-v2.dtsi" #include "sa8155-adp-star.dtsi" +#include "display/sa8155-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8155P V2 ADP STAR"; diff --git a/qcom/sa8195p-adp-star-overlay.dts b/qcom/sa8195p-adp-star-overlay.dts index e6ae85d95bf7..dc01d9417bc5 100644 --- a/qcom/sa8195p-adp-star-overlay.dts +++ b/qcom/sa8195p-adp-star-overlay.dts @@ -2,6 +2,7 @@ /plugin/; #include "sa8195p-adp-star.dtsi" +#include "display/sa8195p-adp-star-display-shd.dtsi" / { model = "ADP-STAR"; diff --git a/qcom/sa8195p-adp-star.dts b/qcom/sa8195p-adp-star.dts index 6183b7cb3c68..6e00a1813e86 100644 --- a/qcom/sa8195p-adp-star.dts +++ b/qcom/sa8195p-adp-star.dts @@ -2,6 +2,7 @@ #include "sa8195p.dtsi" #include "sa8195p-adp-common.dtsi" +#include "display/sa8195p-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8195P ADP-STAR"; diff --git a/qcom/sa8195p-adp-star.dtsi b/qcom/sa8195p-adp-star.dtsi index ec4afde21db4..91b92282255e 100644 --- a/qcom/sa8195p-adp-star.dtsi +++ b/qcom/sa8195p-adp-star.dtsi @@ -1 +1,2 @@ #include "sa8195p-adp-common.dtsi" +#include "display/sa8195p-adp-star-display.dtsi" diff --git a/qcom/sa8195p-v2-adp-air-lxc-overlay.dts b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts new file mode 100644 index 000000000000..1d57b6a2338b --- /dev/null +++ b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts @@ -0,0 +1,19 @@ +/dts-v1/; +/plugin/; + +#include "sa8195p-adp-common.dtsi" +#include "display/sa8195p-adp-star-display.dtsi" +#include "display/sa8195p-v2-adp-air-display-lxc-shd.dtsi" + +/ { + model = "ADP-AIR"; + compatible = "qcom,sa8195p-v2-adp-air", "qcom,sa8195p", + "qcom,adp-air"; + qcom,board-id = <0x02010019 0>; +}; + +&qupv3_se0_spi { + can-controller@0 { + status = "disabled"; + }; +}; diff --git a/qcom/sa8195p-v2-adp-air-overlay.dts b/qcom/sa8195p-v2-adp-air-overlay.dts index dd8060574532..9b3cf9300f5f 100644 --- a/qcom/sa8195p-v2-adp-air-overlay.dts +++ b/qcom/sa8195p-v2-adp-air-overlay.dts @@ -2,6 +2,8 @@ /plugin/; #include "sa8195p-v2-adp-air.dtsi" +#include "display/sa8195p-adp-star-display.dtsi" +#include "display/sa8195p-adp-star-display-shd.dtsi" / { model = "ADP-AIR"; diff --git a/qcom/sa8195p-v2-adp-air.dts b/qcom/sa8195p-v2-adp-air.dts index 398606ccb6e2..f2b96c2ca359 100644 --- a/qcom/sa8195p-v2-adp-air.dts +++ b/qcom/sa8195p-v2-adp-air.dts @@ -2,6 +2,8 @@ #include "sa8195p.dtsi" #include "sa8195p-adp-common.dtsi" +#include "display/sa8195p-adp-star-display.dtsi" +#include "display/sa8195p-adp-star-display-shd.dtsi" / { model = "Qualcomm Technologies, Inc. SA8195P V2 ADP AIR"; diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi index 998ff5dd5e3e..665cf3e50d8d 100644 --- a/qcom/sdmshrike.dtsi +++ b/qcom/sdmshrike.dtsi @@ -439,6 +439,9 @@ soc: soc { }; }; +#include "display/sdmshrike-sde-pll.dtsi" +#include "display/sdmshrike-sde.dtsi" + &soc { #address-cells = <1>; #size-cells = <1>; diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index 67f6e7653491..cee47b76149d 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -442,6 +442,9 @@ }; }; +#include "display/sm8150-sde.dtsi" +#include "display/sm8150-sde-pll.dtsi" + &soc { #address-cells = <1>; #size-cells = <1>;