diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt index 23daa4e8..d80d2750 100644 --- a/bindings/arm/msm/msm.txt +++ b/bindings/arm/msm/msm.txt @@ -105,7 +105,7 @@ SoCs: compatible = "qcom,parrot", "qcom,parrotp" - ANORAK - compatible = "qcom,anorak" + compatible = "qcom,anorak", "qcom,anorakp" - RAVELIN compatible = "qcom,ravelin", "qcom,ravelinp" @@ -314,6 +314,9 @@ compatible = "qcom,anorak-rumi" compatible = "qcom,anorak-idp" compatible = "qcom,anorak-qxr" compatible = "qcom,anorak-atp" +compatible = "qcom,anorakp-idp" +compatible = "qcom,anorakp-qxr" +compatible = "qcom,anorakp-atp" compatible = "qcom,ravelin-rumi" compatible = "qcom,ravelin-atp" compatible = "qcom,ravelin-idp" diff --git a/bindings/cnss/icnss.txt b/bindings/cnss/icnss.txt index 77db7afc..75456104 100644 --- a/bindings/cnss/icnss.txt +++ b/bindings/cnss/icnss.txt @@ -40,6 +40,7 @@ Optional properties: - qcom,vreg_ol_cpr: Specifies voltage regulator used for OL CPR vote - qcom,pon-gpio-control: Boolean context flag to enable PMIC GPIO based power sequence trigger via SPMI + - wcn-hw-version: Parameter to differentiate between different WCN HW Versions WLAN SMP2P sub nodes diff --git a/bindings/gpio/st,st54spi_gpio.txt b/bindings/gpio/st,st54spi_gpio.txt new file mode 100644 index 00000000..b7a8362e --- /dev/null +++ b/bindings/gpio/st,st54spi_gpio.txt @@ -0,0 +1,14 @@ +ST Embedded Secure Element (eSE) GPIO + +Required properties: + - compatible: "st,st54spi_gpio" + - gpio-power_nreset: GPIO pin for reset. + +Example: + + st54spi_gpio { + status = "ok"; + compatible = "st,st54spi_gpio"; + /* gpio used as SE_nRESET */ + gpio-power_nreset = <&tlmm 48 0x00>; + }; diff --git a/bindings/pci/pci-msm.txt b/bindings/pci/pci-msm.txt index 28dbdcb3..21872544 100644 --- a/bindings/pci/pci-msm.txt +++ b/bindings/pci/pci-msm.txt @@ -423,6 +423,17 @@ interconnects: value type: Definition: Offset from PCIe PHY base to dump pcie phy status registers +- qcom,phy-aux-clk-config1-offset: + Usage: required + Value type: + Definition: Offset from PCIe PHY aux clk config register to disable FLL + +- qcom,phy-pll-clk-enable1-offset: + Usage: required + Value type: + Definition: ffset from PCIe PHY base to enable ext clk buf mux to + eliminate VDDA leakage + ============== Root port node ============== @@ -587,3 +598,66 @@ Example qcom,iommu-cfg = <0x3> /* SMMU PRESENT. SET S1 BYPASS */ qcom,iommu-range = <0x0 0x10000000 0x0 0x40000000>; }; + +============== +i2c child node +============== + +- compatible: + Usage: required + Value type: + Definition: Compatible list, contains + - "qcom,pcie-i2c-ntn3" for NTN3 switch attached to Root port 0 + +- reg: + Usage: required + Value type: + Definition: i2c slave id + +- gpio-config-reg: + Usage: optional + Value type: + Definition: Slave GPIO configuration register address + +- ep-reset-reg: + Usage: optional + Value type: + Definition: Slave endpoint reset register address + +- ep-reset-gpio-mask: + Usage: optional + Value type: + Definition: Slave GPIO number as 32-bit mask + +- dump-regs: + Usage: optional + Value Type: Array of + Definition: List of slave registers to dump by i2c read + +- version-reg: + Usage: optional + Value type: + Definition: Register to find ntn3 switch version + +- force-i2c-setting: + Usage: optional + Value type: + Definition: If force-i2c-setting flag is set + then de_emphasis settings are updated + irrespective of the chip version via i2c_writes +======= +Example +======= + +&i2c_5 { + pcie_i2c_ctrl: pcie_i2c_ctrl { + compatible = "qcom,pcie-i2c-ntn3"; + reg = <0x77>; + gpio-config-reg = <0x801208>; + ep-reset-reg = <0x801210>; + ep-reset-gpio-mask = <0xf>; + dump-regs = <0x801330 0x801350 0x801370>; + version-reg = <0x800000>; + force-i2c-setting; + }; +}; diff --git a/bindings/soc/qcom/qcom,crypto.txt b/bindings/soc/qcom/qcom,crypto.txt new file mode 100644 index 00000000..3d468a88 --- /dev/null +++ b/bindings/soc/qcom/qcom,crypto.txt @@ -0,0 +1,17 @@ +QTI Microdump Collector Driver + +This driver registers for Hibernate Power Management ops +and notifys TZ on Hibernate exit. + +- compatible: + Usage: required + Value type: + Definition: must be "qcom,crypto" + += EXAMPLE + +&soc { + crypto_node { + compatible = "qcom,crypto"; + }; +}; diff --git a/bindings/soc/qcom/qcom,power-state.txt b/bindings/soc/qcom/qcom,power-state.txt new file mode 100644 index 00000000..2fe83749 --- /dev/null +++ b/bindings/soc/qcom/qcom,power-state.txt @@ -0,0 +1,28 @@ +* Qualcomm Technologies, Inc. Power State Driver + +This binding describes the Qualcomm Technologies, Inc. Power State Driver. Power +State creates power_state device node for user space communication. User space +client can open device node for communication and driver accordingly handles the +request. + +Required Properties: + +- compatible: + Usage: required + Value type: + Definition: must be "qcom,power-state" +- subsys-name: + Usage: required + Value type: + Description: subsystem names supported +- rproc-handle: + Usage: required + Description: phandle to subsys defined in subsys-name. + +Example: + + qcom,power-state { + compatible = "qcom,power-state"; + qcom,subsys-name = "adsp", "modem"; + qcom,rproc-handle = <&adsp_pas>, <&modem_pas>; + }; diff --git a/qcom/Makefile b/qcom/Makefile index 8f62fb59..69e651cc 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -422,7 +422,13 @@ dtbo-$(CONFIG_ARCH_PARROT) += parrot-rumi-overlay.dtbo \ parrot-qrd-wcn6750-overlay.dtbo \ parrot-qrd-wcn6750-4gb-overlay.dtbo \ parrot-qrd-nopmi-overlay.dtbo \ - parrot-qrd-pm8350b-overlay.dtbo + parrot-qrd-pm8350b-overlay.dtbo \ + parrot-idp-wcn6755-amoled-rcm-overlay.dtbo \ + parrot-idp-wcn6755-overlay.dtbo \ + parrot-qrd-wcn6755-overlay.dtbo \ + parrot-idp-wcn6755-pm8350b-overlay.dtbo \ + parrot-idp-wcn6755-nopmi-overlay.dtbo + parrot-rumi-overlay.dtbo-base := parrot.dtb parrot-atp-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb @@ -444,6 +450,11 @@ parrot-qrd-wcn6750-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb par parrot-qrd-wcn6750-4gb-overlay.dtbo-base := parrot-4gb.dtb parrot-qrd-nopmi-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb parrot-qrd-pm8350b-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb +parrot-idp-wcn6755-amoled-rcm-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb +parrot-idp-wcn6755-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb +parrot-qrd-wcn6755-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb +parrot-idp-wcn6755-pm8350b-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb +parrot-idp-wcn6755-nopmi-overlay.dtbo-base := parrot.dtb parrotp.dtb parrot-sg.dtb parrotp-sg.dtb else dtb-$(CONFIG_ARCH_PARROT) += parrot-rumi.dtb \ parrot-atp.dtb \ @@ -500,7 +511,27 @@ dtb-$(CONFIG_ARCH_PARROT) += parrot-rumi.dtb \ parrotp-sg-qrd.dtb \ parrotp-sg-qrd-wcn6750.dtb \ parrotp-sg-qrd-nopmi.dtb \ - parrotp-sg-qrd-pm8350b.dtb + parrotp-sg-qrd-pm8350b.dtb \ + parrot-idp-wcn6755-amoled-rcm.dtb \ + parrot-idp-wcn6755.dtb \ + parrot-qrd-wcn6755.dtb \ + parrot-idp-wcn6755-pm8350b.dtb \ + parrot-idp-wcn6755-nopmi.dtb \ + parrot-sg-idp-wcn6755-nopmi.dtb \ + parrot-sg-idp-wcn6755-amoled-rcm.dtb \ + parrot-sg-qrd-wcn6755.dtb \ + parrot-sg-idp-wcn6755.dtb \ + parrot-sg-idp-wcn6755-pm8350b.dtb \ + parrotp-sg-qrd-wcn6755.dtb \ + parrotp-sg-idp-wcn6755-nopmi.dtb \ + parrotp-sg-idp-wcn6755.dtb \ + parrotp-sg-idp-wcn6755-pm8350b.dtb \ + parrotp-sg-idp-wcn6755-amoled-rcm.dtb \ + parrotp-idp-wcn6755-amoled-rcm.dtb \ + parrotp-idp-wcn6755-pm8350b.dtb \ + parrotp-idp-wcn6755-nopmi.dtb \ + parrotp-idp-wcn6755.dtb \ + parrotp-qrd-wcn6755.dtb endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) @@ -561,7 +592,6 @@ dtbo-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi-overlay.dtbo \ ravelin-qrd-4gb-overlay.dtbo \ montague-rumi-overlay.dtbo \ montague-hsp-overlay.dtbo \ - montague-talyn-overlay.dtbo \ montague-moselle-overlay.dtbo \ montague-rcm-overlay.dtbo \ montague-wsa-overlay.dtbo \ @@ -571,15 +601,14 @@ dtbo-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi-overlay.dtbo \ montague-apache-overlay.dtbo ravelin-rumi-overlay.dtbo-base := ravelin.dtb montague.dtb -ravelin-atp-overlay.dtbo-base := ravelin.dtb ravelinp.dtb montague.dtb montaguep.dtb -ravelin-idp-overlay.dtbo-base := ravelin.dtb ravelinp.dtb montague.dtb montaguep.dtb -ravelin-idp-wcn3988-4gb-overlay.dtbo-base := ravelin-4gb.dtb ravelinp-4gb.dtb -ravelin-idp-wcn3950-amoled-rcm-overlay.dtbo-base := ravelin.dtb ravelinp.dtb montague.dtb montaguep.dtb -ravelin-qrd-overlay.dtbo-base := ravelin.dtb ravelinp.dtb montague.dtb montaguep.dtb -ravelin-qrd-4gb-overlay.dtbo-base := ravelin-4gb.dtb ravelinp-4gb.dtb montague.dtb montaguep.dtb +ravelin-atp-overlay.dtbo-base := ravelin.dtb ravelinp.dtb ravelin-sg.dtb ravelinp-sg.dtb montague.dtb montaguep.dtb +ravelin-idp-overlay.dtbo-base := ravelin.dtb ravelinp.dtb ravelin-sg.dtb ravelinp-sg.dtb montague.dtb montaguep.dtb +ravelin-idp-wcn3988-4gb-overlay.dtbo-base := ravelin-4gb.dtb ravelinp-4gb.dtb ravelin-sg.dtb ravelinp-sg.dtb +ravelin-idp-wcn3950-amoled-rcm-overlay.dtbo-base := ravelin.dtb ravelinp.dtb ravelin-sg.dtb ravelinp-sg.dtb montague.dtb montaguep.dtb +ravelin-qrd-overlay.dtbo-base := ravelin.dtb ravelinp.dtb ravelin-sg.dtb ravelinp-sg.dtb montague.dtb montaguep.dtb +ravelin-qrd-4gb-overlay.dtbo-base := ravelin-4gb.dtb ravelinp-4gb.dtb ravelin-sg.dtb ravelinp-sg.dtb montague.dtb montaguep.dtb montague-rumi-overlay.dtbo-base := montague.dtb montaguep.dtb montague-hsp-overlay.dtbo-base := montague.dtb montaguep.dtb -montague-talyn-overlay.dtbo-base := montague-talyn.dtb montaguep.dtb montague-moselle-overlay.dtbo-base := montague-4gb.dtb montaguep-4gb.dtb montague.dtb montaguep.dtb montague-rcm-overlay.dtbo-base := montague.dtb montaguep.dtb montague-wsa-overlay.dtbo-base := montague.dtb montaguep.dtb @@ -601,9 +630,20 @@ dtb-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi.dtb \ ravelinp-idp-wcn3950-amoled-rcm.dtb \ ravelinp-qrd.dtb \ ravelinp-qrd-4gb.dtb \ + ravelin-sg-atp.dtb \ + ravelin-sg-idp.dtb \ + ravelin-sg-idp-wcn3950-amoled-rcm.dtb \ + ravelin-sg-idp-wcn3988-4gb.dtb \ + ravelin-sg-qrd.dtb \ + ravelin-sg-qrd-4gb.dtb \ + ravelinp-sg-atp.dtb \ + ravelinp-sg-idp.dtb \ + ravelinp-sg-idp-wcn3950-amoled-rcm.dtb \ + ravelinp-sg-idp-wcn3988-4gb.dtb \ + ravelinp-sg-qrd.dtb \ + ravelinp-sg-qrd-4gb.dtb \ montague-rumi.dtb \ montague-hsp.dtb \ - montague-talyn.dtb \ montague-moselle.dtb \ montague-rcm.dtb \ montaguep-rumi.dtb \ @@ -656,6 +696,7 @@ dtbo-$(CONFIG_ARCH_ANORAK) += anorak-rumi-overlay.dtbo \ anorak-idp-hmt-overlay.dtbo \ anorak-qxr-hmt-ufs-ref-overlay.dtbo \ anorak-qxr-4kdisp-hmt-ufs-ref-overlay.dtbo \ + anorakp-qxr-4kdisp-hmt-ufs-ref-overlay.dtbo \ anorak-qxr-hmt-overlay.dtbo \ anorak-idp-sd-overlay.dtbo \ anorak-idp-top-hmt-overlay.dtbo \ @@ -664,19 +705,20 @@ dtbo-$(CONFIG_ARCH_ANORAK) += anorak-rumi-overlay.dtbo \ anorak-idp-4kdisp-hmt-overlay.dtbo \ anorak-idp-hsp-nodisplay-overlay.dtbo anorak-rumi-overlay.dtbo-base := anorak.dtb -anorak-idp-overlay.dtbo-base := anorak.dtb -anorak-qxr-overlay.dtbo-base := anorak.dtb -anorak-atp-overlay.dtbo-base := anorak.dtb -anorak-idp-hmt-overlay.dtbo-base := anorak.dtb -anorak-qxr-hmt-ufs-ref-overlay.dtbo-base := anorak.dtb -anorak-qxr-4kdisp-hmt-ufs-ref-overlay.dtbo-base := anorak.dtb -anorak-qxr-hmt-overlay.dtbo-base := anorak.dtb -anorak-idp-sd-overlay.dtbo-base := anorak.dtb -anorak-idp-top-hmt-overlay.dtbo-base := anorak.dtb -anorak-idp-top-hsp-overlay.dtbo-base := anorak.dtb -anorak-idp-4kdisp-hsp-overlay.dtbo-base := anorak.dtb -anorak-idp-4kdisp-hmt-overlay.dtbo-base := anorak.dtb -anorak-idp-hsp-nodisplay-overlay.dtbo-base := anorak.dtb +anorak-idp-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-qxr-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-atp-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-idp-hmt-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-qxr-hmt-ufs-ref-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-qxr-4kdisp-hmt-ufs-ref-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorakp-qxr-4kdisp-hmt-ufs-ref-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-qxr-hmt-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-idp-sd-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-idp-top-hmt-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-idp-top-hsp-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-idp-4kdisp-hsp-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-idp-4kdisp-hmt-overlay.dtbo-base := anorak.dtb anorakp.dtb +anorak-idp-hsp-nodisplay-overlay.dtbo-base := anorak.dtb anorakp.dtb else dtb-$(CONFIG_ARCH_ANORAK) += anorak-rumi.dtb \ anorak-idp.dtb \ @@ -691,7 +733,20 @@ dtb-$(CONFIG_ARCH_ANORAK) += anorak-rumi.dtb \ anorak-idp-top-hsp.dtb \ anorak-idp-4kdisp-hsp.dtb \ anorak-idp-4kdisp-hmt.dtb \ - anorak-idp-hsp-nodisplay.dtb + anorak-idp-hsp-nodisplay.dtb \ + anorakp-idp.dtb \ + anorakp-qxr.dtb \ + anorakp-atp.dtb \ + anorakp-idp-hmt.dtb \ + anorakp-qxr-hmt-ufs-ref.dtb \ + anorakp-qxr-4kdisp-hmt-ufs-ref.dtb \ + anorakp-qxr-hmt.dtb \ + anorakp-idp-sd.dtb \ + anorakp-idp-top-hmt.dtb \ + anorakp-idp-top-hsp.dtb \ + anorakp-idp-4kdisp-hsp.dtb \ + anorakp-idp-4kdisp-hmt.dtb \ + anorakp-idp-hsp-nodisplay.dtb endif ifeq ($(CONFIG_ARCH_LAHAINA), y) diff --git a/qcom/anorak-atp-overlay.dts b/qcom/anorak-atp-overlay.dts index 3b1acca2..a766c933 100644 --- a/qcom/anorak-atp-overlay.dts +++ b/qcom/anorak-atp-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak ATP"; compatible = "qcom,anorak-atp", "qcom,anorak", "qcom,atp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10021 0x0>; }; diff --git a/qcom/anorak-atp.dtsi b/qcom/anorak-atp.dtsi index 267fab24..0727e170 100644 --- a/qcom/anorak-atp.dtsi +++ b/qcom/anorak-atp.dtsi @@ -166,34 +166,6 @@ status = "disabled"; }; -&cnss_pins { - cnss_host_sol_default: cnss_host_sol_default { - mux { - pins = "gpio124"; - function = "gpio"; - }; - - config { - pins = "gpio124"; - drive-strength = <4>; - bias-pull-down; - }; - }; - - cnss_dev_sol_default: cnss_dev_sol_default { - mux { - pins = "gpio123"; - function = "gpio"; - }; - - config { - pins = "gpio123"; - drive-strength = <4>; - bias-pull-down; - }; - }; -}; - &soc { wlan_kiwi: qcom,cnss-kiwi@b0000000 { @@ -201,13 +173,10 @@ reg = <0xb0000000 0x10000>; reg-names = "smmu_iova_ipa"; wlan-en-gpio = <&tlmm 120 0>; - wlan-host-sol-gpio = <&tlmm 124 0>; - wlan-dev-sol-gpio = <&tlmm 123 0>; - pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sol_default"; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; pinctrl-0 = <&cnss_wlan_en_active>; pinctrl-1 = <&cnss_wlan_en_sleep>; - pinctrl-2 = <&cnss_host_sol_default &cnss_dev_sol_default>; qcom,wlan; qcom,wlan-rc-num = <0>; qcom,wlan-ramdump-dynamic = <0x780000>; diff --git a/qcom/anorak-gpu.dtsi b/qcom/anorak-gpu.dtsi index 2637387c..883544df 100644 --- a/qcom/anorak-gpu.dtsi +++ b/qcom/anorak-gpu.dtsi @@ -37,8 +37,6 @@ qcom,chipid = <0x43050b00>; - qcom,initial-pwrlevel = <9>; - qcom,no-nap; qcom,min-access-length = <32>; @@ -77,130 +75,558 @@ }; /* Power levels */ - qcom,gpu-pwrlevels { + qcom,gpu-pwrlevel-bins { #address-cells = <1>; #size-cells = <0>; - compatible = "qcom,gpu-pwrlevels"; + compatible = "qcom,gpu-pwrlevel-bins"; - qcom,gpu-pwrlevel@0 { - reg = <0>; - qcom,gpu-freq = <690000000>; - qcom,level = ; + qcom,gpu-pwrlevels-0 { + #address-cells = <1>; + #size-cells = <0>; - qcom,bus-freq = <9>; - qcom,bus-min = <9>; - qcom,bus-max = <9>; + qcom,speed-bin = <0>; + qcom,initial-pwrlevel = <9>; - qcom,acd-level = <0xa82c5ffd>; + qcom,gpu-pwrlevel@0 { + reg = <0>; + qcom,gpu-freq = <690000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <9>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xa82c5ffd>; + }; + + qcom,gpu-pwrlevel@1 { + reg = <1>; + qcom,gpu-freq = <640000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@2 { + reg = <2>; + qcom,gpu-freq = <599000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@3 { + reg = <3>; + qcom,gpu-freq = <545000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@4 { + reg = <4>; + qcom,gpu-freq = <492000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@5 { + reg = <5>; + qcom,gpu-freq = <456000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@6 { + reg = <6>; + qcom,gpu-freq = <421000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@7 { + reg = <7>; + qcom,gpu-freq = <350000000>; + qcom,level = ; + + qcom,bus-freq = <7>; + qcom,bus-min = <4>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@8 { + reg = <8>; + qcom,gpu-freq = <317000000>; + qcom,level = ; + + qcom,bus-freq = <5>; + qcom,bus-min = <2>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@9 { + reg = <9>; + qcom,gpu-freq = <285000000>; + qcom,level = ; + + qcom,bus-freq = <1>; + qcom,bus-min = <1>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xe02a5ffd>; + }; }; - qcom,gpu-pwrlevel@1 { - reg = <1>; - qcom,gpu-freq = <640000000>; - qcom,level = ; + qcom,gpu-pwrlevels-1 { + #address-cells = <1>; + #size-cells = <0>; - qcom,bus-freq = <9>; - qcom,bus-min = <5>; - qcom,bus-max = <9>; + qcom,speed-bin = <146>; + qcom,initial-pwrlevel = <9>; - qcom,acd-level = <0x882e5ffd>; + qcom,gpu-pwrlevel@0 { + reg = <0>; + qcom,gpu-freq = <690000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <9>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xa82c5ffd>; + }; + + qcom,gpu-pwrlevel@1 { + reg = <1>; + qcom,gpu-freq = <640000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@2 { + reg = <2>; + qcom,gpu-freq = <599000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@3 { + reg = <3>; + qcom,gpu-freq = <545000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@4 { + reg = <4>; + qcom,gpu-freq = <492000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@5 { + reg = <5>; + qcom,gpu-freq = <456000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@6 { + reg = <6>; + qcom,gpu-freq = <421000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@7 { + reg = <7>; + qcom,gpu-freq = <350000000>; + qcom,level = ; + + qcom,bus-freq = <7>; + qcom,bus-min = <4>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@8 { + reg = <8>; + qcom,gpu-freq = <317000000>; + qcom,level = ; + + qcom,bus-freq = <5>; + qcom,bus-min = <2>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@9 { + reg = <9>; + qcom,gpu-freq = <285000000>; + qcom,level = ; + + qcom,bus-freq = <1>; + qcom,bus-min = <1>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xe02a5ffd>; + }; }; - qcom,gpu-pwrlevel@2 { - reg = <2>; - qcom,gpu-freq = <599000000>; - qcom,level = ; + qcom,gpu-pwrlevels-2 { + #address-cells = <1>; + #size-cells = <0>; - qcom,bus-freq = <9>; - qcom,bus-min = <5>; - qcom,bus-max = <9>; + qcom,speed-bin = <167>; + qcom,initial-pwrlevel = <12>; - qcom,acd-level = <0x882e5ffd>; + qcom,gpu-pwrlevel@0 { + reg = <0>; + qcom,gpu-freq = <788000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <9>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882c5ffd>; + }; + + qcom,gpu-pwrlevel@1 { + reg = <1>; + qcom,gpu-freq = <750000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <9>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xa82c5ffd>; + }; + + qcom,gpu-pwrlevel@2 { + reg = <2>; + qcom,gpu-freq = <730000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <8>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xa82c5ffd>; + }; + + qcom,gpu-pwrlevel@3 { + reg = <3>; + qcom,gpu-freq = <690000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <7>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xa82c5ffd>; + }; + + qcom,gpu-pwrlevel@4 { + reg = <4>; + qcom,gpu-freq = <640000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@5 { + reg = <5>; + qcom,gpu-freq = <599000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@6 { + reg = <6>; + qcom,gpu-freq = <545000000>; + qcom,level = ; + + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@7 { + reg = <7>; + qcom,gpu-freq = <492000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@8 { + reg = <8>; + qcom,gpu-freq = <456000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@9 { + reg = <9>; + qcom,gpu-freq = <421000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@10 { + reg = <10>; + qcom,gpu-freq = <350000000>; + qcom,level = ; + + qcom,bus-freq = <7>; + qcom,bus-min = <4>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@11 { + reg = <11>; + qcom,gpu-freq = <317000000>; + qcom,level = ; + + qcom,bus-freq = <5>; + qcom,bus-min = <2>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@12 { + reg = <12>; + qcom,gpu-freq = <285000000>; + qcom,level = ; + + qcom,bus-freq = <1>; + qcom,bus-min = <1>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xe02a5ffd>; + }; }; - qcom,gpu-pwrlevel@3 { - reg = <3>; - qcom,gpu-freq = <545000000>; - qcom,level = ; + qcom,gpu-pwrlevels-3 { + #address-cells = <1>; + #size-cells = <0>; - qcom,bus-freq = <9>; - qcom,bus-min = <5>; - qcom,bus-max = <9>; + qcom,speed-bin = <168>; + qcom,initial-pwrlevel = <9>; - qcom,acd-level = <0x882e5ffd>; - }; + qcom,gpu-pwrlevel@0 { + reg = <0>; + qcom,gpu-freq = <690000000>; + qcom,level = ; - qcom,gpu-pwrlevel@4 { - reg = <4>; - qcom,gpu-freq = <492000000>; - qcom,level = ; + qcom,bus-freq = <9>; + qcom,bus-min = <9>; + qcom,bus-max = <9>; - qcom,bus-freq = <8>; - qcom,bus-min = <5>; - qcom,bus-max = <9>; + qcom,acd-level = <0xa82c5ffd>; + }; - qcom,acd-level = <0x882e5ffd>; - }; + qcom,gpu-pwrlevel@1 { + reg = <1>; + qcom,gpu-freq = <640000000>; + qcom,level = ; - qcom,gpu-pwrlevel@5 { - reg = <5>; - qcom,gpu-freq = <456000000>; - qcom,level = ; + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; - qcom,bus-freq = <8>; - qcom,bus-min = <5>; - qcom,bus-max = <9>; + qcom,acd-level = <0x882e5ffd>; + }; - qcom,acd-level = <0x882e5ffd>; - }; + qcom,gpu-pwrlevel@2 { + reg = <2>; + qcom,gpu-freq = <599000000>; + qcom,level = ; - qcom,gpu-pwrlevel@6 { - reg = <6>; - qcom,gpu-freq = <421000000>; - qcom,level = ; + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; - qcom,bus-freq = <8>; - qcom,bus-min = <5>; - qcom,bus-max = <9>; + qcom,acd-level = <0x882e5ffd>; + }; - qcom,acd-level = <0x882e5ffd>; - }; + qcom,gpu-pwrlevel@3 { + reg = <3>; + qcom,gpu-freq = <545000000>; + qcom,level = ; - qcom,gpu-pwrlevel@7 { - reg = <7>; - qcom,gpu-freq = <350000000>; - qcom,level = ; + qcom,bus-freq = <9>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; - qcom,bus-freq = <7>; - qcom,bus-min = <4>; - qcom,bus-max = <9>; + qcom,acd-level = <0x882e5ffd>; + }; - qcom,acd-level = <0xc0295ffd>; - }; + qcom,gpu-pwrlevel@4 { + reg = <4>; + qcom,gpu-freq = <492000000>; + qcom,level = ; - qcom,gpu-pwrlevel@8 { - reg = <8>; - qcom,gpu-freq = <317000000>; - qcom,level = ; + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; - qcom,bus-freq = <5>; - qcom,bus-min = <2>; - qcom,bus-max = <5>; + qcom,acd-level = <0x882e5ffd>; + }; - qcom,acd-level = <0xc0295ffd>; - }; + qcom,gpu-pwrlevel@5 { + reg = <5>; + qcom,gpu-freq = <456000000>; + qcom,level = ; - qcom,gpu-pwrlevel@9 { - reg = <9>; - qcom,gpu-freq = <285000000>; - qcom,level = ; + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; - qcom,bus-freq = <1>; - qcom,bus-min = <1>; - qcom,bus-max = <5>; + qcom,acd-level = <0x882e5ffd>; + }; - qcom,acd-level = <0xe02a5ffd>; + qcom,gpu-pwrlevel@6 { + reg = <6>; + qcom,gpu-freq = <421000000>; + qcom,level = ; + + qcom,bus-freq = <8>; + qcom,bus-min = <5>; + qcom,bus-max = <9>; + + qcom,acd-level = <0x882e5ffd>; + }; + + qcom,gpu-pwrlevel@7 { + reg = <7>; + qcom,gpu-freq = <350000000>; + qcom,level = ; + + qcom,bus-freq = <7>; + qcom,bus-min = <4>; + qcom,bus-max = <9>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@8 { + reg = <8>; + qcom,gpu-freq = <317000000>; + qcom,level = ; + + qcom,bus-freq = <5>; + qcom,bus-min = <2>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xc0295ffd>; + }; + + qcom,gpu-pwrlevel@9 { + reg = <9>; + qcom,gpu-freq = <285000000>; + qcom,level = ; + + qcom,bus-freq = <1>; + qcom,bus-min = <1>; + qcom,bus-max = <5>; + + qcom,acd-level = <0xe02a5ffd>; + }; }; }; diff --git a/qcom/anorak-idp-4kdisp-hmt-overlay.dts b/qcom/anorak-idp-4kdisp-hmt-overlay.dts index 5f3818e2..fad704f1 100644 --- a/qcom/anorak-idp-4kdisp-hmt-overlay.dts +++ b/qcom/anorak-idp-4kdisp-hmt-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP 4K display + HMT"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x6>; }; diff --git a/qcom/anorak-idp-4kdisp-hsp-overlay.dts b/qcom/anorak-idp-4kdisp-hsp-overlay.dts index 32e42b0c..5fcb2032 100644 --- a/qcom/anorak-idp-4kdisp-hsp-overlay.dts +++ b/qcom/anorak-idp-4kdisp-hsp-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP 4K display + HSP"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x5>; }; diff --git a/qcom/anorak-idp-hmt-overlay.dts b/qcom/anorak-idp-hmt-overlay.dts index 5660b053..b269c1b9 100644 --- a/qcom/anorak-idp-hmt-overlay.dts +++ b/qcom/anorak-idp-hmt-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP HMT"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x1>; }; diff --git a/qcom/anorak-idp-hsp-nodisplay-overlay.dts b/qcom/anorak-idp-hsp-nodisplay-overlay.dts index 821f20bd..79d5a391 100644 --- a/qcom/anorak-idp-hsp-nodisplay-overlay.dts +++ b/qcom/anorak-idp-hsp-nodisplay-overlay.dts @@ -6,7 +6,7 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP HSP with no display"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x7>; }; diff --git a/qcom/anorak-idp-overlay.dts b/qcom/anorak-idp-overlay.dts index b874c5da..f9a9474a 100644 --- a/qcom/anorak-idp-overlay.dts +++ b/qcom/anorak-idp-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x0>; }; diff --git a/qcom/anorak-idp-sd-overlay.dts b/qcom/anorak-idp-sd-overlay.dts index e84d534b..8420f866 100644 --- a/qcom/anorak-idp-sd-overlay.dts +++ b/qcom/anorak-idp-sd-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP Single Display"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x2>; }; diff --git a/qcom/anorak-idp-top-hmt-overlay.dts b/qcom/anorak-idp-top-hmt-overlay.dts index 826764f4..97fb8e5c 100644 --- a/qcom/anorak-idp-top-hmt-overlay.dts +++ b/qcom/anorak-idp-top-hmt-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP Topanga Hamilton"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x3>; }; diff --git a/qcom/anorak-idp-top-hsp-overlay.dts b/qcom/anorak-idp-top-hsp-overlay.dts index f1bb072f..0d7a4db4 100644 --- a/qcom/anorak-idp-top-hsp-overlay.dts +++ b/qcom/anorak-idp-top-hsp-overlay.dts @@ -6,7 +6,7 @@ / { model = "Qualcomm Technologies, Inc. Anorak IDP Topanga with EDP display + HSP"; compatible = "qcom,anorak-idp", "qcom,anorak", "qcom,idp"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10022 0x4>; }; diff --git a/qcom/anorak-pcie.dtsi b/qcom/anorak-pcie.dtsi index f13aef15..ec09f791 100644 --- a/qcom/anorak-pcie.dtsi +++ b/qcom/anorak-pcie.dtsi @@ -665,6 +665,8 @@ qcom,l1-2-th-value = <150>; qcom,pcie-phy-ver = <114>; + qcom,phy-aux-clk-config1-offset = <0x1450>; + qcom,phy-pll-clk-enable1-offset = <0x1048>; qcom,phy-status-offset = <0x1214>; qcom,phy-status-bit = <7>; qcom,phy-power-down-offset = <0x1240>; diff --git a/qcom/anorak-qxr-4kdisp-hmt-ufs-ref.dtsi b/qcom/anorak-qxr-4kdisp-hmt-ufs-ref.dtsi index 2947408e..823191c6 100644 --- a/qcom/anorak-qxr-4kdisp-hmt-ufs-ref.dtsi +++ b/qcom/anorak-qxr-4kdisp-hmt-ufs-ref.dtsi @@ -1 +1,8 @@ #include "anorak-qxr-hmt-ufs-ref.dtsi" + +&k09973 { + ipd,SW_event = <0 1 1 0>; + ipd,SMR_setting = <0>; + ipd,Device_type = <2>; +}; + diff --git a/qcom/anorak-qxr-hmt-overlay.dts b/qcom/anorak-qxr-hmt-overlay.dts index a705e8f5..6b0437fa 100644 --- a/qcom/anorak-qxr-hmt-overlay.dts +++ b/qcom/anorak-qxr-hmt-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak QXR HMT"; compatible = "qcom,anorak-qxr", "qcom,anorak"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10026 0x1>; }; diff --git a/qcom/anorak-qxr-hmt-ufs-ref-overlay.dts b/qcom/anorak-qxr-hmt-ufs-ref-overlay.dts index 5262625b..dd61356a 100644 --- a/qcom/anorak-qxr-hmt-ufs-ref-overlay.dts +++ b/qcom/anorak-qxr-hmt-ufs-ref-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak QXR HMT UFS REF"; compatible = "qcom,anorak-qxr", "qcom,anorak"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10126 0x2>; }; diff --git a/qcom/anorak-qxr-overlay.dts b/qcom/anorak-qxr-overlay.dts index 85dff436..fce26dc3 100644 --- a/qcom/anorak-qxr-overlay.dts +++ b/qcom/anorak-qxr-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Anorak QXR"; compatible = "qcom,anorak-qxr", "qcom,anorak"; - qcom,msm-id = <549 0x10000>; + qcom,msm-id = <549 0x10000>,<649 0x10000>; qcom,board-id = <0x10026 0x0>; }; diff --git a/qcom/anorak-qxr.dtsi b/qcom/anorak-qxr.dtsi index b330e34b..d02fec80 100644 --- a/qcom/anorak-qxr.dtsi +++ b/qcom/anorak-qxr.dtsi @@ -357,6 +357,8 @@ &itof_level { enable-gpio = <&tlmm 87 GPIO_ACTIVE_HIGH>; + regulator-min-microvolt = <4300000>; + regulator-max-microvolt = <4300000>; status = "ok"; }; diff --git a/qcom/anorak.dtsi b/qcom/anorak.dtsi index 3609b287..4f9f0aab 100644 --- a/qcom/anorak.dtsi +++ b/qcom/anorak.dtsi @@ -554,7 +554,6 @@ clock-names = "xo", "alternate"; qcom,lut-row-size = <4>; qcom,skip-enable-check; - qcom,perf-lock-support; interrupts = , ; interrupt-names = "dcvsh0_int", "dcvsh1_int"; diff --git a/qcom/anorakp-atp.dts b/qcom/anorakp-atp.dts new file mode 100644 index 00000000..1664e0a2 --- /dev/null +++ b/qcom/anorakp-atp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP ATP"; + compatible = "qcom,anorakp-atp", "qcom,anorakp", "qcom,atp"; + qcom,board-id = <0x10021 0x0>; +}; diff --git a/qcom/anorakp-atp.dtsi b/qcom/anorakp-atp.dtsi new file mode 100644 index 00000000..13ead3cb --- /dev/null +++ b/qcom/anorakp-atp.dtsi @@ -0,0 +1 @@ +#include "anorak-atp.dtsi" diff --git a/qcom/anorakp-idp-4kdisp-hmt.dts b/qcom/anorakp-idp-4kdisp-hmt.dts new file mode 100644 index 00000000..4b926491 --- /dev/null +++ b/qcom/anorakp-idp-4kdisp-hmt.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp-4kdisp-hmt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP 4K display + HMT"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x6>; +}; diff --git a/qcom/anorakp-idp-4kdisp-hmt.dtsi b/qcom/anorakp-idp-4kdisp-hmt.dtsi new file mode 100644 index 00000000..ddaecc19 --- /dev/null +++ b/qcom/anorakp-idp-4kdisp-hmt.dtsi @@ -0,0 +1 @@ +#include "anorak-idp-4kdisp-hmt.dtsi" diff --git a/qcom/anorakp-idp-4kdisp-hsp.dts b/qcom/anorakp-idp-4kdisp-hsp.dts new file mode 100644 index 00000000..535c0dda --- /dev/null +++ b/qcom/anorakp-idp-4kdisp-hsp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp-4kdisp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP 4K display + HSP"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x5>; +}; diff --git a/qcom/anorakp-idp-4kdisp-hsp.dtsi b/qcom/anorakp-idp-4kdisp-hsp.dtsi new file mode 100644 index 00000000..bb6c3658 --- /dev/null +++ b/qcom/anorakp-idp-4kdisp-hsp.dtsi @@ -0,0 +1 @@ +#include "anorak-idp-4kdisp-hsp.dtsi" diff --git a/qcom/anorakp-idp-hmt.dts b/qcom/anorakp-idp-hmt.dts new file mode 100644 index 00000000..ef79d641 --- /dev/null +++ b/qcom/anorakp-idp-hmt.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp-hmt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP HMT"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x1>; +}; diff --git a/qcom/anorakp-idp-hmt.dtsi b/qcom/anorakp-idp-hmt.dtsi new file mode 100644 index 00000000..ca273aee --- /dev/null +++ b/qcom/anorakp-idp-hmt.dtsi @@ -0,0 +1 @@ +#include "anorak-idp-hmt.dtsi" diff --git a/qcom/anorakp-idp-hsp-nodisplay.dts b/qcom/anorakp-idp-hsp-nodisplay.dts new file mode 100644 index 00000000..f77d6ade --- /dev/null +++ b/qcom/anorakp-idp-hsp-nodisplay.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp-hsp-nodisplay.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP HSP with no display"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x7>; +}; diff --git a/qcom/anorakp-idp-hsp-nodisplay.dtsi b/qcom/anorakp-idp-hsp-nodisplay.dtsi new file mode 100644 index 00000000..449bd4b5 --- /dev/null +++ b/qcom/anorakp-idp-hsp-nodisplay.dtsi @@ -0,0 +1 @@ +#include "anorak-idp-hsp-nodisplay.dtsi" diff --git a/qcom/anorakp-idp-sd.dts b/qcom/anorakp-idp-sd.dts new file mode 100644 index 00000000..55a60398 --- /dev/null +++ b/qcom/anorakp-idp-sd.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp-sd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP Single Display"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x2>; +}; diff --git a/qcom/anorakp-idp-sd.dtsi b/qcom/anorakp-idp-sd.dtsi new file mode 100644 index 00000000..a3ca0ed5 --- /dev/null +++ b/qcom/anorakp-idp-sd.dtsi @@ -0,0 +1 @@ +#include "anorak-idp-sd.dtsi" diff --git a/qcom/anorakp-idp-top-hmt.dts b/qcom/anorakp-idp-top-hmt.dts new file mode 100644 index 00000000..43c41b00 --- /dev/null +++ b/qcom/anorakp-idp-top-hmt.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp-top-hmt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP Topanga Hamilton"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x3>; +}; diff --git a/qcom/anorakp-idp-top-hmt.dtsi b/qcom/anorakp-idp-top-hmt.dtsi new file mode 100644 index 00000000..48d7e622 --- /dev/null +++ b/qcom/anorakp-idp-top-hmt.dtsi @@ -0,0 +1 @@ +#include "anorak-idp-top-hmt.dtsi" diff --git a/qcom/anorakp-idp-top-hsp.dts b/qcom/anorakp-idp-top-hsp.dts new file mode 100644 index 00000000..73f7623b --- /dev/null +++ b/qcom/anorakp-idp-top-hsp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp-top-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP Topanga with EDP display + HSP"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x4>; +}; diff --git a/qcom/anorakp-idp-top-hsp.dtsi b/qcom/anorakp-idp-top-hsp.dtsi new file mode 100644 index 00000000..5cbbc91f --- /dev/null +++ b/qcom/anorakp-idp-top-hsp.dtsi @@ -0,0 +1 @@ +#include "anorak-idp-top-hsp.dtsi" diff --git a/qcom/anorakp-idp.dts b/qcom/anorakp-idp.dts new file mode 100644 index 00000000..c354dffe --- /dev/null +++ b/qcom/anorakp-idp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP IDP"; + compatible = "qcom,anorakp-idp", "qcom,anorakp", "qcom,idp"; + qcom,board-id = <0x10022 0x0>; +}; diff --git a/qcom/anorakp-idp.dtsi b/qcom/anorakp-idp.dtsi new file mode 100644 index 00000000..7883abae --- /dev/null +++ b/qcom/anorakp-idp.dtsi @@ -0,0 +1 @@ +#include "anorak-idp.dtsi" diff --git a/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref-overlay.dts b/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref-overlay.dts new file mode 100644 index 00000000..569f7c22 --- /dev/null +++ b/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "anorakp-qxr-4kdisp-hmt-ufs-ref.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP QXR HMT UFS REF + 4K Display"; + compatible = "qcom,anorakp-qxr", "qcom,anorakp"; + qcom,msm-id = <649 0x10000>; + qcom,board-id = <0x10126 0x3>; +}; diff --git a/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref.dts b/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref.dts new file mode 100644 index 00000000..c01c3525 --- /dev/null +++ b/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-qxr-4kdisp-hmt-ufs-ref.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP QXR HMT UFS REF + 4K Display"; + compatible = "qcom,anorakp-qxr", "qcom,anorakp"; + qcom,board-id = <0x10126 0x3>; +}; diff --git a/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref.dtsi b/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref.dtsi new file mode 100644 index 00000000..e9d80bbe --- /dev/null +++ b/qcom/anorakp-qxr-4kdisp-hmt-ufs-ref.dtsi @@ -0,0 +1 @@ +#include "anorak-qxr-4kdisp-hmt-ufs-ref.dtsi" diff --git a/qcom/anorakp-qxr-hmt-ufs-ref.dts b/qcom/anorakp-qxr-hmt-ufs-ref.dts new file mode 100644 index 00000000..0d9a54c1 --- /dev/null +++ b/qcom/anorakp-qxr-hmt-ufs-ref.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-qxr-hmt-ufs-ref.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP QXR HMT UFS REF"; + compatible = "qcom,anorakp-qxr", "qcom,anorakp"; + qcom,board-id = <0x10126 0x2>; +}; diff --git a/qcom/anorakp-qxr-hmt-ufs-ref.dtsi b/qcom/anorakp-qxr-hmt-ufs-ref.dtsi new file mode 100644 index 00000000..2947408e --- /dev/null +++ b/qcom/anorakp-qxr-hmt-ufs-ref.dtsi @@ -0,0 +1 @@ +#include "anorak-qxr-hmt-ufs-ref.dtsi" diff --git a/qcom/anorakp-qxr-hmt.dts b/qcom/anorakp-qxr-hmt.dts new file mode 100644 index 00000000..c2bf9e7b --- /dev/null +++ b/qcom/anorakp-qxr-hmt.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-qxr-hmt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP QXR HMT"; + compatible = "qcom,anorakp-qxr", "qcom,anorakp"; + qcom,board-id = <0x10026 0x1>; +}; diff --git a/qcom/anorakp-qxr-hmt.dtsi b/qcom/anorakp-qxr-hmt.dtsi new file mode 100644 index 00000000..bf00179b --- /dev/null +++ b/qcom/anorakp-qxr-hmt.dtsi @@ -0,0 +1 @@ +#include "anorak-qxr-hmt.dtsi" diff --git a/qcom/anorakp-qxr.dts b/qcom/anorakp-qxr.dts new file mode 100644 index 00000000..fd377bad --- /dev/null +++ b/qcom/anorakp-qxr.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "anorakp.dtsi" +#include "anorakp-qxr.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP QXR"; + compatible = "qcom,anorakp-qxr", "qcom,anorakp"; + qcom,board-id = <0x10026 0x0>; +}; diff --git a/qcom/anorakp-qxr.dtsi b/qcom/anorakp-qxr.dtsi new file mode 100644 index 00000000..0d7a3630 --- /dev/null +++ b/qcom/anorakp-qxr.dtsi @@ -0,0 +1 @@ +#include "anorak-qxr.dtsi" diff --git a/qcom/anorakp.dts b/qcom/anorakp.dts new file mode 100644 index 00000000..727352f4 --- /dev/null +++ b/qcom/anorakp.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "anorakp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP SoC"; + compatible = "qcom,anorakp"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/anorakp.dtsi b/qcom/anorakp.dtsi new file mode 100644 index 00000000..7da03ed3 --- /dev/null +++ b/qcom/anorakp.dtsi @@ -0,0 +1,7 @@ +#include "anorak.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. AnorakP"; + compatible = "qcom,anorakp"; + qcom,msm-id = <649 0x10000>; +}; diff --git a/qcom/montague-adrastea-overlay.dts b/qcom/montague-adrastea-overlay.dts index 72826f47..1fc1ed8e 100644 --- a/qcom/montague-adrastea-overlay.dts +++ b/qcom/montague-adrastea-overlay.dts @@ -9,3 +9,10 @@ qcom,msm-id = <581 0x10000>, <582 0x10000>; qcom,board-id = <0x10022 0x0>; }; + +&pcie0 { + + qcom,config-recovery; + qcom,drv-supported; + +}; diff --git a/qcom/montague-apache-overlay.dts b/qcom/montague-apache-overlay.dts index 1e27c59c..4bc6c7b2 100644 --- a/qcom/montague-apache-overlay.dts +++ b/qcom/montague-apache-overlay.dts @@ -1,7 +1,7 @@ /dts-v1/; /plugin/; -#include "montague-apache.dtsi" +#include "montague-talyn.dtsi" / { model = "Qualcomm Technologies, Inc. Montague Apache IDP"; diff --git a/qcom/montague-apache.dts b/qcom/montague-apache.dts index c69f740c..0876cbc9 100644 --- a/qcom/montague-apache.dts +++ b/qcom/montague-apache.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "montague.dtsi" -#include "montague-apache.dtsi" +#include "montague-talyn.dtsi" / { model = "Qualcomm Technologies, Inc. Montague Apache IDP"; diff --git a/qcom/montague-hsp-overlay.dts b/qcom/montague-hsp-overlay.dts index bc4c623c..74385209 100644 --- a/qcom/montague-hsp-overlay.dts +++ b/qcom/montague-hsp-overlay.dts @@ -16,3 +16,11 @@ reg = <0x0 0x82a00000 0x0 0x0>; }; }; + +&pcie0 { + + qcom,config-recovery; + qcom,drv-supported; + +}; + diff --git a/qcom/montague-idp-qps615.dtsi b/qcom/montague-idp-qps615.dtsi index b71ee48e..ad213c59 100644 --- a/qcom/montague-idp-qps615.dtsi +++ b/qcom/montague-idp-qps615.dtsi @@ -1 +1,159 @@ -#include "ravelin-idp.dtsi" +#include "montague-hsp.dtsi" + +&qupv3_se0_i2c { + status = "ok"; + + pcie0_i2c_ctrl: pcie0_i2c_ctrl { + compatible = "qcom,pcie-i2c-ntn3"; + rc-index = <0x0>; + reg = <0x77>; + gpio-config-reg = <0x801208>; + ep-reset-reg = <0x801210>; + ep-reset-gpio-mask = <0xc>; + version-reg = <0x800000>; + dump-regs = <0x801330 0x801350 0x801370>; + reg_update = <0x82c030 0x1 + 0x828000 0x3 + 0x82bd00 0x8 + 0x82c030 0x2 + 0x828000 0x3 + 0x82bd00 0x8 + 0x82c030 0x8 + 0x828000 0x1 + 0x82bd00 0x8 + 0x82c01c 0x10 + 0x82c030 0xf + 0x828000 0xf + 0x82b268 0x2>; + /*FOM for preset caluclation*/ + switch_reg_update = <0x82c02c 0x00000007 + 0x824a10 0x00000001 + 0x82c030 0x00000008 + 0x828000 0x00000001 + 0x82b074 0x00000020 + 0x82b2bc 0x00000001>; + }; +}; + +&pcie0 { + + pcie-i2c-phandle = <&qupv3_se0_i2c>; + qcom,boot-option = <0x2>; + iommu-map = <0x0 &apps_smmu 0x1400 0x1>, + <0x100 &apps_smmu 0x1401 0x1>, + <0x208 &apps_smmu 0x1404 0x1>, + <0x210 &apps_smmu 0x1405 0x1>, + <0x218 &apps_smmu 0x1406 0x1>, + <0x300 &apps_smmu 0x1407 0x1>, + <0x400 &apps_smmu 0x1410 0x1>, + <0x500 &apps_smmu 0x1411 0x1>, + <0x501 &apps_smmu 0x1412 0x1>; + + qcom,phy-sequence = <0x0240 0x03 0x0 + 0x0094 0x08 0x0 + 0x0154 0x34 0x0 + 0x016c 0x08 0x0 + 0x0058 0x0f 0x0 + 0x00a4 0x42 0x0 + 0x0110 0x24 0x0 + 0x011c 0x03 0x0 + 0x0118 0xb4 0x0 + 0x010c 0x02 0x0 + 0x01bc 0x11 0x0 + 0x00bc 0x82 0x0 + 0x00d4 0x03 0x0 + 0x00d0 0x55 0x0 + 0x00cc 0x55 0x0 + 0x00b0 0x1a 0x0 + 0x00ac 0x0a 0x0 + 0x00c4 0x68 0x0 + 0x00e0 0x02 0x0 + 0x00dc 0xaa 0x0 + 0x00d8 0xab 0x0 + 0x00b8 0x34 0x0 + 0x00b4 0x14 0x0 + 0x0158 0x01 0x0 + 0x0074 0x06 0x0 + 0x007c 0x16 0x0 + 0x0084 0x36 0x0 + 0x0078 0x06 0x0 + 0x0080 0x16 0x0 + 0x0088 0x36 0x0 + 0x01b0 0x1e 0x0 + 0x01ac 0xca 0x0 + 0x01b8 0x18 0x0 + 0x01b4 0xa2 0x0 + 0x0050 0x07 0x0 + 0x0010 0x01 0x0 + 0x001c 0x31 0x0 + 0x0020 0x01 0x0 + 0x0024 0xde 0x0 + 0x0028 0x07 0x0 + 0x0030 0x4c 0x0 + 0x0034 0x06 0x0 + 0x0ee4 0x20 0x0 + 0x0e84 0x75 0x0 + 0x0e90 0x3f 0x0 + 0x115c 0x7f 0x0 + 0x1160 0xff 0x0 + 0x1164 0xbf 0x0 + 0x1168 0x3f 0x0 + 0x116c 0xd8 0x0 + 0x1170 0xdc 0x0 + 0x1174 0xdc 0x0 + 0x1178 0x5c 0x0 + 0x117c 0x34 0x0 + 0x1180 0xa6 0x0 + 0x1190 0x34 0x0 + 0x1194 0x38 0x0 + 0x10d8 0x0f 0x0 + 0x0e3c 0x12 0x0 + 0x0e40 0x01 0x0 + 0x10dc 0x00 0x0 + 0x104c 0x08 0x0 + 0x1050 0x08 0x0 + 0x1044 0xf0 0x0 + 0x11a4 0x38 0x0 + 0x10cc 0xf0 0x0 + 0x10f4 0x07 0x0 + 0x1008 0x09 0x0 + 0x1014 0x05 0x0 + 0x0694 0x00 0x0 + 0x0654 0x00 0x0 + 0x06a8 0x0f 0x0 + 0x0048 0x90 0x0 + 0x0620 0xc1 0x0 + 0x0624 0x40 0x0 + 0x0388 0x77 0x0 + 0x0398 0x0b 0x0 + 0x02dc 0x05 0x0 + 0x0200 0x00 0x0 + 0x0244 0x03 0x0>; + +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + /* BDF 1.0.0 */ + pcie0_bus1_dev0_fn0: pcie0_bus1_dev0_fn0 { + reg = <0 0 0 0 0>; + + /* BDF 2.1.0 */ + pcie0_bus2_dev1_fn0: pcie0_bus2_dev1_fn0 { + reg = <0x800 0x0 0x0 0x0 0x0>; + }; + + /* BDF 2.2.0 */ + pcie0_bus2_dev2_fn0: pcie0_bus2_dev2_fn0 { + reg = <0x1000 0x0 0x0 0x0 0x0>; + }; + + /* BDF 2.3.0 */ + pcie0_bus2_dev3_fn0: pcie0_bus2_dev3_fn0 { + reg = <0x1800 0x0 0x0 0x0 0x0>; + }; + }; +}; + diff --git a/qcom/montague-moselle-overlay.dts b/qcom/montague-moselle-overlay.dts index a48e707b..9cbc9913 100644 --- a/qcom/montague-moselle-overlay.dts +++ b/qcom/montague-moselle-overlay.dts @@ -10,3 +10,11 @@ qcom,board-id = <0x10022 3>; }; +&pcie0 { + + qcom,config-recovery; + qcom,drv-supported; + +}; + + diff --git a/qcom/montague-rcm-overlay.dts b/qcom/montague-rcm-overlay.dts index 17f42b74..b49c1e6c 100644 --- a/qcom/montague-rcm-overlay.dts +++ b/qcom/montague-rcm-overlay.dts @@ -10,3 +10,11 @@ qcom,board-id = <0x10022 0x5>; }; +&pcie0 { + + qcom,config-recovery; + qcom,drv-supported; + +}; + + diff --git a/qcom/montague-talyn-overlay.dts b/qcom/montague-talyn-overlay.dts deleted file mode 100644 index 3864d685..00000000 --- a/qcom/montague-talyn-overlay.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; -/plugin/; - -#include "montague-talyn.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Apache wigig IDP"; - compatible = "qcom,montague-idp", "qcom,montague", "qcom,idp"; - qcom,msm-id = <581 0x10000>, <582 0x10000>; - qcom,board-id = <0x10022 0x08>; -}; diff --git a/qcom/montague-talyn.dts b/qcom/montague-talyn.dts deleted file mode 100644 index 08cc91e3..00000000 --- a/qcom/montague-talyn.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; - - -#include "montague.dtsi" -#include "montague-talyn.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Apache wigig IDP"; - compatible = "qcom,montague-idp", "qcom,montague", "qcom,idp"; - qcom,board-id = <0 0>; -}; diff --git a/qcom/montague-wsa-overlay.dts b/qcom/montague-wsa-overlay.dts index ec1001c3..3c0a500d 100644 --- a/qcom/montague-wsa-overlay.dts +++ b/qcom/montague-wsa-overlay.dts @@ -9,3 +9,11 @@ qcom,msm-id = <581 0x10000>, <582 0x10000>; qcom,board-id = <0x10022 0x7>; }; + +&pcie0 { + + qcom,config-recovery; + qcom,drv-supported; + +}; + diff --git a/qcom/montague-wsd-overlay.dts b/qcom/montague-wsd-overlay.dts index 046235ab..7e488833 100644 --- a/qcom/montague-wsd-overlay.dts +++ b/qcom/montague-wsd-overlay.dts @@ -9,3 +9,11 @@ qcom,msm-id = <581 0x10000>, <582 0x10000>; qcom,board-id = <0x10022 0x6>; }; + +&pcie0 { + + qcom,config-recovery; + qcom,drv-supported; + +}; + diff --git a/qcom/montague.dtsi b/qcom/montague.dtsi index 1f79f65d..5657f097 100644 --- a/qcom/montague.dtsi +++ b/qcom/montague.dtsi @@ -17,6 +17,13 @@ }; &soc { + st54spi_gpio { + status = "ok"; + compatible = "st,st54spi_gpio"; + /* gpio used as SE_nRESET */ + gpio-power_nreset = <&tlmm 48 0x00>; + }; + mhi_qrtr_cnss { compatible = "qcom,qrtr-mhi"; qcom,dev-id = <0x1103>; @@ -24,3 +31,11 @@ qcom,low-latency; }; }; + +&pcie0 { + +/delete-property/ qcom,config-recovery; +/delete-property/ qcom,drv-supported; + +}; + diff --git a/qcom/montaguep-apache.dts b/qcom/montaguep-apache.dts index 7f2d365c..256876fb 100644 --- a/qcom/montaguep-apache.dts +++ b/qcom/montaguep-apache.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "montaguep.dtsi" -#include "montaguep-apache.dtsi" +#include "montague-talyn.dtsi" / { model = "Qualcomm Technologies, Inc. Montague Apache IDP"; diff --git a/qcom/montaguep-apache.dtsi b/qcom/montaguep-apache.dtsi deleted file mode 100644 index 6dca2ce9..00000000 --- a/qcom/montaguep-apache.dtsi +++ /dev/null @@ -1 +0,0 @@ -#include "ravelinp-idp.dtsi" diff --git a/qcom/neo-pcie.dtsi b/qcom/neo-pcie.dtsi index 3aa071e9..d4edb1c3 100644 --- a/qcom/neo-pcie.dtsi +++ b/qcom/neo-pcie.dtsi @@ -128,7 +128,7 @@ qcom,config-recovery; qcom,target-link-speed = <0x2>; - qcom,pcie-phy-ver = <104>; + qcom,pcie-phy-ver = <107>; qcom,phy-status-offset = <0x214>; qcom,phy-status-bit = <6>; qcom,phy-power-down-offset = <0x240>; @@ -244,6 +244,7 @@ 0x0694 0x00 0x0 0x03d0 0x8c 0x0 0x0368 0x17 0x0 + 0x0370 0x2e 0x0 0x1424 0x01 0x0 0x1428 0x01 0x0 0x0200 0x00 0x0 @@ -419,7 +420,7 @@ qcom,num-parf-testbus-sel = <0xb9>; qcom,config-recovery; - qcom,pcie-phy-ver = <104>; + qcom,pcie-phy-ver = <107>; qcom,phy-status-offset = <0x214>; qcom,phy-status-bit = <6>; qcom,phy-power-down-offset = <0x240>; @@ -535,6 +536,7 @@ 0x0694 0x00 0x0 0x03d0 0x8c 0x0 0x0368 0x17 0x0 + 0x0370 0x2e 0x0 0x1424 0x01 0x0 0x1428 0x01 0x0 0x0200 0x00 0x0 diff --git a/qcom/neo.dtsi b/qcom/neo.dtsi index 7ba44460..68179727 100644 --- a/qcom/neo.dtsi +++ b/qcom/neo.dtsi @@ -1030,6 +1030,10 @@ qcom,target-dev = <&qcom_ddr_dcvs_hw>; }; + crypto_node { + compatible = "qcom,crypto"; + }; + sdhc_1: sdhci@7C4000 { status = "disabled"; @@ -1765,6 +1769,12 @@ ddr-freq-update; }; + qcom,power-state { + compatible = "qcom,power-state"; + qcom,subsys-name = "lpass", "cdsp"; + qcom,rproc-handle = <&adsp_pas>, <&cdsp_pas>; + }; + sys-pm-vx@c320000 { compatible = "qcom,sys-pm-violators", "qcom,sys-pm-neo"; reg = <0xc320000 0x0400>; diff --git a/qcom/neo_la.dtsi b/qcom/neo_la.dtsi index d07b7163..08cdfeb3 100644 --- a/qcom/neo_la.dtsi +++ b/qcom/neo_la.dtsi @@ -240,6 +240,37 @@ }; }; + bwprof: qcom,bwprof-ddr@19090000 { + compatible = "qcom,bwprof"; + #address-cells = <1>; + #size-cells = <1>; + qcom,bus-width = <4>; + ranges; + reg = <0x190BA050 0x10>; + reg-names = "mem-freq"; + + bwprof_0: qcom,bwprof0@19092000 { + compatible = "qcom,bwprof-mon"; + reg = <0x19092000 0x1000>; + reg-names = "base"; + client = "total"; + }; + + bwprof_1: qcom,bwprof1@19093000 { + compatible = "qcom,bwprof-mon"; + reg = <0x19093000 0x1000>; + reg-names = "base"; + client = "cpu"; + }; + + bwprof_2: qcom,bwprof2@19094000 { + compatible = "qcom,bwprof-mon"; + reg = <0x19094000 0x1000>; + reg-names = "base"; + client = "gpu"; + }; + }; + bluetooth: bt_wcn6x5x { compatible = "qcom,kiwi"; pinctrl-names = "default"; diff --git a/qcom/parrot-atp-overlay.dts b/qcom/parrot-atp-overlay.dts index eefb1d51..46452ca7 100644 --- a/qcom/parrot-atp-overlay.dts +++ b/qcom/parrot-atp-overlay.dts @@ -8,6 +8,7 @@ model = "Qualcomm Technologies, Inc. Parrot ATP"; compatible = "qcom,parrot-atp", "qcom,parrot", "qcom,atp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <33 0>; }; diff --git a/qcom/parrot-idp-4gb-overlay.dts b/qcom/parrot-idp-4gb-overlay.dts index 3c95466f..de962c1f 100644 --- a/qcom/parrot-idp-4gb-overlay.dts +++ b/qcom/parrot-idp-4gb-overlay.dts @@ -8,6 +8,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot IDP 4GB DDR"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <34 0x600>; }; diff --git a/qcom/parrot-idp-nopmi-overlay.dts b/qcom/parrot-idp-nopmi-overlay.dts index 19440173..b0ffaf59 100644 --- a/qcom/parrot-idp-nopmi-overlay.dts +++ b/qcom/parrot-idp-nopmi-overlay.dts @@ -8,7 +8,8 @@ model = "Qualcomm Technologies, Inc. Parrot IDP"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <34 0>; qcom,pmic-id-size = <9>; qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; diff --git a/qcom/parrot-idp-overlay.dts b/qcom/parrot-idp-overlay.dts index 286bfacc..d8fe21d9 100644 --- a/qcom/parrot-idp-overlay.dts +++ b/qcom/parrot-idp-overlay.dts @@ -9,6 +9,7 @@ model = "Qualcomm Technologies, Inc. Parrot IDP"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <34 0>; }; diff --git a/qcom/parrot-idp-pm8350b-overlay.dts b/qcom/parrot-idp-pm8350b-overlay.dts index e51c09d4..c6256fcc 100644 --- a/qcom/parrot-idp-pm8350b-overlay.dts +++ b/qcom/parrot-idp-pm8350b-overlay.dts @@ -9,6 +9,7 @@ model = "Qualcomm Technologies, Inc. Parrot IDP"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <34 0>; }; diff --git a/qcom/parrot-idp-wcn3990-4gb-overlay.dts b/qcom/parrot-idp-wcn3990-4gb-overlay.dts index 78846626..959375a5 100644 --- a/qcom/parrot-idp-wcn3990-4gb-overlay.dts +++ b/qcom/parrot-idp-wcn3990-4gb-overlay.dts @@ -8,6 +8,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot IDP 4GB DDR + WCN3990"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <34 0x601>; }; diff --git a/qcom/parrot-idp-wcn3990-amoled-rcm-4gb-overlay.dts b/qcom/parrot-idp-wcn3990-amoled-rcm-4gb-overlay.dts index 01d5851c..a23e0be0 100644 --- a/qcom/parrot-idp-wcn3990-amoled-rcm-4gb-overlay.dts +++ b/qcom/parrot-idp-wcn3990-amoled-rcm-4gb-overlay.dts @@ -8,6 +8,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN3990 IDP 4GB DDR + AMOLED + RCM"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <34 0x603>; }; diff --git a/qcom/parrot-idp-wcn3990-amoled-rcm-overlay.dts b/qcom/parrot-idp-wcn3990-amoled-rcm-overlay.dts index 22012a4a..68fac8db 100644 --- a/qcom/parrot-idp-wcn3990-amoled-rcm-overlay.dts +++ b/qcom/parrot-idp-wcn3990-amoled-rcm-overlay.dts @@ -9,6 +9,7 @@ model = "Qualcomm Technologies, Inc. Parrot WCN3990 IDP + AMOLED + RCM"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <34 3>; }; diff --git a/qcom/parrot-idp-wcn3990-overlay.dts b/qcom/parrot-idp-wcn3990-overlay.dts index 198a07fa..5089bb18 100644 --- a/qcom/parrot-idp-wcn3990-overlay.dts +++ b/qcom/parrot-idp-wcn3990-overlay.dts @@ -8,6 +8,7 @@ model = "Qualcomm Technologies, Inc. Parrot IDP + WCN3990"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <34 1>; }; diff --git a/qcom/parrot-idp-wcn6750-amoled-4gb-overlay.dts b/qcom/parrot-idp-wcn6750-amoled-4gb-overlay.dts index c47c0026..11a6ac1d 100644 --- a/qcom/parrot-idp-wcn6750-amoled-4gb-overlay.dts +++ b/qcom/parrot-idp-wcn6750-amoled-4gb-overlay.dts @@ -8,6 +8,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN6750 IDP 4GB DDR + AMOLED"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <34 0x604>; }; diff --git a/qcom/parrot-idp-wcn6750-amoled-overlay.dts b/qcom/parrot-idp-wcn6750-amoled-overlay.dts index 2b676b64..39f695ee 100644 --- a/qcom/parrot-idp-wcn6750-amoled-overlay.dts +++ b/qcom/parrot-idp-wcn6750-amoled-overlay.dts @@ -9,6 +9,6 @@ model = "Qualcomm Technologies, Inc. Parrot WCN6750 IDP + AMOLED"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; qcom,board-id = <34 4>; }; diff --git a/qcom/parrot-idp-wcn6750-amoled-rcm-4gb-overlay.dts b/qcom/parrot-idp-wcn6750-amoled-rcm-4gb-overlay.dts index 32619f65..cac79b45 100644 --- a/qcom/parrot-idp-wcn6750-amoled-rcm-4gb-overlay.dts +++ b/qcom/parrot-idp-wcn6750-amoled-rcm-4gb-overlay.dts @@ -8,6 +8,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN6750 IDP 4GB DDR + AMOLED + RCM"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <34 0x602>; }; diff --git a/qcom/parrot-idp-wcn6750-amoled-rcm-overlay.dts b/qcom/parrot-idp-wcn6750-amoled-rcm-overlay.dts index 5d03ebaf..d6a713c5 100644 --- a/qcom/parrot-idp-wcn6750-amoled-rcm-overlay.dts +++ b/qcom/parrot-idp-wcn6750-amoled-rcm-overlay.dts @@ -9,6 +9,7 @@ model = "Qualcomm Technologies, Inc. Parrot WCN6750 IDP + AMOLED + RCM"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <34 2>; }; diff --git a/qcom/parrot-idp-wcn6755-amoled-rcm-overlay.dts b/qcom/parrot-idp-wcn6755-amoled-rcm-overlay.dts new file mode 100644 index 00000000..f90c0eca --- /dev/null +++ b/qcom/parrot-idp-wcn6755-amoled-rcm-overlay.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/plugin/; + +#include "parrot-wcn6755.dtsi" +#include "parrot-idp-wcn6750-amoled-rcm.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP + AMOLED + RCM"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; + qcom,board-id = <34 6>; +}; diff --git a/qcom/parrot-idp-wcn6755-amoled-rcm.dts b/qcom/parrot-idp-wcn6755-amoled-rcm.dts new file mode 100644 index 00000000..a1c864de --- /dev/null +++ b/qcom/parrot-idp-wcn6755-amoled-rcm.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-idp-wcn6750-amoled-rcm.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP + AMOLED + RCM"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 6>; +}; diff --git a/qcom/parrot-idp-wcn6755-nopmi-overlay.dts b/qcom/parrot-idp-wcn6755-nopmi-overlay.dts new file mode 100644 index 00000000..d2e1a0f9 --- /dev/null +++ b/qcom/parrot-idp-wcn6755-nopmi-overlay.dts @@ -0,0 +1,16 @@ +/dts-v1/; +/plugin/; + +#include "parrot-wcn6755.dtsi" +#include "parrot-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot IDP + WCN6755"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; + qcom,board-id = <34 5>; + qcom,pmic-id-size = <9>; + qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; +}; diff --git a/qcom/parrot-idp-wcn6755-nopmi.dts b/qcom/parrot-idp-wcn6755-nopmi.dts new file mode 100644 index 00000000..c9273e2d --- /dev/null +++ b/qcom/parrot-idp-wcn6755-nopmi.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "parrot.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot IDP + WCN6755"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 5>; + qcom,pmic-id-size = <9>; + qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; +}; diff --git a/qcom/parrot-idp-wcn6755-overlay.dts b/qcom/parrot-idp-wcn6755-overlay.dts new file mode 100644 index 00000000..9bb4e968 --- /dev/null +++ b/qcom/parrot-idp-wcn6755-overlay.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/plugin/; + +#include "parrot-wcn6755.dtsi" +#include "parrot-idp.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrot-idp-wcn6755-pm8350b-overlay.dts b/qcom/parrot-idp-wcn6755-pm8350b-overlay.dts new file mode 100644 index 00000000..15a8bfa1 --- /dev/null +++ b/qcom/parrot-idp-wcn6755-pm8350b-overlay.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/plugin/; + +#include "parrot-wcn6755.dtsi" +#include "parrot-idp.dtsi" +#include "parrot-idp-pm8350b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot IDP + WCN6755"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrot-idp-wcn6755-pm8350b.dts b/qcom/parrot-idp-wcn6755-pm8350b.dts new file mode 100644 index 00000000..8aca36b7 --- /dev/null +++ b/qcom/parrot-idp-wcn6755-pm8350b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-idp.dtsi" +#include "parrot-idp-pm8350b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot IDP + WCN6755"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrot-idp-wcn6755.dts b/qcom/parrot-idp-wcn6755.dts new file mode 100644 index 00000000..c92e8dc2 --- /dev/null +++ b/qcom/parrot-idp-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-idp.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrot-qrd-4gb-overlay.dts b/qcom/parrot-qrd-4gb-overlay.dts index c07c4f5d..a683184b 100644 --- a/qcom/parrot-qrd-4gb-overlay.dts +++ b/qcom/parrot-qrd-4gb-overlay.dts @@ -8,6 +8,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot QRD 4GB DDR"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <0x1000B 0x600>; }; diff --git a/qcom/parrot-qrd-nopmi-overlay.dts b/qcom/parrot-qrd-nopmi-overlay.dts index 47d8f417..bce367a6 100644 --- a/qcom/parrot-qrd-nopmi-overlay.dts +++ b/qcom/parrot-qrd-nopmi-overlay.dts @@ -8,7 +8,8 @@ model = "Qualcomm Technologies, Inc. Parrot QRD"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <0x1000B 0>; qcom,pmic-id-size = <9>; qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; diff --git a/qcom/parrot-qrd-overlay.dts b/qcom/parrot-qrd-overlay.dts index 205cd044..ca55d8d7 100644 --- a/qcom/parrot-qrd-overlay.dts +++ b/qcom/parrot-qrd-overlay.dts @@ -9,6 +9,7 @@ model = "Qualcomm Technologies, Inc. Parrot QRD"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/parrot-qrd-pm8350b-overlay.dts b/qcom/parrot-qrd-pm8350b-overlay.dts index 7a37c941..033f3844 100644 --- a/qcom/parrot-qrd-pm8350b-overlay.dts +++ b/qcom/parrot-qrd-pm8350b-overlay.dts @@ -9,6 +9,7 @@ model = "Qualcomm Technologies, Inc. Parrot QRD"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/parrot-qrd-wcn6750-4gb-overlay.dts b/qcom/parrot-qrd-wcn6750-4gb-overlay.dts index ce311d7c..02bb068c 100644 --- a/qcom/parrot-qrd-wcn6750-4gb-overlay.dts +++ b/qcom/parrot-qrd-wcn6750-4gb-overlay.dts @@ -8,6 +8,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN6750 QRD 4GB DDR"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <0x1000B 0x601>; }; diff --git a/qcom/parrot-qrd-wcn6750-overlay.dts b/qcom/parrot-qrd-wcn6750-overlay.dts index babcc1ed..1a34c9d4 100644 --- a/qcom/parrot-qrd-wcn6750-overlay.dts +++ b/qcom/parrot-qrd-wcn6750-overlay.dts @@ -9,6 +9,7 @@ model = "Qualcomm Technologies, Inc. Parrot WCN6750 QRD"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; qcom,board-id = <0x1000B 1>; }; diff --git a/qcom/parrot-qrd-wcn6755-overlay.dts b/qcom/parrot-qrd-wcn6755-overlay.dts new file mode 100644 index 00000000..4858db33 --- /dev/null +++ b/qcom/parrot-qrd-wcn6755-overlay.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/plugin/; + +#include "parrot-wcn6755.dtsi" +#include "parrot-qrd-wcn6750.dtsi" +#include "parrot-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot WCN6755 QRD"; + compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; + qcom,board-id = <0x1000B 2>; +}; diff --git a/qcom/parrot-qrd-wcn6755.dts b/qcom/parrot-qrd-wcn6755.dts new file mode 100644 index 00000000..7760cc53 --- /dev/null +++ b/qcom/parrot-qrd-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-qrd-wcn6750.dtsi" +#include "parrot-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot WCN6755 QRD"; + compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; + qcom,board-id = <0x1000B 2>; +}; diff --git a/qcom/parrot-rumi-overlay.dts b/qcom/parrot-rumi-overlay.dts index 32e02fef..d775db88 100644 --- a/qcom/parrot-rumi-overlay.dts +++ b/qcom/parrot-rumi-overlay.dts @@ -7,6 +7,6 @@ / { model = "Qualcomm Technologies, Inc. Parrot RUMI"; compatible = "qcom,parrot-rumi", "qcom,parrot", "qcom,rumi"; - qcom,msm-id = <537 0x10000>; + qcom,msm-id = <537 0x10000>, <663 0x10000>; qcom,board-id = <0x1000F 0>; }; diff --git a/qcom/parrot-sg-idp-wcn6755-amoled-rcm.dts b/qcom/parrot-sg-idp-wcn6755-amoled-rcm.dts new file mode 100644 index 00000000..52b51317 --- /dev/null +++ b/qcom/parrot-sg-idp-wcn6755-amoled-rcm.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-sg-idp-wcn6750-amoled-rcm.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot SG WCN6755 IDP + AMOLED + RCM"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 6>; +}; diff --git a/qcom/parrot-sg-idp-wcn6755-nopmi.dts b/qcom/parrot-sg-idp-wcn6755-nopmi.dts new file mode 100644 index 00000000..06ad1c00 --- /dev/null +++ b/qcom/parrot-sg-idp-wcn6755-nopmi.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "parrot-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-sg-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot SG IDP + WCN6755"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 5>; + qcom,pmic-id-size = <9>; + qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; +}; diff --git a/qcom/parrot-sg-idp-wcn6755-pm8350b.dts b/qcom/parrot-sg-idp-wcn6755-pm8350b.dts new file mode 100644 index 00000000..a8a7053f --- /dev/null +++ b/qcom/parrot-sg-idp-wcn6755-pm8350b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-sg-idp.dtsi" +#include "parrot-idp-pm8350b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot SG IDP + WCN6755"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrot-sg-idp-wcn6755.dts b/qcom/parrot-sg-idp-wcn6755.dts new file mode 100644 index 00000000..f847e1ac --- /dev/null +++ b/qcom/parrot-sg-idp-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-sg-idp.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot SG IDP + WCN6755"; + compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrot-sg-qrd-wcn6755.dts b/qcom/parrot-sg-qrd-wcn6755.dts new file mode 100644 index 00000000..40294973 --- /dev/null +++ b/qcom/parrot-sg-qrd-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrot-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrot-sg-qrd-wcn6750.dtsi" +#include "parrot-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot SG WCN6755 QRD"; + compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; + qcom,board-id = <0x1000B 2>; +}; diff --git a/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts b/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts index 3ab61d1f..26d166b9 100644 --- a/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts +++ b/qcom/parrot-vm-idp-wcn6750-amoled-rcm.dts @@ -6,5 +6,5 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN6750 VM IDP + AMOLED + RCM"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,board-id = <34 2>; + qcom,board-id = <34 2>, <34 6>; }; diff --git a/qcom/parrot-vm-idp.dts b/qcom/parrot-vm-idp.dts index 140bc36b..b5140f25 100644 --- a/qcom/parrot-vm-idp.dts +++ b/qcom/parrot-vm-idp.dts @@ -6,5 +6,5 @@ / { model = "Qualcomm Technologies, Inc. Parrot SVM IDP"; compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,board-id = <34 0>; + qcom,board-id = <34 0>, <34 5>; }; diff --git a/qcom/parrot-vm-qrd-wcn6750.dts b/qcom/parrot-vm-qrd-wcn6750.dts index 35474550..d05001e9 100644 --- a/qcom/parrot-vm-qrd-wcn6750.dts +++ b/qcom/parrot-vm-qrd-wcn6750.dts @@ -6,5 +6,5 @@ / { model = "Qualcomm Technologies, Inc. Parrot SVM QRD + WCN6750"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; - qcom,board-id = <0x1000B 1>; + qcom,board-id = <0x1000B 1>, <0x1000B 2>; }; diff --git a/qcom/parrot-vm.dtsi b/qcom/parrot-vm.dtsi index b7e099b1..f673197d 100644 --- a/qcom/parrot-vm.dtsi +++ b/qcom/parrot-vm.dtsi @@ -2,7 +2,8 @@ / { qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>; + <633 0x10000>, <634 0x10000>, <638 0x10000>, + <663 0x10000>; interrupt-parent = <&vgic>; gunyah-vsock { diff --git a/qcom/parrot-wcn6755.dtsi b/qcom/parrot-wcn6755.dtsi new file mode 100644 index 00000000..9c64edb7 --- /dev/null +++ b/qcom/parrot-wcn6755.dtsi @@ -0,0 +1,158 @@ +#include + +&soc { + bluetooth: bt_wcn6750 { + compatible = "qcom,wcn6750-bt"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_sleep>; + qcom,bt-reset-gpio = <&tlmm 35 0>; /* BT_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 61 0>; /* SW_CTRL */ + qcom,wl-reset-gpio = <&tlmm 36 0>; /* WL_EN */ + tsens = "quiet-therm"; + + qcom,bt-vdd-io-supply = <&L22B>; /* IO */ + qcom,bt-vdd-aon-supply = <&S7B>; + qcom,bt-vdd-dig-supply = <&S7B>; /* BT_CX_MX */ + qcom,bt-vdd-rfacmn-supply = <&S7B>; + qcom,bt-vdd-rfa-0p8-supply = <&S7B>; + qcom,bt-vdd-rfa1-supply = <&S8E>; /*RFA 1p7*/ + qcom,bt-vdd-rfa2-supply = <&S8B>; /*RFA 1p2*/ + qcom,bt-vdd-ipa-2p2-supply = <&S9B>; /*IPA 2p2*/ + //qcom,bt-vdd-asd-supply = <&L11C>; + + /* max voltage are set to regulator max voltage supported */ + qcom,bt-vdd-io-config = <1800000 2000000 0 1>; + qcom,bt-vdd-aon-config = <824000 1174000 0 1>; + qcom,bt-vdd-dig-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfacmn-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa-0p8-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa1-config = <1872000 2040000 0 1>; + qcom,bt-vdd-rfa2-config = <1256000 1654000 0 1>; + qcom,bt-vdd-ipa-2p2-config = <2200000 2208000 0 1>; + //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; + }; + + qcom,smp2p-wpss { + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + wpss_pas: remoteproc-wpss@8a00000 { + firmware-name = "qca6755/wpss.mdt"; + }; + + icnss2: qcom,wcn6750 { + compatible = "qcom,wcn6750"; + reg = <0x17210040 0x0>, + <0xb0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1c00 0x1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-geometry = <0xa0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "quiet-therm"; + wcn-hw-version = "qca6755"; + qcom,wlan-msa-fixed-region = <&wlan_fw_mem>; + vdd-cx-mx-supply = <&S7B>; + qcom,vdd-cx-mx-config = <880000 1120000 0 0 1>; + vdd-1.8-xo-supply = <&S8E>; + qcom,vdd-1.8-xo-config = <1872000 2040000 0 0 0>; + vdd-1.3-rfa-supply = <&S8B>; + qcom,vdd-1.3-rfa-config = <1256000 1500000 0 0 0>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + mboxes = <&qmp_aop 0>; + qcom,vreg_ol_cpr ="s7b"; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; + +&qupv3_se2_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 105 0>; + vdd-supply = <&L5E>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L22B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; diff --git a/qcom/parrot.dtsi b/qcom/parrot.dtsi index 64a63e25..5cc3eeda 100644 --- a/qcom/parrot.dtsi +++ b/qcom/parrot.dtsi @@ -16,7 +16,7 @@ / { model = "Qualcomm Technologies, Inc. Parrot"; compatible = "qcom,parrot"; - qcom,msm-id = <537 0x10000>, <613 0x10000>; + qcom,msm-id = <537 0x10000>, <613 0x10000>, <663 0x10000>; interrupt-parent = <&intc>; #address-cells = <2>; @@ -2077,6 +2077,8 @@ qcom,vmid = <50>; qcom,firmware-name = "cpusys_vm"; memory-region = <&cpusys_vm_mem>; + ext-region = <&chipinfo_mem>; + ext-label = <0x7>; }; trust_ui_vm: qcom,trust_ui_vm@e55fc000 { @@ -2952,7 +2954,7 @@ <0x146A8000 0x146A8000 0x2000>; qcom,iommu-dma = "atomic"; dma-coherent; - qcom,ipa-q6-smem-size = <36864>; + qcom,ipa-q6-smem-size = <45056>; }; ipa_smmu_wlan: ipa_smmu_wlan { diff --git a/qcom/parrotp-idp-wcn6755-amoled-rcm.dts b/qcom/parrotp-idp-wcn6755-amoled-rcm.dts new file mode 100644 index 00000000..6da2db4a --- /dev/null +++ b/qcom/parrotp-idp-wcn6755-amoled-rcm.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-idp-wcn6750-amoled-rcm.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP WCN6755 IDP + AMOLED + RCM"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 6>; +}; diff --git a/qcom/parrotp-idp-wcn6755-nopmi.dts b/qcom/parrotp-idp-wcn6755-nopmi.dts new file mode 100644 index 00000000..6c8f8aef --- /dev/null +++ b/qcom/parrotp-idp-wcn6755-nopmi.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "parrotp.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP IDP + WCN6755"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 5>; + qcom,pmic-id-size = <9>; + qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; +}; diff --git a/qcom/parrotp-idp-wcn6755-pm8350b.dts b/qcom/parrotp-idp-wcn6755-pm8350b.dts new file mode 100644 index 00000000..d6844720 --- /dev/null +++ b/qcom/parrotp-idp-wcn6755-pm8350b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-idp.dtsi" +#include "parrot-idp-pm8350b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP IDP + WCN6755"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrotp-idp-wcn6755.dts b/qcom/parrotp-idp-wcn6755.dts new file mode 100644 index 00000000..0440cd4a --- /dev/null +++ b/qcom/parrotp-idp-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-idp.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP IDP + WCN6755"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrotp-qrd-wcn6755.dts b/qcom/parrotp-qrd-wcn6755.dts new file mode 100644 index 00000000..6e3cd525 --- /dev/null +++ b/qcom/parrotp-qrd-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-qrd-wcn6750.dtsi" +#include "parrot-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP WCN6755 QRD"; + compatible = "qcom,parrotp-qrd", "qcom,parrotp", "qcom,qrd"; + qcom,board-id = <0x1000B 2>; +}; diff --git a/qcom/parrotp-sg-idp-wcn6755-amoled-rcm.dts b/qcom/parrotp-sg-idp-wcn6755-amoled-rcm.dts new file mode 100644 index 00000000..bc7ec4a4 --- /dev/null +++ b/qcom/parrotp-sg-idp-wcn6755-amoled-rcm.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-sg-idp-wcn6750-amoled-rcm.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP SG WCN6755 IDP + AMOLED + RCM"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 6>; +}; diff --git a/qcom/parrotp-sg-idp-wcn6755-nopmi.dts b/qcom/parrotp-sg-idp-wcn6755-nopmi.dts new file mode 100644 index 00000000..20ee9a45 --- /dev/null +++ b/qcom/parrotp-sg-idp-wcn6755-nopmi.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "parrotp-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-sg-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP SG IDP + WCN6755"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 5>; + qcom,pmic-id-size = <9>; + qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; +}; diff --git a/qcom/parrotp-sg-idp-wcn6755-pm8350b.dts b/qcom/parrotp-sg-idp-wcn6755-pm8350b.dts new file mode 100644 index 00000000..03a4db76 --- /dev/null +++ b/qcom/parrotp-sg-idp-wcn6755-pm8350b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-sg-idp.dtsi" +#include "parrot-idp-pm8350b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP SG IDP + WCN6755"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrotp-sg-idp-wcn6755.dts b/qcom/parrotp-sg-idp-wcn6755.dts new file mode 100644 index 00000000..b0138663 --- /dev/null +++ b/qcom/parrotp-sg-idp-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-sg-idp.dtsi" +#include "parrot-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP SG IDP + WCN6755"; + compatible = "qcom,parrotp-idp", "qcom,parrotp", "qcom,idp"; + qcom,board-id = <34 5>; +}; diff --git a/qcom/parrotp-sg-qrd-wcn6755.dts b/qcom/parrotp-sg-qrd-wcn6755.dts new file mode 100644 index 00000000..5277c8f3 --- /dev/null +++ b/qcom/parrotp-sg-qrd-wcn6755.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "parrotp-sg.dtsi" +#include "parrot-wcn6755.dtsi" +#include "parrotp-sg-qrd-wcn6750.dtsi" +#include "parrot-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. ParrotP SG WCN6755 QRD"; + compatible = "qcom,parrotp-qrd", "qcom,parrotp", "qcom,qrd"; + qcom,board-id = <0x1000B 2>; +}; diff --git a/qcom/ravelin-atp-overlay.dts b/qcom/ravelin-atp-overlay.dts index 84ada1b2..d6cdb97a 100644 --- a/qcom/ravelin-atp-overlay.dts +++ b/qcom/ravelin-atp-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Ravelin ATP"; compatible = "qcom,ravelin-atp", "qcom,ravelin", "qcom,atp"; - qcom,msm-id = <568 0x10000>, <602 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; qcom,board-id = <33 0>; }; diff --git a/qcom/ravelin-idp-overlay.dts b/qcom/ravelin-idp-overlay.dts index 136f0877..86682b09 100644 --- a/qcom/ravelin-idp-overlay.dts +++ b/qcom/ravelin-idp-overlay.dts @@ -7,6 +7,6 @@ / { model = "Qualcomm Technologies, Inc. Ravelin IDP"; compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; - qcom,msm-id = <568 0x10000>, <602 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; qcom,board-id = <34 0>; }; diff --git a/qcom/ravelin-idp-wcn3950-amoled-rcm-overlay.dts b/qcom/ravelin-idp-wcn3950-amoled-rcm-overlay.dts index 3ea7cf33..05966701 100644 --- a/qcom/ravelin-idp-wcn3950-amoled-rcm-overlay.dts +++ b/qcom/ravelin-idp-wcn3950-amoled-rcm-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Ravelin WCN3950 IDP + AMOLED + RCM"; compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; - qcom,msm-id = <568 0x10000>, <602 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; qcom,board-id = <34 2>; }; diff --git a/qcom/ravelin-idp-wcn3988-4gb-overlay.dts b/qcom/ravelin-idp-wcn3988-4gb-overlay.dts index a84c229a..3a8e0680 100644 --- a/qcom/ravelin-idp-wcn3988-4gb-overlay.dts +++ b/qcom/ravelin-idp-wcn3988-4gb-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Ravelin IDP 4GB DDR + WCN3988"; compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; - qcom,msm-id = <568 0x10000>, <602 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; qcom,board-id = <34 0x601>; }; diff --git a/qcom/ravelin-qrd-4gb-overlay.dts b/qcom/ravelin-qrd-4gb-overlay.dts index 75e7f3bf..dcd3077c 100644 --- a/qcom/ravelin-qrd-4gb-overlay.dts +++ b/qcom/ravelin-qrd-4gb-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Ravelin QRD 4GB DDR"; compatible = "qcom,ravelin-qrd", "qcom,ravelin", "qcom,qrd"; - qcom,msm-id = <568 0x10000>, <602 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; qcom,board-id = <0x1000B 0x600>; }; diff --git a/qcom/ravelin-qrd-overlay.dts b/qcom/ravelin-qrd-overlay.dts index 4b24645b..7054b71c 100644 --- a/qcom/ravelin-qrd-overlay.dts +++ b/qcom/ravelin-qrd-overlay.dts @@ -6,7 +6,7 @@ / { model = "Qualcomm Technologies, Inc. Ravelin QRD"; compatible = "qcom,ravelin-qrd", "qcom,ravelin", "qcom,qrd"; - qcom,msm-id = <568 0x10000>, <602 0x10000>, <581 0x10000>, <582 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <581 0x10000>, <582 0x10000>, <653 0x10000>, <654 0x10000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/ravelin-sg-atp.dts b/qcom/ravelin-sg-atp.dts new file mode 100644 index 00000000..10f6310c --- /dev/null +++ b/qcom/ravelin-sg-atp.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "ravelin-sg.dtsi" +#include "ravelin-sg-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SG ATP"; + compatible = "qcom,ravelin-atp", "qcom,ravelin", "qcom,atp"; + qcom,board-id = <33 0>; +}; + diff --git a/qcom/ravelin-sg-atp.dtsi b/qcom/ravelin-sg-atp.dtsi new file mode 100644 index 00000000..947022eb --- /dev/null +++ b/qcom/ravelin-sg-atp.dtsi @@ -0,0 +1 @@ +#include "ravelin-atp.dtsi" diff --git a/qcom/ravelin-sg-idp-wcn3950-amoled-rcm.dts b/qcom/ravelin-sg-idp-wcn3950-amoled-rcm.dts new file mode 100644 index 00000000..55bc856f --- /dev/null +++ b/qcom/ravelin-sg-idp-wcn3950-amoled-rcm.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "ravelin-sg.dtsi" +#include "ravelin-sg-idp-wcn3950-amoled-rcm.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SG WCN3950 IDP + AMOLED + RCM"; + compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; + qcom,board-id = <34 2>; +}; diff --git a/qcom/ravelin-sg-idp-wcn3950-amoled-rcm.dtsi b/qcom/ravelin-sg-idp-wcn3950-amoled-rcm.dtsi new file mode 100644 index 00000000..faea2552 --- /dev/null +++ b/qcom/ravelin-sg-idp-wcn3950-amoled-rcm.dtsi @@ -0,0 +1,2 @@ +#include "ravelin-idp-wcn3950-amoled-rcm.dtsi" + diff --git a/qcom/ravelin-sg-idp-wcn3988-4gb.dts b/qcom/ravelin-sg-idp-wcn3988-4gb.dts new file mode 100644 index 00000000..34e4a49a --- /dev/null +++ b/qcom/ravelin-sg-idp-wcn3988-4gb.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "ravelin-4gb.dtsi" +#include "ravelin-sg-idp-wcn3988-4gb.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SG IDP 4GB DDR + WCN3988"; + compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; + qcom,board-id = <34 0x601>; +}; diff --git a/qcom/ravelin-sg-idp-wcn3988-4gb.dtsi b/qcom/ravelin-sg-idp-wcn3988-4gb.dtsi new file mode 100644 index 00000000..56b1d7b7 --- /dev/null +++ b/qcom/ravelin-sg-idp-wcn3988-4gb.dtsi @@ -0,0 +1 @@ +#include "ravelin-idp-wcn3988-4gb.dtsi" diff --git a/qcom/ravelin-sg-idp.dts b/qcom/ravelin-sg-idp.dts new file mode 100644 index 00000000..37a67377 --- /dev/null +++ b/qcom/ravelin-sg-idp.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "ravelin-sg.dtsi" +#include "ravelin-adrastea.dtsi" +#include "ravelin-sg-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SG IDP"; + compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; + qcom,board-id = <34 0>; +}; + diff --git a/qcom/montague-apache.dtsi b/qcom/ravelin-sg-idp.dtsi similarity index 100% rename from qcom/montague-apache.dtsi rename to qcom/ravelin-sg-idp.dtsi diff --git a/qcom/ravelin-sg-qrd-4gb.dts b/qcom/ravelin-sg-qrd-4gb.dts new file mode 100644 index 00000000..66a6f53b --- /dev/null +++ b/qcom/ravelin-sg-qrd-4gb.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "ravelin-4gb.dtsi" +#include "ravelin-sg-qrd-4gb.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SG QRD 4GB DDR"; + compatible = "qcom,ravelin-qrd", "qcom,ravelin", "qcom,qrd"; + qcom,board-id = <0x1000B 0x600>; +}; + diff --git a/qcom/ravelin-sg-qrd-4gb.dtsi b/qcom/ravelin-sg-qrd-4gb.dtsi new file mode 100644 index 00000000..4f723176 --- /dev/null +++ b/qcom/ravelin-sg-qrd-4gb.dtsi @@ -0,0 +1,2 @@ +#include "ravelin-qrd-4gb.dtsi" + diff --git a/qcom/ravelin-sg-qrd.dts b/qcom/ravelin-sg-qrd.dts new file mode 100644 index 00000000..beee1b23 --- /dev/null +++ b/qcom/ravelin-sg-qrd.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "ravelin-sg.dtsi" +#include "ravelin-sg-qrd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SG QRD"; + compatible = "qcom,ravelin-qrd", "qcom,ravelin", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; +}; + + diff --git a/qcom/ravelin-sg-qrd.dtsi b/qcom/ravelin-sg-qrd.dtsi new file mode 100644 index 00000000..76ba1b70 --- /dev/null +++ b/qcom/ravelin-sg-qrd.dtsi @@ -0,0 +1 @@ +#include "ravelin-qrd.dtsi" diff --git a/qcom/ravelin-sg.dts b/qcom/ravelin-sg.dts new file mode 100644 index 00000000..487a7111 --- /dev/null +++ b/qcom/ravelin-sg.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "ravelin-sg.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SG SoC"; + compatible = "qcom,ravelin"; + qcom,board-id = <0 0>; +}; + diff --git a/qcom/ravelin-sg.dtsi b/qcom/ravelin-sg.dtsi new file mode 100644 index 00000000..a99dc41c --- /dev/null +++ b/qcom/ravelin-sg.dtsi @@ -0,0 +1,13 @@ +#include "ravelin.dtsi" + +/ { + + model = "Qualcomm Technologies, Inc. Ravelin SG"; + compatible = "qcom,ravelin"; + qcom,msm-id = <653 0x10000>; +}; + +&msm_gpu { + /delete-property/qcom,gpu-model; + qcom,gpu-model = "AdrenoA12v1"; +}; diff --git a/qcom/ravelin-vm.dtsi b/qcom/ravelin-vm.dtsi index 7b5d6ddf..78b03630 100644 --- a/qcom/ravelin-vm.dtsi +++ b/qcom/ravelin-vm.dtsi @@ -1,7 +1,7 @@ #include "waipio-vm.dtsi" / { - qcom,msm-id = <568 0x10000>, <602 0x10000>, <581 0x10000>, <582 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <581 0x10000>, <582 0x10000>, <653 0x10000>, <654 0x10000>; interrupt-parent = <&vgic>; gunyah-vsock { diff --git a/qcom/ravelin.dtsi b/qcom/ravelin.dtsi index 509c83d5..19c74eba 100644 --- a/qcom/ravelin.dtsi +++ b/qcom/ravelin.dtsi @@ -2487,7 +2487,7 @@ <0x146A8000 0x146A8000 0x2000>; qcom,iommu-dma = "atomic"; dma-coherent; - qcom,ipa-q6-smem-size = <36864>; + qcom,ipa-q6-smem-size = <45056>; }; ipa_smmu_wlan: ipa_smmu_wlan { diff --git a/qcom/ravelinp-sg-atp.dts b/qcom/ravelinp-sg-atp.dts new file mode 100644 index 00000000..8194f742 --- /dev/null +++ b/qcom/ravelinp-sg-atp.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "ravelinp-sg.dtsi" +#include "ravelinp-sg-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. RavelinP SG ATP"; + compatible = "qcom,ravelinp-atp", "qcom,ravelinp", "qcom,atp"; + qcom,board-id = <33 0>; +}; + diff --git a/qcom/ravelinp-sg-atp.dtsi b/qcom/ravelinp-sg-atp.dtsi new file mode 100644 index 00000000..37901ea9 --- /dev/null +++ b/qcom/ravelinp-sg-atp.dtsi @@ -0,0 +1 @@ +#include "ravelin-sg-atp.dtsi" diff --git a/qcom/ravelinp-sg-idp-wcn3950-amoled-rcm.dts b/qcom/ravelinp-sg-idp-wcn3950-amoled-rcm.dts new file mode 100644 index 00000000..5f0ec084 --- /dev/null +++ b/qcom/ravelinp-sg-idp-wcn3950-amoled-rcm.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "ravelinp-sg.dtsi" +#include "ravelinp-sg-idp-wcn3950-amoled-rcm.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. RavelinP SG WCN3950 IDP + AMOLED + RCM"; + compatible = "qcom,ravelinp-idp", "qcom,ravelinp", "qcom,idp"; + qcom,board-id = <34 2>; +}; diff --git a/qcom/ravelinp-sg-idp-wcn3950-amoled-rcm.dtsi b/qcom/ravelinp-sg-idp-wcn3950-amoled-rcm.dtsi new file mode 100644 index 00000000..adb42f71 --- /dev/null +++ b/qcom/ravelinp-sg-idp-wcn3950-amoled-rcm.dtsi @@ -0,0 +1,2 @@ +#include "ravelin-sg-idp-wcn3950-amoled-rcm.dtsi" + diff --git a/qcom/ravelinp-sg-idp-wcn3988-4gb.dts b/qcom/ravelinp-sg-idp-wcn3988-4gb.dts new file mode 100644 index 00000000..715d58aa --- /dev/null +++ b/qcom/ravelinp-sg-idp-wcn3988-4gb.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "ravelinp-4gb.dtsi" +#include "ravelinp-sg-idp-wcn3988-4gb.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. RavelinP SG IDP 4GB DDR + WCN3988"; + compatible = "qcom,ravelinp-idp", "qcom,ravelinp", "qcom,idp"; + qcom,board-id = <34 0x601>; +}; diff --git a/qcom/ravelinp-sg-idp-wcn3988-4gb.dtsi b/qcom/ravelinp-sg-idp-wcn3988-4gb.dtsi new file mode 100644 index 00000000..65943132 --- /dev/null +++ b/qcom/ravelinp-sg-idp-wcn3988-4gb.dtsi @@ -0,0 +1 @@ +#include "ravelin-sg-idp-wcn3988-4gb.dtsi" diff --git a/qcom/ravelinp-sg-idp.dts b/qcom/ravelinp-sg-idp.dts new file mode 100644 index 00000000..131bf299 --- /dev/null +++ b/qcom/ravelinp-sg-idp.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "ravelinp-sg.dtsi" +#include "ravelin-adrastea.dtsi" +#include "ravelinp-sg-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. RavelinP SG IDP"; + compatible = "qcom,ravelinp-idp", "qcom,ravelinp", "qcom,idp"; + qcom,board-id = <34 0>; +}; + diff --git a/qcom/ravelinp-sg-idp.dtsi b/qcom/ravelinp-sg-idp.dtsi new file mode 100644 index 00000000..bd3e56dd --- /dev/null +++ b/qcom/ravelinp-sg-idp.dtsi @@ -0,0 +1 @@ +#include "ravelin-sg-idp.dtsi" diff --git a/qcom/ravelinp-sg-qrd-4gb.dts b/qcom/ravelinp-sg-qrd-4gb.dts new file mode 100644 index 00000000..5214f92b --- /dev/null +++ b/qcom/ravelinp-sg-qrd-4gb.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "ravelinp-4gb.dtsi" +#include "ravelinp-sg-qrd-4gb.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. RavelinP SG QRD 4GB DDR"; + compatible = "qcom,ravelinp-qrd", "qcom,ravelinp", "qcom,qrd"; + qcom,board-id = <0x1000B 0x600>; +}; + diff --git a/qcom/ravelinp-sg-qrd-4gb.dtsi b/qcom/ravelinp-sg-qrd-4gb.dtsi new file mode 100644 index 00000000..31255b9d --- /dev/null +++ b/qcom/ravelinp-sg-qrd-4gb.dtsi @@ -0,0 +1,2 @@ +#include "ravelin-sg-qrd-4gb.dtsi" + diff --git a/qcom/ravelinp-sg-qrd.dts b/qcom/ravelinp-sg-qrd.dts new file mode 100644 index 00000000..b244c04e --- /dev/null +++ b/qcom/ravelinp-sg-qrd.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "ravelinp-sg.dtsi" +#include "ravelinp-sg-qrd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. RavelinP SG QRD"; + compatible = "qcom,ravelinp-qrd", "qcom,ravelinp", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; +}; + + diff --git a/qcom/ravelinp-sg-qrd.dtsi b/qcom/ravelinp-sg-qrd.dtsi new file mode 100644 index 00000000..e4d15c46 --- /dev/null +++ b/qcom/ravelinp-sg-qrd.dtsi @@ -0,0 +1 @@ +#include "ravelin-sg-qrd.dtsi" diff --git a/qcom/ravelinp-sg.dts b/qcom/ravelinp-sg.dts new file mode 100644 index 00000000..00b6a710 --- /dev/null +++ b/qcom/ravelinp-sg.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "ravelinp-sg.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. RavelinP SG SoC"; + compatible = "qcom,ravelinp"; + qcom,board-id = <0 0>; +}; + diff --git a/qcom/ravelinp-sg.dtsi b/qcom/ravelinp-sg.dtsi new file mode 100644 index 00000000..81294df0 --- /dev/null +++ b/qcom/ravelinp-sg.dtsi @@ -0,0 +1,13 @@ +#include "ravelin-sg.dtsi" + +/ { + + model = "Qualcomm Technologies, Inc. RavelinP SG"; + compatible = "qcom,ravelinp"; + qcom,msm-id = <654 0x10000>; +}; + +&msm_gpu { + /delete-property/qcom,gpu-model; + qcom,gpu-model = "AdrenoA12v1"; +}; diff --git a/qcom/waipio.dtsi b/qcom/waipio.dtsi index 255d851e..430a1816 100644 --- a/qcom/waipio.dtsi +++ b/qcom/waipio.dtsi @@ -3406,7 +3406,7 @@ <0x146A8000 0x146A8000 0x2000>; qcom,iommu-dma = "fastmap"; dma-coherent; - qcom,ipa-q6-smem-size = <36864>; + qcom,ipa-q6-smem-size = <45056>; }; ipa_smmu_wlan: ipa_smmu_wlan {