diff --git a/arch/arm64/boot/dts/vendor/bindings/arm/msm/msm.txt b/arch/arm64/boot/dts/vendor/bindings/arm/msm/msm.txt index fa8b0f0a302f..5dc4a5c4250c 100644 --- a/arch/arm64/boot/dts/vendor/bindings/arm/msm/msm.txt +++ b/arch/arm64/boot/dts/vendor/bindings/arm/msm/msm.txt @@ -68,6 +68,9 @@ SoCs: - KHAJEQ compatible = "qcom,khajeq" +- KHAJEG + compatible = "qcom,khajeg" + - SCUBA compatible = "qcom,scuba" @@ -265,6 +268,9 @@ compatible = "qcom,khajeq-idp" compatible = "qcom,khajeq-qrd" compatible = "qcom,khajep-atp" compatible = "qcom,khajeq-atp" +compatible = "qcom,khajeg-idp" +compatible = "qcom,khajeg-qrd" +compatible = "qcom,khajeg-atp" compatible = "qcom,scuba-rumi" compatible = "qcom,scuba-idp" compatible = "qcom,scuba-qrd" diff --git a/arch/arm64/boot/dts/vendor/bindings/display/msm/sde-dp.txt b/arch/arm64/boot/dts/vendor/bindings/display/msm/sde-dp.txt index 78812304b887..f056c50f4980 100644 --- a/arch/arm64/boot/dts/vendor/bindings/display/msm/sde-dp.txt +++ b/arch/arm64/boot/dts/vendor/bindings/display/msm/sde-dp.txt @@ -76,6 +76,7 @@ DP Controller: Required properties: - qcom,dp-aux-switch: Phandle for the driver used to program the AUX switch for Display Port orientation. - qcom,dp-hpd-gpio: HPD gpio for direct DP connector without USB PHY or AUX switch. - qcom,dp-gpio-aux-switch: Gpio DP AUX switch chipset support. +- qcom,no_tps4_support: To restrict TPS4 pattern support in link training for Display port. - qcom,-supply-entries: A node that lists the elements of the supply used by the a particular "type" of DSI module. The module "types" can be "core", "ctrl", and "phy". Within the same type, there can be more than one instance of this binding, diff --git a/arch/arm64/boot/dts/vendor/bindings/leds/leds-qpnp-flash-v2.txt b/arch/arm64/boot/dts/vendor/bindings/leds/leds-qpnp-flash-v2.txt index 682f8afbdf59..08c92c5d2a23 100644 --- a/arch/arm64/boot/dts/vendor/bindings/leds/leds-qpnp-flash-v2.txt +++ b/arch/arm64/boot/dts/vendor/bindings/leds/leds-qpnp-flash-v2.txt @@ -28,6 +28,9 @@ Optional properties: - qcom,ramp-down-step : Integer property to specify flash current ramp down time step. Unit is in nS. Allowed values are: 200, 400, 800, 1600, 3200, 6400, 12800, 25600. +- qcom,torch-realtime-brightness-control : Boolean property which enables torch realtime brightness control + which gives option to change brightness from torch node when it is + already enabled from switch node. - qcom,short-circuit-det : Boolean property which enables short circuit fault detection. - qcom,open-circuit-det : Boolean property which enables open circuit fault detection. - qcom,vph-droop-det : Boolean property which enables VPH droop detection. diff --git a/arch/arm64/boot/dts/vendor/bindings/misc/kinetics-nordic.txt b/arch/arm64/boot/dts/vendor/bindings/misc/kinetics-nordic.txt new file mode 100644 index 000000000000..fb36c7010f2f --- /dev/null +++ b/arch/arm64/boot/dts/vendor/bindings/misc/kinetics-nordic.txt @@ -0,0 +1,10 @@ +KINETICS-NORDIC provides a way to configure kinetics-nordic driver. + +Required properties: +- compatible : should be "kinetics,nordic" + +Optional properties: +Example: + nordic { + compatible = "kinetics,nordic"; + }; diff --git a/arch/arm64/boot/dts/vendor/bindings/misc/nordic-spicontroller.txt b/arch/arm64/boot/dts/vendor/bindings/misc/nordic-spicontroller.txt new file mode 100644 index 000000000000..29e48387af1c --- /dev/null +++ b/arch/arm64/boot/dts/vendor/bindings/misc/nordic-spicontroller.txt @@ -0,0 +1,10 @@ +NORDIC-SPICONTROLLER provides a way to configure nordic spi driver. + +Required properties: +- compatible : should be "nordic,spicontroller" + +Optional properties: +Example: + nordic { + compatible = "nordic,spicontroller"; + }; diff --git a/arch/arm64/boot/dts/vendor/bindings/usb/vbus-extcon-genoa.txt b/arch/arm64/boot/dts/vendor/bindings/usb/vbus-extcon-genoa.txt new file mode 100644 index 000000000000..a5b4b95d3f16 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/bindings/usb/vbus-extcon-genoa.txt @@ -0,0 +1,19 @@ +QCOM VBUS GENOA EXTCON driver + +Required properties: + + - compatible : must be "qcom,genoa-extcon" + - genoa_vbus_det : Should specify GPIO for vbus detection. + - genoa_usb_id : Should specify GPIO for USB ID. + - genoa_usb_oe_n : Should specify GPIO for switch enable/disable. + +Example: + + genoa: qcom,genoa-extcon { + compatible = "qcom,genoa-extcon"; + genoa_vbus_det = <&tlmm 19 0x00>; + genoa_usb_id = <&tlmm 111 0x00>; + genoa_usb_oe_n = <&tlmm 24 GPIO_ACTIVE_LOW>; + status = "ok"; + }; + diff --git a/arch/arm64/boot/dts/vendor/qcom/Makefile b/arch/arm64/boot/dts/vendor/qcom/Makefile index 763ea90b4e97..e355e053808b 100644 --- a/arch/arm64/boot/dts/vendor/qcom/Makefile +++ b/arch/arm64/boot/dts/vendor/qcom/Makefile @@ -68,7 +68,10 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ qrb5165m-iot-rb5.dtb \ qrb5165n-iot-rb5.dtb \ qrb5165n-v2-iot-rb5.dtb \ - kona-v2.1-iot-rb5.dtb + kona-v2.1-iot-rb5.dtb \ + kona-7230-iot-rb5.dtb \ + kona-7230m-iot-rb5.dtb + endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) @@ -214,7 +217,9 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) scuba-iot-idp-overlay.dtbo \ scuba-iot-idp-usbc-overlay.dtbo \ scuba-iot-qrd-eldo-overlay.dtbo \ - scuba-iot-qrd-non-eldo-overlay.dtbo + scuba-iot-qrd-non-eldo-overlay.dtbo \ + scuba-iot-rb1-overlay.dtbo \ + scubalite-iot-idp-overlay.dtbo scuba-rumi-overlay.dtbo-base := scuba.dtb scubap.dtb scuba-2gb.dtb scuba-idp-overlay.dtbo-base := scuba.dtb scubap.dtb scuba-2gb.dtb @@ -224,7 +229,9 @@ scuba-idp-usbc-overlay.dtbo-base := scuba.dtb scubap.dtb scuba-2gb.dtb scuba-iot-idp-overlay.dtbo-base := scuba-iot.dtb scuba-iot-2gb.dtb scubap-iot.dtb scubap-iot-idp.dtb scubap-iot-idp-2gb.dtb scuba-iot-qrd-eldo-overlay.dtbo-base := scuba-iot.dtb scubap-iot.dtb scuba-iot-2gb.dtb scuba-iot-qrd-non-eldo-overlay.dtbo-base := scuba-iot.dtb scubap-iot.dtb scuba-iot-2gb.dtb +scuba-iot-rb1-overlay.dtbo-base := scubap-iot-2gb.dtb scuba-iot-idp-usbc-overlay.dtbo-base := scuba-iot.dtb scubap-iot.dtb scuba-iot-2gb.dtb +scubalite-iot-idp-overlay.dtbo-base := scuba-iot-2gb.dtb scubap-iot-2gb.dtb else dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \ scuba-idp.dtb \ @@ -240,9 +247,12 @@ dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \ scubap-iot-idp.dtb \ scuba-iot-qrd-eldo.dtb \ scuba-iot-qrd-non-eldo.dtb \ + scubap-iot-rb1-2gb.dtb \ scubap-iot-idp-2gb.dtb \ scuba-iot-idp-2gb.dtb \ - scuba-iot-idp-usbc-2gb.dtb + scuba-iot-idp-usbc-2gb.dtb \ + scubalite-iot-idp-2gb.dtb \ + scubaplite-iot-idp-2gb.dtb endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) @@ -276,7 +286,17 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) khajeq-idp-nopmi-overlay.dtbo \ khajeq-idp-usbc-overlay.dtbo \ khajeq-idp-pm8010-overlay.dtbo \ - khajeq-idps-display-90hz-overlay.dtbo + khajeq-idps-display-90hz-overlay.dtbo \ + khajeg-atp-overlay.dtbo \ + khajeg-qrd-overlay.dtbo \ + khajeg-qrd-hvdcp3p5-overlay.dtbo \ + khajeg-qrd-nowcd9375-overlay.dtbo \ + khajeg-qrd-nopmi-overlay.dtbo \ + khajeg-idp-overlay.dtbo \ + khajeg-idp-nopmi-overlay.dtbo \ + khajeg-idp-usbc-overlay.dtbo \ + khajeg-idp-pm8010-overlay.dtbo \ + khajeg-idps-display-90hz-overlay.dtbo khaje-atp-overlay.dtbo-base := khaje.dtb khaje-idp-overlay.dtbo-base := khaje.dtb @@ -308,6 +328,16 @@ khajeq-idp-overlay.dtbo-base := khajeq.dtb khajeq-idp-nopmi-overlay.dtbo-base := khajeq.dtb khajeq-idp-pm8010-overlay.dtbo-base := khajeq.dtb khajeq-idp-usbc-overlay.dtbo-base := khajeq.dtb +khajeg-atp-overlay.dtbo-base := khajeg.dtb +khajeg-qrd-overlay.dtbo-base := khajeg.dtb +khajeg-qrd-hvdcp3p5-overlay.dtbo-base := khajeg.dtb +khajeg-qrd-nowcd9375-overlay.dtbo-base := khajeg.dtb +khajeg-qrd-nopmi-overlay.dtbo-base := khajeg.dtb +khajeg-idp-overlay.dtbo-base := khajeg.dtb +khajeg-idp-nopmi-overlay.dtbo-base := khajeg.dtb +khajeg-idp-pm8010-overlay.dtbo-base := khajeg.dtb +khajeg-idp-usbc-overlay.dtbo-base := khajeg.dtb +khajeg-idps-display-90hz-overlay.dtbo-base := khajeg.dtb else dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \ khaje-qrd.dtb \ @@ -336,7 +366,17 @@ dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \ khajeq-qrd.dtb \ khajeq-qrd-nowcd9375.dtb \ khajeq-qrd-hvdcp3p5.dtb \ - khajeq-qrd-nopmi.dtb + khajeq-qrd-nopmi.dtb \ + khajeg-atp.dtb \ + khajeg-qrd.dtb \ + khajeg-qrd-nowcd9375.dtb \ + khajeg-qrd-hvdcp3p5.dtb \ + khajeg-qrd-nopmi.dtb \ + khajeg-idp.dtb \ + khajeg-idp-nopmi.dtb \ + khajeg-idp-usbc.dtb \ + khajeg-idp-pm8010.dtb \ + khajeg-idps-display-90hz.dtb endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) @@ -346,6 +386,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) sdm660-cdp-external-codec-overlay.dtbo \ sdm660-cdp-internal-codec-overlay.dtbo \ sdm660-qrd-external-codec-overlay.dtbo \ + sdm660-qrd-dsi-rm67195-amoled-overlay.dtbo \ sdm660-rcm-external-codec-overlay.dtbo \ sdm660-rcm-internal-codec-overlay.dtbo \ sda660-mtp-external-codec-overlay.dtbo \ @@ -362,6 +403,8 @@ sdm660-cdp-internal-codec-overlay.dtbo-base := sdm660-pm660l.dtb sdm660-qrd-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb +sdm660-qrd-dsi-rm67195-amoled-overlay.dtbo-base := sdm660-pm660a.dtb + sdm660-rcm-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb sdm660-rcm-internal-codec-overlay.dtbo-base := sdm660-pm660l.dtb @@ -400,7 +443,8 @@ sdm660-internal-codec-cdp.dtb \ sdm660-pm660a-headset-jacktype-no-cdp.dtb \ sdm660-pm660a-headset-jacktype-no-rcm.dtb \ sdm660-usbc-audio-mtp.dtb \ - sdm660-usbc-audio-rcm.dtb + sdm660-usbc-audio-rcm.dtb \ + sdm660-qrd-dsi-rm67195-amoled.dtb endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) diff --git a/arch/arm64/boot/dts/vendor/qcom/bengal-sde-display.dtsi b/arch/arm64/boot/dts/vendor/qcom/bengal-sde-display.dtsi index b6d7337b6f5f..0e663b7d2071 100644 --- a/arch/arm64/boot/dts/vendor/qcom/bengal-sde-display.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/bengal-sde-display.dtsi @@ -23,7 +23,7 @@ qcom,panel-supply-entry@1 { reg = <1>; qcom,supply-name = "lab"; - qcom,supply-min-voltage = <4600000>; + qcom,supply-min-voltage = <5600000>; qcom,supply-max-voltage = <6000000>; qcom,supply-enable-load = <100000>; qcom,supply-disable-load = <100>; @@ -32,7 +32,7 @@ qcom,panel-supply-entry@2 { reg = <2>; qcom,supply-name = "ibb"; - qcom,supply-min-voltage = <4600000>; + qcom,supply-min-voltage = <5600000>; qcom,supply-max-voltage = <6000000>; qcom,supply-enable-load = <100000>; qcom,supply-disable-load = <100>; diff --git a/arch/arm64/boot/dts/vendor/qcom/bengal-usb.dtsi b/arch/arm64/boot/dts/vendor/qcom/bengal-usb.dtsi index f3f2d38b2f61..4828bafcd60e 100644 --- a/arch/arm64/boot/dts/vendor/qcom/bengal-usb.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/bengal-usb.dtsi @@ -48,6 +48,7 @@ 0x1a4>; /* GSI_IF_STS */ qcom,dwc-usb3-msm-tx-fifo-size = <21288>; qcom,gsi-disable-io-coherency; + qcom,pm-qos-latency = <40>; qcom,msm-bus,name = "usb0"; qcom,msm-bus,num-cases = <4>; @@ -60,7 +61,7 @@ /* nominal vote */ , + MSM_BUS_SLAVE_EBI_CH0 1000000 1550000>, , , diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-arglass-seeya-dual-1080p-video.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-arglass-seeya-dual-1080p-video.dtsi index 0b6d8193955e..51b0437d2973 100644 --- a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-arglass-seeya-dual-1080p-video.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-arglass-seeya-dual-1080p-video.dtsi @@ -52,7 +52,7 @@ /* CMD2 P1 */ 39 01 00 00 00 00 03 F0 AA 11 39 01 00 00 00 00 02 C0 00 - 39 01 00 00 00 00 0C C2 03 FF 03 FF 03 FF 03 FF 82 00 00 + 39 01 00 00 00 00 0C C2 01 32 01 32 01 32 01 32 02 00 00 /* CMD2 P2 */ 39 01 00 00 00 00 03 F0 AA 12 39 01 00 00 00 00 03 BF 37 A9 diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi index e6ce614d032b..7093e4d69695 100644 --- a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi @@ -14,6 +14,7 @@ qcom,dsi-ctrl-num = <0 1>; qcom,dsi-phy-num = <0 1>; qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; + qcom,cmd-sync-wait-broadcast; qcom,mdss-dsi-traffic-mode = "non_burst_sync_event"; qcom,mdss-dsi-bllp-eof-power-mode; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-atp-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-atp-overlay.dts index bc5789fca0e4..4ea2a6b2527f 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-atp-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-atp-overlay.dts @@ -7,7 +7,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje ATP"; compatible = "qcom,khaje-atp", "qcom,khaje", "qcom,atp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <33 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-nopmi-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-nopmi-overlay.dts index 566b24f0a0c5..5adb18903870 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-nopmi-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-nopmi-overlay.dts @@ -7,7 +7,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDP nopmi"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10022 0>; qcom,pmic-id = <0x2D 0x0 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-overlay.dts index dea903c531da..cf0ca2ac02ab 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-overlay.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje IDP"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10022 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-pm8010-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-pm8010-overlay.dts index 6031d8894657..6679cb5097dd 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-pm8010-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-pm8010-overlay.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje IDP with PM8010"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10222 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc-overlay.dts index 4993cdae8d6f..cc179681b316 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDP USBC Audio"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1010022 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc.dts index 7a62a6d184dd..76acc9f699ef 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-idp-usbc.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDP USBC Audio"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1010022 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-idps-display-90hz-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-idps-display-90hz-overlay.dts index 02711ed2d2be..d10154866ec5 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-idps-display-90hz-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-idps-display-90hz-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDPS + 90Hz"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10122 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-hvdcp3p5-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-hvdcp3p5-overlay.dts index a5fb87ebcec9..04a8ea9ba8f8 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-hvdcp3p5-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-hvdcp3p5-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje QRD HVDCP3P5"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1010B 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nopmi-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nopmi-overlay.dts index eab93663e082..865b1a685b7e 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nopmi-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nopmi-overlay.dts @@ -7,7 +7,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE QRD nopmi overlay"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1000B 0>; qcom,pmic-id = <0x2D 0x0 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nowcd9375-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nowcd9375-overlay.dts index 17dcc66bd94d..57ca7d8797fd 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nowcd9375-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-nowcd9375-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje QRD NOWCD9375"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x2010B 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-overlay.dts index 7c8960f3aa24..dcef4a89119a 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-overlay.dts +++ b/arch/arm64/boot/dts/vendor/qcom/khaje-qrd-overlay.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje QRD"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1000B 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/khaje.dtsi b/arch/arm64/boot/dts/vendor/qcom/khaje.dtsi index c3b720cbed01..bdf659d470ad 100644 --- a/arch/arm64/boot/dts/vendor/qcom/khaje.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/khaje.dtsi @@ -21,7 +21,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje SoC"; compatible = "qcom,khaje"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; interrupt-parent = <&wakegic>; #address-cells = <2>; @@ -611,7 +611,7 @@ interrupts-extended = <&wakegic GIC_SPI 197 IRQ_TYPE_EDGE_RISING>; reg = <0x45f01b8 0x1000>, - <0xf011008 0x4>; /* MSM_APCS_GCC_BASE 4K */ + <0xf111008 0x4>; /* MSM_APCS_GCC_BASE 4K */ reg-names = "vmpm", "ipc"; qcom,num-mpm-irqs = <96>; interrupt-controller; @@ -1952,6 +1952,7 @@ qcom,chd_silver { compatible = "qcom,core-hang-detect"; label = "silver"; + cluster-id = <0>; qcom,threshold-arr = <0x0f1880b0 0x0f1980b0 0x0f1a80b0 0x0f1b80b0>; qcom,config-arr = <0x0f1880b8 0x0f1980b8 @@ -1961,6 +1962,7 @@ qcom,chd_gold { compatible = "qcom,core-hang-detect"; label = "gold"; + cluster-id = <1>; qcom,threshold-arr = <0x0f0880b0 0x0f0980b0 0x0f0a80b0 0x0f0b80b0>; qcom,config-arr = <0x0f0880b8 0x0f0980b8 diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-atp-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-atp-overlay.dts new file mode 100644 index 000000000000..79bac234006a --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-atp-overlay.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg ATP"; + compatible = "qcom,khajeg-atp", "qcom,khajeg", "qcom,atp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <33 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-atp.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-atp.dts new file mode 100644 index 000000000000..56aea0174f20 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-atp.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg ATP"; + compatible = "qcom,khajeg-atp", "qcom,khajeg", "qcom,atp"; + qcom,board-id = <33 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; + diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-atp.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-atp.dtsi new file mode 100644 index 000000000000..7d5f1b74ce92 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-atp.dtsi @@ -0,0 +1 @@ +#include "khaje-atp.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi-overlay.dts new file mode 100644 index 000000000000..14b4eee8dc36 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi-overlay.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-idp-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP nopmi"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x10022 0>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi.dts new file mode 100644 index 000000000000..c5d8be833149 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-idp-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP nopmi"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,board-id = <0x10022 0>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi.dtsi new file mode 100644 index 000000000000..9e8333567514 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-nopmi.dtsi @@ -0,0 +1 @@ +#include "khaje-idp-nopmi.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-overlay.dts new file mode 100644 index 000000000000..fb83a78aebe1 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-overlay.dts @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-idp.dtsi" +#include "khaje-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x10022 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010-overlay.dts new file mode 100644 index 000000000000..e1ed40e65e79 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010-overlay.dts @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-idp.dtsi" +#include "khajeg-idp-pm8010.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP with PM8010"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x10222 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010.dts new file mode 100644 index 000000000000..cf5a7a2b5ed3 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-idp.dtsi" +#include "khajeg-idp-pm8010.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP with PM8010"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,board-id = <0x10222 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010.dtsi new file mode 100644 index 000000000000..fb9ae3984c65 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-pm8010.dtsi @@ -0,0 +1,5 @@ +#include "khaje-idp-pm8010.dtsi" + +&soc { +}; + diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc-overlay.dts new file mode 100644 index 000000000000..67d894e6ae71 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc-overlay.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-idp.dtsi" +#include "khaje-idp-pm7250b.dtsi" +#include "khajeg-idp-usbc.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP USBC Audio"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x1010022 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc.dts new file mode 100644 index 000000000000..554ca0cefc89 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-idp.dtsi" +#include "khaje-idp-pm7250b.dtsi" +#include "khajeg-idp-usbc.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP USBC Audio"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x1010022 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc.dtsi new file mode 100644 index 000000000000..e860d883405f --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp-usbc.dtsi @@ -0,0 +1 @@ +#include "khaje-idp-usbc.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp.dts new file mode 100644 index 000000000000..b1e1d9d848cf --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-idp.dtsi" +#include "khaje-idp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,board-id = <0x10022 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idp.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp.dtsi new file mode 100644 index 000000000000..d57138fc87da --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idp.dtsi @@ -0,0 +1,65 @@ +#include "khaje-idp.dtsi" + +&soc { + qcom,cam-res-mgr { + status = "disabled"; + }; +}; + +&cam_cci0 { + qcom,actuator0 { + status = "disabled"; + }; + + qcom,actuator1 { + status = "disabled"; + }; + + qcom,eeprom0 { + status = "disabled"; + }; + + qcom,eeprom1 { + status = "disabled"; + }; + + qcom,eeprom2 { + status = "disabled"; + }; + + qcom,eeprom3 { + status = "disabled"; + }; + + qcom,camera-flash@0 { + status = "disabled"; + }; + + qcom,camera-flash@1 { + status = "disabled"; + }; + + qcom,camera-flash@2 { + status = "disabled"; + }; + + /* Rear*/ + qcom,cam-sensor0 { + status = "disabled"; + }; + + /*Rear Aux*/ + qcom,cam-sensor1 { + status = "disabled"; + }; + + /*Front*/ + qcom,cam-sensor2 { + status = "disabled"; + }; + + /*Rear Aux2*/ + qcom,cam-sensor3 { + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz-overlay.dts new file mode 100644 index 000000000000..0153dd55470b --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz-overlay.dts @@ -0,0 +1,16 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-idp.dtsi" +#include "khaje-idp-pm7250b.dtsi" +#include "khajeg-idps-display-90hz.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDPS + 90Hz"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x10122 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; + diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz.dts new file mode 100644 index 000000000000..690ac587794d --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-idp.dtsi" +#include "khaje-idp-pm7250b.dtsi" +#include "khajeg-idps-display-90hz.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDPS + 90Hz"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,board-id = <0x10122 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; + diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz.dtsi new file mode 100644 index 000000000000..42408d896e5a --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-idps-display-90hz.dtsi @@ -0,0 +1 @@ +#include "khaje-idps-display-90hz.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5-overlay.dts new file mode 100644 index 000000000000..62558189a734 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5-overlay.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-qrd.dtsi" +#include "khaje-qrd-pm7250b.dtsi" +#include "khajeg-qrd-hvdcp3p5.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD HVDCP3P5"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x1010B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5.dts new file mode 100644 index 000000000000..3f25af78ea3b --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-qrd.dtsi" +#include "khaje-qrd-pm7250b.dtsi" +#include "khajeg-qrd-hvdcp3p5.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD HVDCP3P5"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,board-id = <0x1010B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5.dtsi new file mode 100644 index 000000000000..ff96a6ad684f --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-hvdcp3p5.dtsi @@ -0,0 +1 @@ +#include "khaje-qrd-hvdcp3p5.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi-overlay.dts new file mode 100644 index 000000000000..e3b23c36be9a --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi-overlay.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-qrd-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD nopmi overlay"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi.dts new file mode 100644 index 000000000000..4641597e8645 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-qrd-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD nopmi"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi.dtsi new file mode 100644 index 000000000000..75508de0e1c9 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nopmi.dtsi @@ -0,0 +1 @@ +#include "khaje-qrd-nopmi.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375-overlay.dts new file mode 100644 index 000000000000..6bb173f74255 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375-overlay.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-qrd.dtsi" +#include "khaje-qrd-pm7250b.dtsi" +#include "khajeg-qrd-nowcd9375.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD NOWCD9375"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x2010B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375.dts new file mode 100644 index 000000000000..fe70430574ca --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-qrd.dtsi" +#include "khaje-qrd-pm7250b.dtsi" +#include "khajeg-qrd-nowcd9375.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD NOWCD9375"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,board-id = <0x2010B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375.dtsi new file mode 100644 index 000000000000..9bfad21409df --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-nowcd9375.dtsi @@ -0,0 +1 @@ +#include "khaje-qrd-nowcd9375.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-overlay.dts new file mode 100644 index 000000000000..9493ead36719 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd-overlay.dts @@ -0,0 +1,18 @@ +/dts-v1/; +/plugin/; + +#include +#include "khajeg-qrd.dtsi" +#include "khaje-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; + +&bengal_snd { + qcom,wcd-datalane-mismatch = <1>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd.dts new file mode 100644 index 000000000000..a1a16c7808fb --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "khajeg.dtsi" +#include "khajeg-qrd.dtsi" +#include "khaje-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg QRD"; + compatible = "qcom,khajeg-qrd", "qcom,khajeg", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd.dtsi new file mode 100644 index 000000000000..fb7ae12b9075 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg-qrd.dtsi @@ -0,0 +1,5 @@ +#include "khaje-qrd.dtsi" + +&soc { +}; + diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg.dts b/arch/arm64/boot/dts/vendor/qcom/khajeg.dts new file mode 100644 index 000000000000..0a429c572ca4 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "khajeg.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg SoC"; + compatible = "qcom,khajeg"; + qcom,board-id = <0 0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/khajeg.dtsi b/arch/arm64/boot/dts/vendor/qcom/khajeg.dtsi new file mode 100644 index 000000000000..c4655e8b44d1 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/khajeg.dtsi @@ -0,0 +1,123 @@ +/dts-v1/; + +#include "khaje.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Khajeg SoC"; + compatible = "qcom,khajeg"; + qcom,msm-id = <585 0x10000>; +}; +&soc { + qcom,cam-req-mgr { + status = "disabled"; + }; + + cam_csiphy0: qcom,csiphy0 { + status = "disabled"; + }; + + cam_csiphy1: qcom,csiphy1 { + status = "disabled"; + }; + + cam_csiphy2: qcom,csiphy2 { + status = "disabled"; + }; + + cam_cci0: qcom,cci0 { + status = "disabled"; + }; + + qcom,cam_smmu { + status = "disabled"; + }; + + qcom,cam-cpas@5c11000 { + status = "disabled"; + }; + + qcom,cam-cdm-intf { + status = "disabled"; + }; + + cam_cpas_cdm: qcom,cpas-cdm0@5c23000 { + status = "disabled"; + }; + + cam_ope_cdm: qcom,ope-cdm0@5c42000 { + status = "disabled"; + }; + + qcom,cam-isp { + status = "disabled"; + }; + + cam_tfe_csid0: qcom,tfe_csid0@5c6e000 { + status = "disabled"; + }; + + cam_tfe0: qcom,tfe0@5c6e000 { + status = "disabled"; + }; + + cam_tfe_csid1: qcom,tfe_csid1@5c75000 { + status = "disabled"; + }; + + cam_tfe1: qcom,tfe1@5c75000 { + status = "disabled"; + }; + + cam_tfe_csid2: qcom,tfe_csid2@5c7c000 { + status = "disabled"; + }; + + cam_tfe2: qcom,tfe2@5c7c000 { + status = "disabled"; + }; + + cam_ppi0: qcom,ppi0@5cb3000 { + status = "disabled"; + }; + + cam_ppi1: qcom,ppi1@5cb3200 { + status = "disabled"; + }; + + cam_ppi2: qcom,ppi2@5cb3400 { + status = "disabled"; + }; + + cam_tfe_tpg0: qcom,tpg0@5c66000 { + status = "disabled"; + }; + + cam_tfe_tpg1: qcom,tpg0@5c68000 { + status = "disabled"; + }; + + qcom,cam-ope { + status = "disabled"; + }; + + ope: qcom,ope@0x5c42000 { + status = "disabled"; + }; + + qcom,msm_gsi { + status = "disabled"; + }; + + qcom,rmnet-ipa { + status = "disabled"; + }; + + qcom,ipa_fws { + status = "disabled"; + }; + + ipa_hw: qcom,ipa@0x5800000 { + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-cpu.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-cpu.dtsi new file mode 100644 index 000000000000..2ba75e851836 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-cpu.dtsi @@ -0,0 +1,394 @@ +/ { + /delete-node/ cpus; + + cpus { + #address-cells = <2>; + #size-cells = <0>; + + CPU0: cpu@0 { + device_type = "cpu"; + compatible = "qcom,kryo"; + reg = <0x0 0x0>; + enable-method = "psci"; + cpu-release-addr = <0x0 0x90000000>; + next-level-cache = <&L2_0>; + qcom,freq-domain = <&cpufreq_hw 0 4>; + capacity-dmips-mhz = <1024>; + dynamic-power-coefficient = <100>; + #cooling-cells = <2>; + L2_0: l2-cache { + compatible = "arm,arch-cache"; + cache-level = <2>; + next-level-cache = <&L3_0>; + + L3_0: l3-cache { + compatible = "arm,arch-cache"; + cache-level = <3>; + }; + }; + + L1_I_0: l1-icache { + compatible = "arm,arch-cache"; + }; + + L1_D_0: l1-dcache { + compatible = "arm,arch-cache"; + }; + }; + + CPU1: cpu@100 { + device_type = "cpu"; + compatible = "qcom,kryo"; + reg = <0x0 0x100>; + enable-method = "psci"; + cpu-release-addr = <0x0 0x90000000>; + next-level-cache = <&L2_1>; + qcom,freq-domain = <&cpufreq_hw 0 4>; + capacity-dmips-mhz = <1024>; + dynamic-power-coefficient = <100>; + L2_1: l2-cache { + compatible = "arm,arch-cache"; + cache-level = <2>; + next-level-cache = <&L3_0>; + }; + + L1_I_100: l1-icache { + compatible = "arm,arch-cache"; + }; + + L1_D_100: l1-dcache { + compatible = "arm,arch-cache"; + }; + }; + + CPU2: cpu@400 { + device_type = "cpu"; + compatible = "qcom,kryo"; + reg = <0x0 0x400>; + enable-method = "psci"; + cpu-release-addr = <0x0 0x90000000>; + next-level-cache = <&L2_4>; + qcom,freq-domain = <&cpufreq_hw 1 4>; + capacity-dmips-mhz = <1894>; + dynamic-power-coefficient = <514>; + #cooling-cells = <2>; + L2_4: l2-cache { + compatible = "arm,arch-cache"; + cache-level = <2>; + next-level-cache = <&L3_0>; + }; + + L1_I_400: l1-icache { + compatible = "arm,arch-cache"; + }; + + L1_D_400: l1-dcache { + compatible = "arm,arch-cache"; + }; + }; + + CPU3: cpu@500 { + device_type = "cpu"; + compatible = "qcom,kryo"; + reg = <0x0 0x500>; + enable-method = "psci"; + cpu-release-addr = <0x0 0x90000000>; + next-level-cache = <&L2_5>; + qcom,freq-domain = <&cpufreq_hw 1 4>; + capacity-dmips-mhz = <1894>; + dynamic-power-coefficient = <514>; + L2_5: l2-cache { + compatible = "arm,arch-cache"; + cache-level = <2>; + next-level-cache = <&L3_0>; + }; + + L1_I_500: l1-icache { + compatible = "arm,arch-cache"; + }; + + L1_D_500: l1-dcache { + compatible = "arm,arch-cache"; + }; + }; + + CPU4: cpu@600 { + device_type = "cpu"; + compatible = "qcom,kryo"; + reg = <0x0 0x600>; + enable-method = "psci"; + cpu-release-addr = <0x0 0x90000000>; + next-level-cache = <&L2_6>; + qcom,freq-domain = <&cpufreq_hw 1 4>; + capacity-dmips-mhz = <1894>; + dynamic-power-coefficient = <514>; + L2_6: l2-cache { + compatible = "arm,arch-cache"; + cache-level = <2>; + next-level-cache = <&L3_0>; + }; + + L1_I_600: l1-icache { + compatible = "arm,arch-cache"; + }; + + L1_D_600: l1-dcache { + compatible = "arm,arch-cache"; + }; + }; + + CPU5: cpu@700 { + device_type = "cpu"; + compatible = "qcom,kryo"; + reg = <0x0 0x700>; + enable-method = "psci"; + cpu-release-addr = <0x0 0x90000000>; + next-level-cache = <&L2_7>; + qcom,freq-domain = <&cpufreq_hw 2 4>; + capacity-dmips-mhz = <1894>; + dynamic-power-coefficient = <598>; + #cooling-cells = <2>; + L2_7: l2-cache { + compatible = "arm,arch-cache"; + cache-level = <2>; + next-level-cache = <&L3_0>; + }; + + L1_I_700: l1-icache { + compatible = "arm,arch-cache"; + }; + + L1_D_700: l1-dcache { + compatible = "arm,arch-cache"; + }; + }; + + cpu-map { + cluster0 { + core0 { + cpu = <&CPU0>; + }; + + core1 { + cpu = <&CPU1>; + }; + }; + + cluster1 { + core0 { + cpu = <&CPU2>; + }; + + core1 { + cpu = <&CPU3>; + }; + + core2 { + cpu = <&CPU4>; + }; + }; + + cluster2 { + core0 { + cpu = <&CPU5>; + }; + }; + }; + }; + +}; + +&soc { + /delete-node/ dsu_pmu@0; + /delete-node/ jtagmm@7240000; + /delete-node/ jtagmm@7340000; + /delete-node/ cti@7220000; + /delete-node/ cti@7320000; + /delete-node/ etm@7240000; + /delete-node/ etm@7340000; + + dsu_pmu@0 { + compatible = "arm,dsu-pmu"; + interrupts = ; + cpus = <&CPU0>, <&CPU1>, + <&CPU2>, <&CPU3>, <&CPU4>, <&CPU5>; + }; + + qcom,lpm-levels { + qcom,pm-cluster@0 { + qcom,pm-cpu@0 { + /delete-property/ qcom,cpu; + qcom,cpu = <&CPU0 &CPU1>; + }; + + qcom,pm-cpu@1 { + /delete-property/ qcom,cpu; + qcom,cpu = <&CPU2 &CPU3 &CPU4 &CPU5>; + + }; + }; + }; + +}; + +&funnel_apss { + ports { + /delete-node/ port@3; + /delete-node/ port@4; + }; +}; + +&cti_cpu4 { + /delete-property/ cpu; + cpu = <&CPU2>; +}; + +&cti_cpu5 { + /delete-property/ cpu; + cpu = <&CPU3>; +}; + +&cti_cpu6 { + /delete-property/ cpu; + cpu = <&CPU4>; +}; + +&cti_cpu7 { + /delete-property/ cpu; + cpu = <&CPU5>; +}; + +&etm4 { + /delete-property/ cpu; + cpu = <&CPU2>; +}; + +&etm5 { + /delete-property/ cpu; + cpu = <&CPU3>; +}; + +&etm6 { + /delete-property/ cpu; + cpu = <&CPU4>; +}; + +&etm7 { + /delete-property/ cpu; + cpu = <&CPU5>; +}; + +&jtag_mm4 { + /delete-property/ qcom,coresight-jtagmm-cpu; + qcom,coresight-jtagmm-cpu = <&CPU2>; +}; + +&jtag_mm5 { + /delete-property/ qcom,coresight-jtagmm-cpu; + qcom,coresight-jtagmm-cpu = <&CPU3>; +}; + +&jtag_mm6 { + /delete-property/ qcom,coresight-jtagmm-cpu; + qcom,coresight-jtagmm-cpu = <&CPU4>; +}; + +&jtag_mm7 { + /delete-property/ qcom,coresight-jtagmm-cpu; + qcom,coresight-jtagmm-cpu = <&CPU5>; +}; + +&cpu0_memlat_cpugrp { + /delete-property/ qcom,cpulist; + qcom,cpulist = <&CPU0 &CPU1>; + + qcom,cpu0-llcc-ddr-latmon { + /delete-property/ qcom,cpulist; + qcom,cpulist = <&CPU0 &CPU1>; + }; +}; + +&cpu4_memlat_cpugrp { + /delete-property/ qcom,cpulist; + qcom,cpulist = <&CPU2 &CPU3 &CPU4 &CPU5>; + qcom,cpu4-cpu-l3-latmon { + /delete-property/ qcom,cpulist; + qcom,cpulist = <&CPU2 &CPU3 &CPU4>; + }; + + qcom,cpu7-cpu-l3-latmon { + /delete-property/ qcom,cpulist; + qcom,cpulist = <&CPU5>; + }; + + qcom,cpu4-llcc-ddr-latmon { + /delete-property/ qcom,cpulist; + qcom,cpulist = <&CPU2 &CPU3 &CPU4 &CPU5>; + }; +}; + +&cpufreq_hw { + /delete-node/ qcom,cpu-isolation; + qcom,cpu-isolation { + compatible = "qcom,cpu-isolate"; + cpu0_isolate: cpu0-isolate { + qcom,cpu = <&CPU0>; + #cooling-cells = <2>; + }; + + cpu1_isolate: cpu1-isolate { + qcom,cpu = <&CPU1>; + #cooling-cells = <2>; + }; + + cpu4_isolate: cpu4-isolate { + qcom,cpu = <&CPU2>; + #cooling-cells = <2>; + }; + + cpu5_isolate: cpu5-isolate { + qcom,cpu = <&CPU3>; + #cooling-cells = <2>; + }; + + cpu6_isolate: cpu6-isolate { + qcom,cpu = <&CPU4>; + #cooling-cells = <2>; + }; + + cpu7_isolate: cpu7-isolate { + qcom,cpu = <&CPU5>; + #cooling-cells = <2>; + }; + }; + + /delete-node/ cpu7-notify; + cpu7_notify: cpu7-notify { + qcom,cooling-cpu = <&CPU5>; + #cooling-cells = <2>; + }; +}; + +&thermal_zones { + /delete-node/ cpu-0-2-step; + /delete-node/ cpu-0-3-step; + + pop-mem-step { + cooling-maps { + pop_cdev4 { + /delete-property/ cooling-device; + cooling-device = + <&CPU2 THERMAL_NO_LIMIT + THERMAL_NO_LIMIT>; + }; + + pop_cdev7 { + /delete-property/ cooling-device; + cooling-device = + <&CPU5 THERMAL_NO_LIMIT + THERMAL_NO_LIMIT>; + }; + }; + }; +}; + diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-rb5.dts b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-rb5.dts new file mode 100644 index 000000000000..807dbe48099d --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-rb5.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "kona-7230-iot-v2.1.dtsi" +#include "kona-7230-iot-rb5.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. kona-7230 IOT RB5"; + compatible = "qcom,kona-iot", "qcom,kona", "qcom,iot"; + qcom,board-id = <11 3>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-rb5.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-rb5.dtsi new file mode 100644 index 000000000000..64b5c89a5893 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-rb5.dtsi @@ -0,0 +1,51 @@ +#include "kona-v2.1-iot-rb5.dtsi" + + +&sde_dsi { + status = "disabled"; +}; + +&sde_dsi1 { + status = "disabled"; +}; + +&mdss_dsi0_pll { + status = "disabled"; +}; + +&mdss_dsi1_pll { + status = "disabled"; +}; + +&cont_splash_memory { + status = "disabled"; +}; + +&disp_rdump_memory { + status = "disabled"; +}; + +&sde_dp { + label = "primary"; + /delete-property/ qcom,max-hdisplay; + /delete-property/ qcom,max-vdisplay; + /delete-property/ qcom,max-pclk-frequency-khz; + qcom,no_tps4_support; +}; + +&mdss_mdp { + /delete-property/ connectors; + connectors = <&sde_dp &sde_rscc>; +}; + +&usb1 { + status = "disabled"; +}; + +&usb_qmp_phy { + status = "disabled"; +}; + +&usb2_phy1 { + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-v2.1.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-v2.1.dtsi new file mode 100644 index 000000000000..8f7fc60555eb --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/kona-7230-iot-v2.1.dtsi @@ -0,0 +1,8 @@ +#include "kona-iot-v2.1.dtsi" +#include "kona-7230-iot-cpu.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kona-7230-iot v2.1"; + compatible = "qcom,kona-iot"; + qcom,msm-id = <548 0x20001>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-7230m-iot-rb5.dts b/arch/arm64/boot/dts/vendor/qcom/kona-7230m-iot-rb5.dts new file mode 100644 index 000000000000..3ec7a6e6cdb7 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/kona-7230m-iot-rb5.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "kona-7230-iot-v2.1.dtsi" +#include "kona-7230m-iot-rb5.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KONA-7230M IOT RB5"; + compatible = "qcom,kona-iot", "qcom,kona", "qcom,iot"; + qcom,board-id = <0x04000B 0x03>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-7230m-iot-rb5.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-7230m-iot-rb5.dtsi new file mode 100644 index 000000000000..d1dfc51edc53 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/kona-7230m-iot-rb5.dtsi @@ -0,0 +1,2 @@ +#include "kona-v2.1-iot-rb5.dtsi" + diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-arglass.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-arglass.dtsi index 4462f13f5e1a..0298dc3d5aeb 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-arglass.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-arglass.dtsi @@ -562,7 +562,7 @@ /delete-property/ avdd-supply; lab-supply = <&lcdb_ldo_vreg>; ibb-supply = <&lcdb_ncp_vreg>; - qcom,dsi-default-panel = <&dsi_dual_arglass_seeya_90hz_video>; + qcom,dsi-default-panel = <&dsi_dual_arglass_seeya_video>; }; &display_panel_avdd { @@ -683,6 +683,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -697,6 +698,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -711,6 +713,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -725,6 +728,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -739,6 +743,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -753,12 +758,19 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; hysteresis = <1000>; type = "passive"; }; + + active-config1 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; }; }; @@ -767,6 +779,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-cvp.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-cvp.dtsi index 460cd4ac47ff..ab74d02fd872 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-cvp.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-cvp.dtsi @@ -61,6 +61,7 @@ <&apps_smmu 0x2120 0x400>; buffer-types = <0xfff>; qcom,iommu-dma-addr-pool = <0x4b000000 0x90000000>; + qcom,iommu-faults = "non-fatal", "stall-disable"; }; @@ -72,6 +73,7 @@ buffer-types = <0x741>; qcom,iommu-dma-addr-pool = <0x01000000 0x25800000>; qcom,iommu-vmid = <0xB>; + qcom,iommu-faults = "non-fatal", "stall-disable"; }; cvp_secure_pixel_cb { @@ -82,6 +84,7 @@ buffer-types = <0x106>; qcom,iommu-dma-addr-pool = <0x26800000 0x24800000>; qcom,iommu-vmid = <0xA>; + qcom,iommu-faults = "non-fatal", "stall-disable"; }; /* Memory Heaps */ diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-iot-v2.1.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-iot-v2.1.dtsi new file mode 100644 index 000000000000..56627348b2a2 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/kona-iot-v2.1.dtsi @@ -0,0 +1,27 @@ + #include "kona-v2.1.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. kona-iot v2.1"; + compatible = "qcom,kona-iot"; + qcom,msm-id = <481 0x20001>; +}; + +&soc { + msm_vidc: qcom,vidc@aa00000 { + compatible = "qcom,msm-vidc", "qcom,qcs8250-vidc"; + }; +}; + +&mdss_dsi0_pll { + /delete-property/ qcom,dsi-pll-ssc-en; + /delete-property/ qcom,dsi-pll-ssc-mode; +}; + +&mdss_dsi1_pll { + /delete-property/ qcom,dsi-pll-ssc-en; + /delete-property/ qcom,dsi-pll-ssc-mode; +}; + +&pcie2 { + qcom,boot-option = <0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-pinctrl.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-pinctrl.dtsi index 51c240c3b303..aabae01e48fe 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-pinctrl.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-pinctrl.dtsi @@ -45,6 +45,7 @@ <83 0 &pdc 97 0>, <84 0 &pdc 98 0>, <86 0 &pdc 99 0>, + <87 0 &pdc 100 0>, <88 0 &pdc 101 0>, <89 0 &pdc 102 0>, <92 0 &pdc 103 0>, diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-sde.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-sde.dtsi index 7f8760442ca1..7046282d4e8e 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-sde.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-sde.dtsi @@ -73,6 +73,7 @@ qcom,sde-wb-xin-id = <6>; qcom,sde-wb-id = <2>; qcom,sde-wb-clk-ctrl = <0x2bc 16>; + qcom,sde-wb-clk-status = <0x3bc 20>; qcom,sde-intf-off = <0x6b000 0x6b800 0x6c000 0x6c800>; @@ -405,6 +406,8 @@ qcom,widebus-enable; qcom,dsc-feature-enable; qcom,fec-feature-enable; + qcom,max-dp-dsc-blks = <2>; + qcom,max-dp-dsc-input-width-pixs = <2048>; qcom,ctrl-supply-entries { #address-cells = <1>; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-v2.1-iot-rb5.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-v2.1-iot-rb5.dtsi index 4b2aa986b610..611f32ec8773 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-v2.1-iot-rb5.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-v2.1-iot-rb5.dtsi @@ -393,6 +393,37 @@ }; #include "smb1390.dtsi" + + fsa4480: fsa4480@43 { + status = "disabled"; + }; + + redriver: redriver@1c { + compatible = "onnn,redriver"; + reg = <0x1c>; + set-aux-enable; + extcon = <&pm8150b_pdphy>, <&pm8150b_pdphy>; + eq = /bits/ 8 < + /* Parameters for USB */ + 0x4 0x4 0x4 0x4 + /* Parameters for DP */ + 0x6 0x4 0x4 0x6>; + flat-gain = /bits/ 8 < + /* Parameters for USB */ + 0x3 0x1 0x1 0x3 + /* Parameters for DP */ + 0x2 0x1 0x1 0x2>; + output-comp = /bits/ 8 < + /* Parameters for USB */ + 0x3 0x3 0x3 0x3 + /* Parameters for DP */ + 0x3 0x3 0x3 0x3>; + loss-match = /bits/ 8 < + /* Parameters for USB */ + 0x1 0x3 0x3 0x1 + /* Parameters for DP */ + 0x3 0x3 0x3 0x3>; + }; }; &qupv3_se4_i2c { @@ -425,3 +456,23 @@ status = "okay"; }; }; + +&q6core { + kona_snd: sound { + /delete-property/ fsa4480-i2c-handle; + }; +}; + +&sde_dp { + qcom,dp-aux-switch = <&redriver>; + qcom,aux-en-gpio = <&tlmm 69 0>; + qcom,aux-sel-gpio = <&tlmm 71 0>; + + qcom,max-hdisplay = <1920>; + qcom,max-vdisplay = <1080>; + qcom,max-pclk-frequency-khz = <187500>; +}; + +&pcie2 { + qcom,boot-option = <0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-xr.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-xr.dtsi index 00b68e180fee..fe215ab206f4 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-xr.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-xr.dtsi @@ -1060,6 +1060,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1074,6 +1075,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1088,6 +1090,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1102,6 +1105,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1116,6 +1120,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1130,12 +1135,19 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; hysteresis = <1000>; type = "passive"; }; + + active-config1 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; }; }; @@ -1144,6 +1156,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion-ult.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion-ult.dtsi index d9c697827026..86938f0071bd 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion-ult.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion-ult.dtsi @@ -887,6 +887,14 @@ }; &dsi_panel_pwr_supply_lab_ibb { + qcom,panel-supply-entry@1 { + qcom,supply-min-voltage = <5700000>; + }; + + qcom,panel-supply-entry@2 { + qcom,supply-min-voltage = <5700000>; + }; + qcom,panel-supply-entry@3 { reg = <1>; qcom,supply-name = "avdd"; @@ -985,6 +993,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -999,6 +1008,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1013,6 +1023,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1027,6 +1038,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1041,6 +1053,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1055,12 +1068,19 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; hysteresis = <1000>; type = "passive"; }; + + active-config1 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; }; }; @@ -1069,6 +1089,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion.dtsi index 5d27eb9c9f22..61f8c6db9eb1 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-xrfusion.dtsi @@ -924,6 +924,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -938,6 +939,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -952,6 +954,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -966,6 +969,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -980,6 +984,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -994,12 +999,19 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; hysteresis = <1000>; type = "passive"; }; + + active-config1 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; }; }; @@ -1008,6 +1020,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; diff --git a/arch/arm64/boot/dts/vendor/qcom/kona-xrsku4.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona-xrsku4.dtsi index 5c54ac875eeb..f70b218f69d0 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona-xrsku4.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona-xrsku4.dtsi @@ -206,6 +206,172 @@ drive-strength = <2>; /* 2 MA */ }; }; + + nordic_gpio6_suspend: nordic_gpio6_suspend { + mux { + pins = "gpio71"; + function = "gpio"; + }; + + config { + pins = "gpio71"; + drive-strength = <8>; + bias-disable = <0>; + output-high; + }; + }; + + /* active low due to hmd nordic */ + nordic_gpio6_active: nordic_gpio6_active { + mux { + pins = "gpio71"; + function = "gpio"; + }; + + config { + pins = "gpio71"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + nordic_gpio10_active: nordic_gpio10_active { + mux { + pins = "gpio14"; + function = "gpio"; + }; + + config { + pins = "gpio14"; + drive-strength = <8>; + bias-disable = <0>; + output-high; + }; + }; + + nordic_gpio10_suspend: nordic_gpio10_suspend { + mux { + pins = "gpio14"; + function = "gpio"; + }; + + config { + pins = "gpio14"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + nordic_gpio11_active: nordic_gpio11_active { + mux { + pins = "gpio72"; + function = "gpio"; + }; + + config { + pins = "gpio72"; + drive-strength = <8>; + bias-disable = <0>; + output-high; + }; + }; + + nordic_gpio11_suspend: nordic_gpio11_suspend { + mux { + pins = "gpio72"; + function = "gpio"; + }; + + config { + pins = "gpio72"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + nordic_ctrl_suspend: nordic_ctrl_suspend { + mux { + pins = "gpio137"; + function = "gpio"; + }; + + config { + pins = "gpio137"; + drive-strength = <8>; + bias-disable = <0>; + output-high; + }; + }; + + /* active low due to hmd nordic */ + nordic_ctrl_active: nordic_ctrl_active { + mux { + pins = "gpio137"; + function = "gpio"; + }; + + config { + pins = "gpio137"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + nordic_1p8_en_active: nordic_1p8_en_active { + mux { + pins = "gpio50"; + function = "gpio"; + }; + + config { + pins = "gpio50"; + drive-strength = <8>; + bias-disable = <0>; + output-high; + }; + }; + + nordic_1p8_en_suspend: nordic_1p8_en_suspend { + mux { + pins = "gpio50"; + function = "gpio"; + }; + + config { + pins = "gpio50"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + nordic_int_active: nordic_int_active { + mux { + pins = "gpio64"; + function = "gpio"; + }; + + config { + pins = "gpio64"; + drive-strength = <8>; + bias-disable = <0>; + output-high; + }; + }; + + nordic_int_suspend: nordic_int_suspend { + mux { + pins = "gpio64"; + function = "gpio"; + }; + + config { + pins = "gpio64"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; }; &vendor { @@ -227,6 +393,30 @@ status = "ok"; }; +/* Nordic spi */ +&qupv3_se19_spi { + status = "ok"; + nordic@0 { + compatible = "nordic,spicontroller"; + reg = <0>; + spi-max-frequency = <8000000>; + pinctrl-names = "nordic_default", "nordic_sleep"; + pinctrl-0 = <&nordic_gpio6_active &nordic_ctrl_active>; + pinctrl-1 = <&nordic_gpio6_suspend &nordic_ctrl_suspend>; + + /*nordic,lfen-gpio = <&tlmm 37 0>;*/ + nordic,v1p8en-gpio = <&tlmm 50 0>; + nordic,ledl-gpio = <&tlmm 137 0>; + nordic,ledr-gpio = <&tlmm 71 0>; + + interrupt-parent = <&tlmm>; + interrupt-names = "nordicspi_irq"; + nordic,irq-gpio = <&tlmm 64 0>; + nordic,irq_pin = <&tlmm 64 0x00>; + interrupts = <64 1>; + }; +}; + &dai_mi2s2 { status = "disabled"; qcom,msm-mi2s-tx-lines = <1>; @@ -806,6 +996,14 @@ }; &dsi_panel_pwr_supply_lab_ibb { + qcom,panel-supply-entry@1 { + qcom,supply-min-voltage = <5700000>; + }; + + qcom,panel-supply-entry@2 { + qcom,supply-min-voltage = <5700000>; + }; + qcom,panel-supply-entry@3 { reg = <1>; qcom,supply-name = "avdd"; @@ -917,6 +1115,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -931,6 +1130,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -945,6 +1145,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -959,6 +1160,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -973,6 +1175,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -987,12 +1190,19 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; hysteresis = <1000>; type = "passive"; }; + + active-config1 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; }; }; @@ -1001,6 +1211,7 @@ polling-delay = <0>; thermal-governor = "user_space"; thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>; + wake-capable-sensor; trips { active-config0 { temperature = <125000>; @@ -1091,12 +1302,16 @@ qcom,5v-boost-gpio = <&tlmm 134 0>; /delete-property/ qcom,platform-en-gpio; + qcom,esd-check-enabled; + qcom,mdss-dsi-panel-status-check-mode = "reg_read"; qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a]; qcom,mdss-dsi-panel-status-command-state = "dsi_hs_mode"; - qcom,mdss-dsi-panel-status-value = <0x9c>; - qcom,mdss-dsi-panel-on-check-value = <0x9c>; + qcom,mdss-dsi-panel-status-value = <0x1c>; qcom,mdss-dsi-panel-status-read-length = <1>; qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; + qcom,dsi-supported-dfps-list = <90 75 60>; + qcom,mdss-dsi-pan-enable-dynamic-fps; + qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp"; qcom,mdss-dsi-min-refresh-rate = <60>; qcom,mdss-dsi-max-refresh-rate = <90>; qcom,mdss-dsi-display-timings { diff --git a/arch/arm64/boot/dts/vendor/qcom/kona.dtsi b/arch/arm64/boot/dts/vendor/qcom/kona.dtsi index 911fe576d711..c6d228d30cd0 100644 --- a/arch/arm64/boot/dts/vendor/qcom/kona.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/kona.dtsi @@ -2585,6 +2585,7 @@ reg = <0x177004 0x4>; regulator-name = "ufs_phy_gdsc"; qcom,retain-regs; + qcom,gds-timeout = <500>; }; usb30_prim_gdsc: qcom,gdsc@10f004 { @@ -3015,6 +3016,29 @@ }; }; + ufs_ice: ufsice@1d90000 { + compatible = "qcom,ice"; + reg = <0x1d90000 0x8000>; + qcom,enable-ice-clk; + clock-names = "ufs_core_clk", "bus_clk", + "iface_clk", "ice_core_clk"; + clocks = <&clock_gcc GCC_UFS_PHY_AXI_CLK>, + <&clock_gcc GCC_UFS_1X_CLKREF_EN>, + <&clock_gcc GCC_UFS_PHY_AHB_CLK>, + <&clock_gcc GCC_UFS_PHY_ICE_CORE_CLK>; + qcom,op-freq-hz = <0>, <0>, <0>, <300000000>; + vdd-hba-supply = <&ufs_phy_gdsc>; + qcom,msm-bus,name = "ufs_ice_noc"; + qcom,msm-bus,num-cases = <2>; + qcom,msm-bus,num-paths = <1>; + qcom,msm-bus,vectors-KBps = + <1 650 0 0>, /* No vote */ + <1 650 1000 0>; /* Max. bandwidth */ + qcom,bus-vector-names = "MIN", + "MAX"; + qcom,instance-type = "ufs"; + }; + ufsphy_mem: ufsphy_mem@1d87000 { reg = <0x1d87000 0xe00>, <0x1d90000 0x8000>; /* PHY regs */ reg-names = "phy_mem", "ufs_ice"; diff --git a/arch/arm64/boot/dts/vendor/qcom/qrb5165.dtsi b/arch/arm64/boot/dts/vendor/qcom/qrb5165.dtsi index e2089e05554c..54683bec6db3 100644 --- a/arch/arm64/boot/dts/vendor/qcom/qrb5165.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/qrb5165.dtsi @@ -766,3 +766,7 @@ }; }; }; + +&pcie2 { + qcom,boot-option = <0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/qrb5165m-iot-rb5.dtsi b/arch/arm64/boot/dts/vendor/qcom/qrb5165m-iot-rb5.dtsi index d1dfc51edc53..d4cceafcb823 100644 --- a/arch/arm64/boot/dts/vendor/qcom/qrb5165m-iot-rb5.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/qrb5165m-iot-rb5.dtsi @@ -1,2 +1,3 @@ #include "kona-v2.1-iot-rb5.dtsi" +#include "camera/kona-camera-sensor-rb5-nopop.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/qrb5165n-iot-rb5.dtsi b/arch/arm64/boot/dts/vendor/qcom/qrb5165n-iot-rb5.dtsi index 4a59978f3246..fc42176bd15f 100644 --- a/arch/arm64/boot/dts/vendor/qcom/qrb5165n-iot-rb5.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/qrb5165n-iot-rb5.dtsi @@ -1,4 +1,5 @@ #include "kona-v2.1-iot-rb5.dtsi" +#include "camera/kona-camera-sensor-rb5-nopop.dtsi" &pcie0 { /delete-property/ qcom,config-recovery; diff --git a/arch/arm64/boot/dts/vendor/qcom/scuba-iot-rb1-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/scuba-iot-rb1-overlay.dts new file mode 100644 index 000000000000..553f7c76fd00 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scuba-iot-rb1-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include +#include "scuba-iot-rb1.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Scuba IOT RB1"; + compatible = "qcom,scuba-qrd", "qcom,scuba-iot", "qcom,qrd"; + qcom,msm-id = <474 0x10000>; + qcom,board-id = <0x1000B 1>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/scuba-iot-rb1.dtsi b/arch/arm64/boot/dts/vendor/qcom/scuba-iot-rb1.dtsi new file mode 100644 index 000000000000..51b1b3fe3660 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scuba-iot-rb1.dtsi @@ -0,0 +1,211 @@ +#include +#include +#include "scuba-thermal-overlay.dtsi" + +&soc { + scuba_batterydata: qcom,battery-data { + qcom,batt-id-range-pct = <15>; + #include "qg-batterydata-alium-3600mah.dtsi" + #include "qg-batterydata-atl466271_3300mAh.dtsi" + }; + + leds { + compatible = "gpio-leds"; + gpio52 { + label = "user4-green"; + gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + vol_up { + label = "volume_up"; + gpios = <&tlmm 96 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,can-disable; + debounce-interval = <15>; + gpio-key,wakeup; + }; + }; +}; + +&qupv3_se0_4uart { + status = "ok"; +}; + +&pm2250_qg { + qcom,battery-data = <&scuba_batterydata>; + qcom,qg-iterm-ma = <150>; + qcom,hold-soc-while-full; + qcom,linearize-soc; + qcom,cl-feedback-on; + qcom,tcss-enable; + qcom,fvss-enable; + qcom,fvss-vbatt-mv = <3500>; + qcom,bass-enable; +}; + +&sdhc_1 { + vdd-supply = <&L20A>; + qcom,vdd-voltage-level = <2856000 2856000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L14A>; + qcom,vdd-io-always-on; + qcom,vdd-io-lpm-sup; + qcom,vdd-io-voltage-level = <1800000 1800000>; + qcom,vdd-io-current-level = <0 325000>; + + pinctrl-names = "active", "sleep"; + pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on + &sdc1_rclk_on>; + pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off + &sdc1_rclk_off>; + + status = "ok"; +}; + +&sdhc_2 { + vdd-supply = <&L21A>; + qcom,vdd-voltage-level = <2960000 3300000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L4A>; + qcom,vdd-io-voltage-level = <1800000 2960000>; + qcom,vdd-io-current-level = <0 22000>; + + pinctrl-names = "active", "sleep"; + pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; + pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + + cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>; + + status = "ok"; +}; + +&pm2250_charger { + qcom,auto-recharge-soc = <98>; + qcom,suspend-input-on-debug-batt; + qcom,battery-data = <&scuba_batterydata>; + io-channels = <&pm2250_vadc ADC_USB_IN_V_16>, + <&pm2250_vadc ADC_CHG_TEMP>; + io-channel-names = "usb_in_voltage", + "chg_temp"; + qcom,thermal-mitigation = <2000000 1500000 1000000 500000>; +}; + +&pm2250_pwm3 { + status = "ok"; +}; + +&thermal_zones { + quiet-therm-usr { + polling-delay = <5000>; + }; + + quiet-therm-step { + polling-delay-passive = <2000>; + polling-delay = <5000>; + thermal-governor = "step_wise"; + thermal-sensors = <&pm2250_adc_tm_iio ADC_AMUX_THM2_PU2>; + wake-capable-sensor; + trips { + quiet_cpu0_trip: quiet-cpu0-trip { + temperature = <40000>; + hysteresis = <0>; + type = "passive"; + }; + + quiet_modem_trip0: quiet-modem-trip0 { + temperature = <40000>; + hysteresis = <5000>; + type = "passive"; + }; + + quiet_modem_trip1: quiet-modem-trip1 { + temperature = <42000>; + hysteresis = <5000>; + type = "passive"; + }; + + quiet_gpu_trip: quiet-gpu-trip { + temperature = <43000>; + hysteresis = <0>; + type = "passive"; + }; + + quiet_modem_trip2: quiet-modem-trip2 { + temperature = <43000>; + hysteresis = <5000>; + type = "passive"; + }; + + quiet_modem_trip3: quiet-modem-trip3 { + temperature = <50000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + gpu-cdev { + trip = <&quiet_gpu_trip>; + cooling-device = <&msm_gpu THERMAL_NO_LIMIT + (THERMAL_MAX_LIMIT - 3)>; + }; + + cpu0-cdev { + trip = <&quiet_cpu0_trip>; + cooling-device = <&CPU0 THERMAL_NO_LIMIT + (THERMAL_MAX_LIMIT - 3)>; + }; + + modem-proc-cdev0 { + trip = <&quiet_modem_trip0>; + cooling-device = <&modem_proc 1 1>; + }; + + modem-proc-cdev1 { + trip = <&quiet_modem_trip3>; + cooling-device = <&modem_proc 3 3>; + }; + + modem-pa-cdev0 { + trip = <&quiet_modem_trip1>; + cooling-device = <&modem_pa 1 1>; + }; + + modem-pa-cdev1 { + trip = <&quiet_modem_trip2>; + cooling-device = <&modem_pa 2 2>; + }; + + modem-pa-cdev3 { + trip = <&quiet_modem_trip3>; + cooling-device = <&modem_pa 3 3>; + }; + }; + }; +}; + +&qusb_phy0 { + extcon = <&pm2250_charger>; + + qcom,qusb-phy-init-seq = <0xf8 0x80 + 0xb3 0x84 + 0x83 0x88 + 0xc5 0x8c + 0x30 0x08 + 0x79 0x0c + 0x21 0x10 + 0x14 0x9c + 0x80 0x04 + 0x9f 0x1c + 0x00 0x18>; +}; + +&usb0 { + extcon = <&qusb_phy0>, <&eud>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/scuba-pinctrl.dtsi b/arch/arm64/boot/dts/vendor/qcom/scuba-pinctrl.dtsi index ee398146356c..42a71fb75168 100644 --- a/arch/arm64/boot/dts/vendor/qcom/scuba-pinctrl.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/scuba-pinctrl.dtsi @@ -324,6 +324,75 @@ }; }; + qupv3_se0_4uart_pins: qupv3_se0_4uart_pins { + qupv3_se0_default_ctsrtsrx: + qupv3_se0_default_ctsrtsrx { + mux { + pins = "gpio0", "gpio1", "gpio3"; + function = "gpio"; + }; + + config { + pins = "gpio0", "gpio1", "gpio3"; + drive-strength = <2>; + bias-pull-down; + }; + }; + + qupv3_se0_default_tx: + qupv3_se0_default_tx { + mux { + pins = "gpio2"; + function = "gpio"; + }; + + config { + pins = "gpio2"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + qupv3_se0_ctsrx: qupv3_se0_ctsrx { + mux { + pins = "gpio0", "gpio3"; + function = "qup0"; + }; + + config { + pins = "gpio0", "gpio3"; + drive-strength = <2>; + bias-disable; + }; + }; + + qupv3_se0_rts: qupv3_se0_rts { + mux { + pins = "gpio1"; + function = "qup0"; + }; + + config { + pins = "gpio1"; + drive-strength = <2>; + bias-pull-down; + }; + }; + + qupv3_se0_tx: qupv3_se0_tx { + mux { + pins = "gpio2"; + function = "qup0"; + }; + + config { + pins = "gpio2"; + drive-strength = <2>; + bias-pull-up; + }; + }; + }; + qupv3_se1_i2c_pins: qupv3_se1_i2c_pins { qupv3_se1_i2c_active: qupv3_se1_i2c_active { mux { diff --git a/arch/arm64/boot/dts/vendor/qcom/scuba-qupv3.dtsi b/arch/arm64/boot/dts/vendor/qcom/scuba-qupv3.dtsi index 3c08b7908772..a12d1e17bc00 100644 --- a/arch/arm64/boot/dts/vendor/qcom/scuba-qupv3.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/scuba-qupv3.dtsi @@ -108,6 +108,25 @@ status = "disabled"; }; + /* 4-wire UART Instance for DIAG */ + qupv3_se0_4uart: qcom,qup_uart@4a80000 { + compatible = "qcom,msm-geni-serial-hs"; + reg = <0x4a80000 0x4000>; + reg-names = "se_phys"; + interrupts = ; + clock-names = "se-clk", "m-ahb", "s-ahb"; + clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>, + <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>, + <&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&qupv3_se0_ctsrx>, <&qupv3_se0_rts>, + <&qupv3_se0_tx>; + pinctrl-1 = <&qupv3_se0_default_ctsrtsrx>, + <&qupv3_se0_default_tx>; + qcom,wrapper-core = <&qupv3_0>; + status = "disabled"; + }; + qupv3_se1_i2c: i2c@4a84000 { compatible = "qcom,i2c-geni"; reg = <0x4a84000 0x4000>; diff --git a/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp-2gb.dts b/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp-2gb.dts new file mode 100644 index 000000000000..0aa974861434 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp-2gb.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "scuba-iot-low-ram.dtsi" +#include "scubalite-iot-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Scuba IOT 2GB DDR SoC"; + compatible = "qcom,scuba-iot"; + qcom,msm-id = <473 0x10000>; + qcom,board-id = <34 0x3>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp-overlay.dts new file mode 100644 index 000000000000..2c817f67f22b --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include +#include "scubalite-iot-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Scuba LITE IOT IDP"; + compatible = "qcom,scuba-idp", "qcom,scuba-iot", "qcom,idp"; + qcom,msm-id = <473 0x10000>, <474 0x10000>; + qcom,board-id = <34 0x3>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp.dtsi b/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp.dtsi new file mode 100644 index 000000000000..901d0d2cf318 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scubalite-iot-idp.dtsi @@ -0,0 +1 @@ +#include "scuba-iot-idp.dtsi" diff --git a/arch/arm64/boot/dts/vendor/qcom/scubap-iot-2gb.dts b/arch/arm64/boot/dts/vendor/qcom/scubap-iot-2gb.dts new file mode 100644 index 000000000000..7651d4694f7b --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scubap-iot-2gb.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "scuba-iot-low-ram.dtsi" +#include "scuba-iot-qcs.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Scubap IOT 2GB DDR SoC"; + compatible = "qcom,scuba-iot"; + qcom,msm-id = <474 0x10000>; + qcom,board-id = <0 0x400>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/scubap-iot-rb1-2gb.dts b/arch/arm64/boot/dts/vendor/qcom/scubap-iot-rb1-2gb.dts new file mode 100644 index 000000000000..fbcda25ce44f --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scubap-iot-rb1-2gb.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "scuba-iot-low-ram.dtsi" +#include "scuba-iot-qcs.dtsi" +#include "scuba-iot-rb1.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Scubap IOT RB1"; + compatible = "qcom,scuba-qrd", "qcom,scuba-iot", "qcom,qrd"; + qcom,msm-id = <474 0x10000>; + qcom,board-id = <0x1000B 1>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/scubaplite-iot-idp-2gb.dts b/arch/arm64/boot/dts/vendor/qcom/scubaplite-iot-idp-2gb.dts new file mode 100644 index 000000000000..37de88964547 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/scubaplite-iot-idp-2gb.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "scuba-iot-low-ram.dtsi" +#include "scubalite-iot-idp.dtsi" +#include "scuba-iot-qcs.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Scubap LITE IOT IDP 2GB DDR"; + compatible = "qcom,scuba-idp", "qcom,scubap-iot", "qcom,idp"; + qcom,msm-id = <474 0x10000>; + qcom,board-id = <34 0x3>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/sdm660-pm660a.dts b/arch/arm64/boot/dts/vendor/qcom/sdm660-pm660a.dts new file mode 100644 index 000000000000..650e6215b5e8 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/sdm660-pm660a.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "sdm660.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A QRD"; + compatible = "qcom,sdm660-qrd", "qcom,sdm660", "qcom,qrd"; + qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>, + <0x0001001b 0x0002001a 0x0 0x0>, + <0x0001001b 0x0202001a 0x0 0x0>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/sdm660-qrd-dsi-rm67195-amoled-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/sdm660-qrd-dsi-rm67195-amoled-overlay.dts new file mode 100644 index 000000000000..69e2735738d5 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/sdm660-qrd-dsi-rm67195-amoled-overlay.dts @@ -0,0 +1,48 @@ +/dts-v1/; +/plugin/; + +#include +#include +#include +#include +#include + +#include "sdm660-qrd.dtsi" +#include "msm-pm660a.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A QRD"; + compatible = "qcom,sdm660-qrd", "qcom,sdm660", "qcom,qrd"; + qcom,board-id = <0x0012000b 0>; +}; + +&pm660a_oledb { + status = "okay"; + qcom,oledb-default-voltage-mv = <6400>; +}; + +&mdss_mdp { + qcom,mdss-pref-prim-intf = "dsi"; +}; + +&mdss_dsi { + hw-config = "single_dsi"; +}; + +&mdss_dsi0 { + qcom,dsi-pref-prim-pan = <&dsi_rm67195_amoled_fhd_cmd>; + pinctrl-names = "mdss_default", "mdss_sleep"; + pinctrl-0 = <&mdss_dsi_active &mdss_te_active>; + pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>; + lab-supply = <&lab_regulator>; + ibb-supply = <&ibb_regulator>; + qcom,platform-reset-gpio = <&tlmm 53 0>; + qcom,platform-te-gpio = <&tlmm 59 0>; +}; + +&dsi_rm67195_amoled_fhd_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <255>; + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_labibb_amoled>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/sdm660-qrd-dsi-rm67195-amoled.dts b/arch/arm64/boot/dts/vendor/qcom/sdm660-qrd-dsi-rm67195-amoled.dts new file mode 100644 index 000000000000..a58021168994 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/qcom/sdm660-qrd-dsi-rm67195-amoled.dts @@ -0,0 +1,45 @@ +/dts-v1/; + +#include "sdm660.dtsi" +#include "sdm660-qrd.dtsi" +#include "msm-pm660a.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A QRD"; + compatible = "qcom,sdm660-qrd", "qcom,sdm660", "qcom,qrd"; + qcom,board-id = <0x0012000b 0>; + qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>, + <0x0001001b 0x0002001a 0x0 0x0>, + <0x0001001b 0x0202001a 0x0 0x0>; +}; + +&pm660a_oledb { + status = "okay"; + qcom,oledb-default-voltage-mv = <6400>; +}; + +&mdss_mdp { + qcom,mdss-pref-prim-intf = "dsi"; +}; + +&mdss_dsi { + hw-config = "single_dsi"; +}; + +&mdss_dsi0 { + qcom,dsi-pref-prim-pan = <&dsi_rm67195_amoled_fhd_cmd>; + pinctrl-names = "mdss_default", "mdss_sleep"; + pinctrl-0 = <&mdss_dsi_active &mdss_te_active>; + pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>; + lab-supply = <&lab_regulator>; + ibb-supply = <&ibb_regulator>; + qcom,platform-reset-gpio = <&tlmm 53 0>; + qcom,platform-te-gpio = <&tlmm 59 0>; +}; + +&dsi_rm67195_amoled_fhd_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <255>; + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_labibb_amoled>; +}; diff --git a/arch/arm64/boot/dts/vendor/qcom/sdm660.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdm660.dtsi index 2ea89c00ecc2..2050ad8541b5 100644 --- a/arch/arm64/boot/dts/vendor/qcom/sdm660.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/sdm660.dtsi @@ -1709,7 +1709,7 @@ reg-names = "dcc-base", "dcc-ram-base"; clocks = <&clock_gcc GCC_DCC_AHB_CLK>; - clock-names = "dcc_clk"; + clock-names = "apb_pclk"; }; tcsr_mutex_block: syscon@1f40000 {