From a604d0a239fdfdae31556de3a99f9f2f367b7141 Mon Sep 17 00:00:00 2001 From: jixj Date: Thu, 19 Aug 2021 11:26:59 +0800 Subject: [PATCH] arm64/dt: Add Cyprus 5G IP68 initial dts 1.blair-cypfr-common-overlay.dtsi is copied from blair-mtp.dtsi of date 2021-06-02 17:56:14 2.AAdd NFC initialized config https://gerrit.mot.com/#/c/2008259/ has removed nfc from base dts, so add NFC config in blair-cypfr-common-overlay.dtsi just l(CR) holi-denver-common-overlay.dtsi to avoid build error. Change-Id: Icbe6ad737473d1e41fddb56d71372399c8082912 Reviewed-on: https://gerrit.mot.com/2045705 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiaofeng Wang Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- qcom/Makefile | 8 +- ...y.dtsi => blair-cypfr-common-overlay.dtsi} | 329 ++++++++---------- ...verlay.dts => blair-cypfr-evb-overlay.dts} | 6 +- ...verlay.dts => blair-cypfr-evt-overlay.dts} | 6 +- 4 files changed, 161 insertions(+), 188 deletions(-) rename qcom/{holi-cypfr-common-overlay.dtsi => blair-cypfr-common-overlay.dtsi} (68%) rename qcom/{holi-cypfr-evb-overlay.dts => blair-cypfr-evb-overlay.dts} (81%) rename qcom/{holi-cypfr-evt-overlay.dts => blair-cypfr-evt-overlay.dts} (80%) diff --git a/qcom/Makefile b/qcom/Makefile index c41cd7b00f45..59a12e69bdf8 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -74,11 +74,11 @@ holi-cypfq-dvt1-overlay.dtbo-base := holi-moto-base.dtb holi-cypfq-dvt2-overlay.dtbo-base := holi-moto-base.dtb dtbo-$(CONFIG_CYPFR_DTB) += \ - holi-cypfr-evb-overlay.dtbo \ - holi-cypfr-evt-overlay.dtbo + blair-cypfr-evb-overlay.dtbo \ + blair-cypfr-evt-overlay.dtbo -holi-cypfr-evb-overlay.dtbo-base := holi-moto-base.dtb -holi-cypfr-evt-overlay.dtbo-base := holi-moto-base.dtb +blair-cypfr-evb-overlay.dtbo-base := blair-moto-base.dtb +blair-cypfr-evt-overlay.dtbo-base := blair-moto-base.dtb dtbo-$(CONFIG_MILANF_DTB) += \ blair-milanf-evb1-overlay.dtbo \ diff --git a/qcom/holi-cypfr-common-overlay.dtsi b/qcom/blair-cypfr-common-overlay.dtsi similarity index 68% rename from qcom/holi-cypfr-common-overlay.dtsi rename to qcom/blair-cypfr-common-overlay.dtsi index 3fa442ed670b..8fdea8453793 100644 --- a/qcom/holi-cypfr-common-overlay.dtsi +++ b/qcom/blair-cypfr-common-overlay.dtsi @@ -9,110 +9,18 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include "holi-pm6125-moto-common-overlay.dtsi" +#include "blair-nopmi-moto-common-overlay.dtsi" -#include "holi-audio-wcd9370-aw882xx-overlay.dtsi" +#include "holi-audio-overlay.dtsi" #include #include -#include "cypfq-fps-overlay.dtsi" #include "holi-pmic-overlay-pm6125.dtsi" #include "holi-thermal-overlay-pm6125.dtsi" #include "display/holi-sde-display-mtp-pm6125.dtsi" -#include "camera/blair-camera-sensor-mot-cypfr-overlay.dtsi" +#include "display/blair-sde-display-mtp.dtsi" -&wcd937x_codec { - cdc-vdd-rxtx-supply = <&L9A>; - cdc-vddpx-supply = <&L9A>; - qcom,cdc-static-supplies = "cdc-vdd-rxtx", - "cdc-vddpx"; - /* - * Overriding cdc-vdd-mic-bias-supply to dummy value - * to avoid compilation errors as BOB is not definied - * for pm6125 - */ - cdc-vdd-mic-bias-supply = <>; -}; - -/* Dummy LDO reference */ -&sdhc_1 { - status = "ok"; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&sdc1_on>; - pinctrl-1 = <&sdc1_off>; - - vdd-supply = <&L24A>; - qcom,vdd-voltage-level = <2960000 2960000>; - qcom,vdd-current-level = <0 570000>; - - vdd-io-supply = <&L11A>; - qcom,vdd-io-always-on; - qcom,vdd-io-lpm-sup; - qcom,vdd-io-voltage-level = <1800000 1800000>; - qcom,vdd-io-current-level = <0 325000>; -}; - -&sdhc_2 { - status = "ok"; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&sdc2_on>; - pinctrl-1 = <&sdc2_off>; - - vdd-supply = <&L22A>; - qcom,vdd-voltage-level = <2960000 2960000>; - qcom,vdd-current-level = <0 800000>; - - vdd-io-supply = <&L5A>; - qcom,vdd-io-voltage-level = <1800000 2960000>; - qcom,vdd-io-current-level = <0 22000>; - - cd-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>; -}; - -&ufsphy_mem { - compatible = "qcom,ufs-phy-qmp-v3"; - - vdda-phy-supply = <&L7A>; - vdda-pll-supply = <&L4A>; - vdda-phy-max-microamp = <62900>; - vdda-pll-max-microamp = <18300>; - - status = "ok"; -}; - -&ufshc_mem { - vdd-hba-supply = <&gcc_ufs_phy_gdsc>; - vdd-hba-fixed-regulator; - - vcc-supply = <&L24A>; - vcc-voltage-level = <2950000 2960000>; - vcc-max-microamp = <800000>; - - vccq2-supply = <&L11A>; - vccq2-max-microamp = <800000>; - vccq2-voltage-level = <1800000 1800000>; - - qcom,vddp-ref-clk-supply = <&L4A>; - qcom,vddp-ref-clk-max-microamp = <100>; - - status = "ok"; -}; &tlmm { - cam_pmic_en_default: cam_pmic_en_default { - mux { - pins = "gpio38"; - function = "gpio"; - }; - config { - pins = "gpio38"; - drive-strength = <2>; - bias-pull-down; - output-low; - }; - }; - nfc { nfc_int_active: nfc_int_active { /* active state */ @@ -207,97 +115,129 @@ }; }; -&qupv3_se7_i2c { +&wcd938x_codec { + cdc-vdd-rxtx-supply = <&L9A>; + cdc-vddio-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddio"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; +}; + +&wcd937x_codec { + cdc-vdd-rxtx-supply = <&L9A>; + cdc-vddpx-supply = <&L9A>; + qcom,cdc-static-supplies = "cdc-vdd-rxtx", + "cdc-vddpx"; + /* + * Overriding cdc-vdd-mic-bias-supply to dummy value + * to avoid compilation errors as BOB is not definied + * for pm6125 + */ + cdc-vdd-mic-bias-supply = <>; +}; + +&wsa881x_i2c_e { + cdc-vdd-1p8-supply = <&L9A>; +}; + +&wsa881x_i2c_f { + cdc-vdd-1p8-supply = <&L9A>; +}; + +/* Dummy LDO reference */ +&sdhc_1 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_on>; + pinctrl-1 = <&sdc1_off>; + + vdd-supply = <&L24A>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L11A>; + qcom,vdd-io-always-on; + qcom,vdd-io-lpm-sup; + qcom,vdd-io-voltage-level = <1800000 1800000>; + qcom,vdd-io-current-level = <0 325000>; +}; + +&sdhc_2 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_on>; + pinctrl-1 = <&sdc2_off>; + + vdd-supply = <&L22A>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L5A>; + qcom,vdd-io-voltage-level = <1800000 2960000>; + qcom,vdd-io-current-level = <0 22000>; + + cd-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>; +}; + +&ufsphy_mem { + compatible = "qcom,ufs-phy-qmp-v4-yupik"; + + vdda-phy-supply = <&L7A>; + vdda-pll-supply = <&L4A>; + vdda-phy-max-microamp = <85700>; + vdda-pll-max-microamp = <18300>; + + status = "ok"; +}; + +&ufshc_mem { + vdd-hba-supply = <&gcc_ufs_phy_gdsc>; + vdd-hba-fixed-regulator; + + vcc-supply = <&L24A>; + vcc-voltage-level = <2950000 2960000>; + vcc-max-microamp = <800000>; + + vccq2-supply = <&L11A>; + vccq2-max-microamp = <800000>; + vccq2-voltage-level = <1800000 1800000>; + + qcom,vddp-ref-clk-supply = <&L4A>; + qcom,vddp-ref-clk-max-microamp = <100>; + + status = "ok"; +}; + +&qupv3_se0_i2c { status = "ok"; #address-cells = <1>; #size-cells = <0>; - st21nfc@8 { - compatible = "st,st21nfc"; - mmi,status = "/chosen", "mmi,nfc", "st"; - status = "ok"; - reg = <0x08>; - st,irq_gpio = <&tlmm 9 0x00>; - st,reset_gpio = <&tlmm 48 0x00>; - st,clkreq_gpio = <&tlmm 7 0x00>; + nq@28 { + compatible = "qcom,sn-nci"; + reg = <0x28>; + qcom,sn-irq = <&tlmm 9 0x00>; + qcom,sn-ven = <&tlmm 6 0x00>; + qcom,sn-firm = <&tlmm 8 0x00>; + qcom,sn-clkreq = <&tlmm 7 0x00>; + qcom,sn-vdd-1p8-supply = <&L9A>; + qcom,sn-vdd-1p8-voltage = <1800000 1800000>; + qcom,sn-vdd-1p8-current = <157000>; interrupt-parent = <&tlmm>; interrupts = <9 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; - pinctrl-0 = <&nfc_int_active &nfc_enable_active - &nfc_clk_req_active>; - pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend - &nfc_clk_req_suspend>; + pinctrl-0 = <&nfc_int_active &nfc_enable_active>; + pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; }; }; -&qupv3_se10_i2c { - status = "ok"; - - cam_pmic: wl2864c@29{ - compatible = "semi,wl2864c"; - reg = <0x29>; - - semi,cs-gpios = <&tlmm 38 0>; - - pinctrl-names = "default"; - pinctrl-0 = <&cam_pmic_en_default>; - - vin1-supply = <&S6A>; - - regulators { - cam_ldo1: ldo1 { - regulator-name = "ldo1"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1800000>; - }; - - cam_ldo2: ldo2 { - regulator-name = "ldo2"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1800000>; - }; - - cam_ldo3: ldo3 { - regulator-name = "ldo3"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo4: ldo4 { - regulator-name = "ldo4"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo5: ldo5 { - regulator-name = "ldo5"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo6: ldo6 { - regulator-name = "ldo6"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo7: ldo7 { - regulator-name = "ldo7"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - }; - }; -}; - -&pm8008_8 { - status = "disabled"; -}; - -&pm8008_9 { - status = "disabled"; -}; - &soc { gpio_keys { compatible = "gpio-keys"; @@ -332,6 +272,39 @@ }; }; -&pm7250b_vib { - qcom,vib-ldo-volt-uv = <3000000>; +&qupv3_se8_i2c { + status = "okay"; + qcom,i2c-touch-active="synaptics,tcm-i2c"; + + synaptics_tcm@20 { + compatible = "synaptics,tcm-i2c"; + reg = <0x20>; + interrupt-parent = <&tlmm>; + interrupts = <22 0x2008>; + pinctrl-names = "pmx_ts_active","pmx_ts_suspend", + "pmx_ts_release"; + pinctrl-0 = <&ts_active>; + pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; + pinctrl-2 = <&pmx_ts_release>; + vdd-supply = <&L9A>; + avdd-supply = <&touch_avdd>; + synaptics,pwr-reg-name = "avdd"; + synaptics,bus-reg-name = "vdd"; + synaptics,irq-gpio = <&tlmm 22 0x2008>; + synaptics,irq-on-state = <0>; + synaptics,reset-gpio = <&tlmm 21 0x00>; + synaptics,reset-on-state = <0>; + synaptics,reset-active-ms = <20>; + synaptics,reset-delay-ms = <200>; + synaptics,power-delay-ms = <200>; + synaptics,ubl-i2c-addr = <0x20>; + synaptics,extend_report; + synaptics,firmware-name = "synaptics_firmware.img"; + + panel = <&dsi_rm69299_visionox_amoled_video + &dsi_rm69299_visionox_amoled_cmd>; + }; }; + +#include "camera/blair-camera-sensor-mtp.dtsi" + diff --git a/qcom/holi-cypfr-evb-overlay.dts b/qcom/blair-cypfr-evb-overlay.dts similarity index 81% rename from qcom/holi-cypfr-evb-overlay.dts rename to qcom/blair-cypfr-evb-overlay.dts index 56378e80d554..0749f2124c3b 100644 --- a/qcom/holi-cypfr-evb-overlay.dts +++ b/qcom/blair-cypfr-evb-overlay.dts @@ -13,12 +13,12 @@ /dts-v1/; /plugin/; -#include "holi-cypfr-common-overlay.dtsi" +#include "blair-cypfr-common-overlay.dtsi" / { model = "cypfr"; - compatible = "qcom,holi-cypfr", "qcom,holi-moto", "qcom,holi"; + compatible = "qcom,blair-cypfr", "qcom,blair-moto", "qcom,blair"; qcom,msm-id = <454 0x10000>, <472 0x10000>; - qcom,board-id = <0x47 0xA100>; + qcom,board-id = <0x4B 0xA100>; }; diff --git a/qcom/holi-cypfr-evt-overlay.dts b/qcom/blair-cypfr-evt-overlay.dts similarity index 80% rename from qcom/holi-cypfr-evt-overlay.dts rename to qcom/blair-cypfr-evt-overlay.dts index 50b4d4326b10..222b0d1483e5 100644 --- a/qcom/holi-cypfr-evt-overlay.dts +++ b/qcom/blair-cypfr-evt-overlay.dts @@ -13,12 +13,12 @@ /dts-v1/; /plugin/; -#include "holi-cypfr-common-overlay.dtsi" +#include "blair-cypfr-common-overlay.dtsi" / { model = "cypfr"; - compatible = "qcom,holi-cypfr", "qcom,holi-moto", "qcom,holi"; + compatible = "qcom,blair-cypfr", "qcom,blair-moto", "qcom,blair"; qcom,msm-id = <454 0x10000>, <472 0x10000>; - qcom,board-id = <0x47 0xA200>, <0x48 0xA200>; + qcom,board-id = <0x4B 0xA200>; };