From 91abe94eea8869f72e7224180f8bec57fda54c61 Mon Sep 17 00:00:00 2001 From: zhaoxp3 Date: Wed, 6 Jul 2022 10:23:48 +0800 Subject: [PATCH] arm/dts: init penang dts init devicetree for penang Change-Id: I3b8996532c29421673a37f8ea1b348618ae367c6 Signed-off-by: zhaoxp3 Reviewed-on: https://gerrit.mot.com/2323933 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Wang Submit-Approved: Jira Key --- qcom/Makefile | 10 +- qcom/blair-moto-penang-base.dts | 45 -- qcom/blair-nopmi-penang-common-overlay.dtsi | 38 - qcom/blair-penang-dvt1-overlay.dts | 203 ------ qcom/blair-penang-dvt2-overlay.dts | 133 ---- qcom/blair-penang-evb2-overlay.dts | 24 - qcom/blair-pm6125-penang-common-overlay.dtsi | 21 - qcom/discrete_charging_penang.dtsi | 356 ++-------- ...y.dtsi => holi-penang-common-overlay.dtsi} | 672 ++++++++++-------- ...erlay.dts => holi-penang-evt1-overlay.dts} | 8 +- qcom/penang-display.dtsi | 314 +------- qcom/penang-fmr-overlay.dtsi | 5 + qcom/penang-fps-overlay.dtsi | 23 +- qcom/penang-sensors.dtsi | 38 - qcom/penang-touchscreen.dtsi | 16 - qcom/penang-wl286xx.dtsi | 74 -- 16 files changed, 489 insertions(+), 1491 deletions(-) delete mode 100644 qcom/blair-moto-penang-base.dts delete mode 100644 qcom/blair-nopmi-penang-common-overlay.dtsi delete mode 100644 qcom/blair-penang-dvt1-overlay.dts delete mode 100644 qcom/blair-penang-dvt2-overlay.dts delete mode 100644 qcom/blair-penang-evb2-overlay.dts delete mode 100644 qcom/blair-pm6125-penang-common-overlay.dtsi rename qcom/{blair-penang-common-overlay.dtsi => holi-penang-common-overlay.dtsi} (64%) rename qcom/{blair-penang-evb1-overlay.dts => holi-penang-evt1-overlay.dts} (75%) create mode 100644 qcom/penang-fmr-overlay.dtsi delete mode 100644 qcom/penang-wl286xx.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 9a93febe658b..9f488872dce8 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -101,15 +101,9 @@ blair-milanf-dvt1-overlay.dtbo-base := blair-moto-milanf-base.dtb blair-milanf-dvt2-overlay.dtbo-base := blair-moto-milanf-base.dtb dtbo-$(CONFIG_PENANG_DTB) += \ - blair-penang-evb1-overlay.dtbo \ - blair-penang-evb2-overlay.dtbo \ - blair-penang-dvt1-overlay.dtbo \ - blair-penang-dvt2-overlay.dtbo + holi-penang-evt1-overlay.dtbo -blair-penang-evb1-overlay.dtbo-base := blair-moto-penang-base.dtb -blair-penang-evb2-overlay.dtbo-base := blair-moto-penang-base.dtb -blair-penang-dvt1-overlay.dtbo-base := blair-moto-penang-base.dtb -blair-penang-dvt2-overlay.dtbo-base := blair-moto-penang-base.dtb +holi-penang-evt1-overlay.dtbo-base := holi-moto-base.dtb dtbo-$(CONFIG_RHODEP_DTB) += \ blair-rhodep-evt1-overlay.dtbo \ diff --git a/qcom/blair-moto-penang-base.dts b/qcom/blair-moto-penang-base.dts deleted file mode 100644 index e9b5f91a2ff2..000000000000 --- a/qcom/blair-moto-penang-base.dts +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2020, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; - -#include "blair.dtsi" - -/ { - qcom,board-id = <0 0>; - channel-id-map = ""; -/* - * Some nodes need labels assigned to appear in __symbols__ - */ - chosen: chosen { }; - aliases: aliases { }; - reserved_memory: reserved-memory { }; - mot_batterydata: qcom,battery-data { }; - utags: utags { }; - hw: hw { }; -}; - -&reserved_memory { - /delete-node/ ramoops; -}; - -&tlmm { - /delete-node/ nfc; -}; - -&firmware { - /delete-node/ android; -}; - -&mdss_dsi_phy0 { - /delete-property/ qcom,dsi-pll-ssc-en; -}; diff --git a/qcom/blair-nopmi-penang-common-overlay.dtsi b/qcom/blair-nopmi-penang-common-overlay.dtsi deleted file mode 100644 index 8d62277fa8a1..000000000000 --- a/qcom/blair-nopmi-penang-common-overlay.dtsi +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2021, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -#include "blair-penang-common-overlay.dtsi" -#include "blair-nopmi-moto-common-overlay.dtsi" -#include "tcpc_config.dtsi" -#include "discrete-rt-pd-manger.dtsi" -#include "sgm7220.dtsi" -#include "rt9426a.dtsi" -#include "discrete_charging.dtsi" - -&qupv3_se8_i2c { - status = "okay"; - oz8806@2f { - compatible = "o2micro,oz8806"; - reg = <0x2f>; - status = "okay"; - }; - - cw2217@64 { - compatible = "cellwise,cw2217"; - reg = <0x64>; - status = "okay"; - - df-serialnum = "SB18D33989"; - #include "bat_setting/CW_md50-scud-5000mah.dtsi" - #include "bat_setting/CW_md50-amperex-5000mah.dtsi" - }; -}; - diff --git a/qcom/blair-penang-dvt1-overlay.dts b/qcom/blair-penang-dvt1-overlay.dts deleted file mode 100644 index e3343d6a222b..000000000000 --- a/qcom/blair-penang-dvt1-overlay.dts +++ /dev/null @@ -1,203 +0,0 @@ -/* Copyright (c) 2021, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; -/plugin/; - -#include "blair-nopmi-penang-common-overlay.dtsi" - -/ { - model = "penang"; - compatible = "qcom,blair-penang", "qcom,blair-moto", "qcom,blair"; - qcom,msm-id = <507 0x10000>; - qcom,board-id = <0x49 0xB100>; -}; - -&rt9426a { - interrupts-extended = <&tlmm 38 IRQ_TYPE_LEVEL_LOW>; -}; -&rt9426a_alert { - mux { - pins = "gpio38"; - function = "gpio"; - }; - - config { - pins = "gpio38"; - drive-strength = <2>; - bias-pull-up; - }; -}; - -&tlmm { - ets_vcc_high { - mux { - pins = "gpio6"; - }; - - config { - pins = "gpio6"; - }; - }; - - ets_vcc_low { - mux { - pins = "gpio6"; - }; - - config { - pins = "gpio6"; - }; - }; - - nfc_enable_active { - mux { - pins = "gpio48"; - }; - - config { - pins = "gpio48"; - }; - }; - - nfc_enable_suspend { - mux { - pins = "gpio48"; - }; - - config { - pins = "gpio48"; - }; - }; - - sgm7220_en_n: sgm7220_en_n { - mux { - pins = "gpio58"; - function = "gpio"; - }; - - config { - pins = "gpio58"; - drive-strength = <2>; - bias-pull-down; - input-enable; - }; - }; -}; - -&sgm7220 { - pinctrl-names = "default"; - pinctrl-0 = <&sgm7220_int_n &sgm7220_en_n>; -}; - -&et528 { - egistec,gpio_vcc_en = <&tlmm 6 0x0>; -}; - -&silead { - avdd-gpios = <&tlmm 6 0x0>; -}; - -&qupv3_se7_i2c { - st21nfc@8 { - status = "diabled"; - }; - - nq@28 { - compatible = "qcom,sn-nci"; - mmi,status = "/chosen", "mmi,nfc", "nxp"; - reg = <0x28>; - qcom,sn-irq = <&tlmm 9 0x00>; - qcom,sn-ven = <&tlmm 48 0x00>; - qcom,sn-firm = <&tlmm 8 0x00>; - qcom,sn-clkreq = <&tlmm 7 0x00>; - 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>; - }; -}; - -&sx937x { - Semtech,ref-phases-a = <5>; - Semtech,ref-phases-b = <6>; - Semtech,ref-phases-c = <0xff>; - Semtech,button-flag = <0x1f>; - Semtech,reg-num = <58>; - Semtech,reg-init = < - 0x8024 0x7F00 - 0x4004 0x70 - 0x4008 0x8 - 0x8020 0x32 - 0x8028 0x886 /*AFE_PARAM_PH0*/ - 0x8034 0x886 /*AFE_PARAM_PH1*/ - 0x8040 0x886 /*AFE_PARAM_PH2*/ - 0x804C 0x8BE /*AFE_PARAM_PH3*/ - 0x8058 0x866 /*AFE_PARAM_PH4*/ - 0x8064 0x86E /*AFE_PARAM_PH5*/ - 0x8070 0x86E /*AFE_PARAM_PH6*/ - 0x807C 0x85E /*AFE_PARAM_PH7*/ - /*set CS3 to hiz, because it used as IRQ pin*/ - 0x8030 0xFFF9FD /*REG_AFEPH_PH0, CS0, ANT1, Bottom center*/ - 0x803C 0xFFD9FF /*REG_AFEPH_PH1, CS4, ANT2, Top right*/ - 0x8048 0xFEF9FF /*REG_AFEPH_PH2, CS5, ANT7, Bottom Right*/ - 0x8054 0xF7F9FF /*REG_AFEPH_PH3, CS6, ANT4, Top Right*/ - 0x8060 0xFFF97F /*REG_AFEPH_PH4, CS2, ANT5, Top center*/ - 0x806C 0xFFF9EF /*REG_AFEPH_PH5, CS1, ANT1/7_REF, Bottom_Ref*/ - 0x8078 0xBFF9FF /*REG_AFEPH_PH6, CS7, ANT4 REF, Middle*/ - 0x8084 0xFFF9FF /*REG_AFEPH_PH7, NOT USE*/ - 0x8098 0x7A36 - 0x80B8 0x7636 - 0x80D8 0x5959 - 0x80F8 0x3939 - 0x8118 0x2C2C - 0x8138 0xFF - 0x8158 0xFF - 0x8178 0x5A40 - 0x80A0 0x1E1E00E1 - 0x80C0 0x404000E2 - 0x80E0 0x222200E1 - 0x8100 0x161600E2 - 0x8188 0x8000015 - 0x818C 0x8000016 - 0x8090 0x41DB3000 - 0x80B0 0x7FB33000 - 0x80D0 0x40CD3000 - 0x80F0 0x68BD3000 - 0x8110 0x30DD3000 - 0x8130 0x2AD67000 - 0x8150 0x2AD67000 - 0x8170 0x2AD67000 - 0x8088 0x300005 - 0x80A8 0x300005 - 0x80C8 0x300005 - 0x80E8 0x300005 - 0x8108 0x300005 - 0x8128 0x3600000 - 0x8148 0x3600000 - 0x8168 0x300000 - 0x808C 0x60200060 - 0x80AC 0x60200060 - 0x80CC 0x60200060 - 0x80EC 0x60200060 - 0x810C 0x60200060 - 0x812C 0x60200018 - 0x814C 0x60200018 - 0x816C 0x60200018 - >; - - status = "ok"; -}; diff --git a/qcom/blair-penang-dvt2-overlay.dts b/qcom/blair-penang-dvt2-overlay.dts deleted file mode 100644 index 24a43f434d19..000000000000 --- a/qcom/blair-penang-dvt2-overlay.dts +++ /dev/null @@ -1,133 +0,0 @@ -/* Copyright (c) 2021, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; -/plugin/; - -#include "blair-nopmi-penang-common-overlay.dtsi" - -/ { - model = "penang"; - compatible = "qcom,blair-penang", "qcom,blair-moto", "qcom,blair"; - qcom,msm-id = <507 0x10000>; - qcom,board-id = <0x49 0xB200>; -}; - -&rt9426a { - interrupts-extended = <&tlmm 38 IRQ_TYPE_LEVEL_LOW>; -}; -&rt9426a_alert { - mux { - pins = "gpio38"; - function = "gpio"; - }; - - config { - pins = "gpio38"; - drive-strength = <2>; - bias-pull-up; - }; -}; - -&tlmm { - ets_vcc_high { - mux { - pins = "gpio6"; - }; - - config { - pins = "gpio6"; - }; - }; - - ets_vcc_low { - mux { - pins = "gpio6"; - }; - - config { - pins = "gpio6"; - }; - }; - - nfc_enable_active { - mux { - pins = "gpio48"; - }; - - config { - pins = "gpio48"; - }; - }; - - nfc_enable_suspend { - mux { - pins = "gpio48"; - }; - - config { - pins = "gpio48"; - }; - }; - - sgm7220_en_n: sgm7220_en_n { - mux { - pins = "gpio58"; - function = "gpio"; - }; - - config { - pins = "gpio58"; - drive-strength = <2>; - bias-pull-down; - input-enable; - }; - }; -}; - -&sgm7220 { - pinctrl-names = "default"; - pinctrl-0 = <&sgm7220_int_n &sgm7220_en_n>; -}; - -&et528 { - egistec,gpio_vcc_en = <&tlmm 6 0x0>; -}; - -&silead { - avdd-gpios = <&tlmm 6 0x0>; -}; - -&qupv3_se7_i2c { - st21nfc@8 { - status = "diabled"; - }; - - nq@28 { - compatible = "qcom,sn-nci"; - mmi,status = "/chosen", "mmi,nfc", "nxp"; - reg = <0x28>; - qcom,sn-irq = <&tlmm 9 0x00>; - qcom,sn-ven = <&tlmm 48 0x00>; - qcom,sn-firm = <&tlmm 8 0x00>; - qcom,sn-clkreq = <&tlmm 7 0x00>; - 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>; - }; -}; - diff --git a/qcom/blair-penang-evb2-overlay.dts b/qcom/blair-penang-evb2-overlay.dts deleted file mode 100644 index 3cd0b51a280d..000000000000 --- a/qcom/blair-penang-evb2-overlay.dts +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2021, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; -/plugin/; - -#include "blair-nopmi-penang-common-overlay.dtsi" - -/ { - model = "penang"; - compatible = "qcom,blair-penang", "qcom,blair-moto", "qcom,blair"; - qcom,msm-id = <507 0x10000>; - qcom,board-id = <0x49 0xA200>; -}; - diff --git a/qcom/blair-pm6125-penang-common-overlay.dtsi b/qcom/blair-pm6125-penang-common-overlay.dtsi deleted file mode 100644 index 410bf321b99d..000000000000 --- a/qcom/blair-pm6125-penang-common-overlay.dtsi +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2021, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -#include "blair-penang-common-overlay.dtsi" -#include "blair-pm6125-moto-common-overlay.dtsi" - -&pm7250b_charger { - dpdm-supply = <&usb2_phy0>; -}; - -&smb1394 { - status = "disabled"; -}; diff --git a/qcom/discrete_charging_penang.dtsi b/qcom/discrete_charging_penang.dtsi index 1e22ede4efad..4344874fb5d0 100644 --- a/qcom/discrete_charging_penang.dtsi +++ b/qcom/discrete_charging_penang.dtsi @@ -9,8 +9,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ - #include +#include "sgm7220.dtsi" +#include "discrete-rt-pd-manger.dtsi" &pm6125_vadc { gpio6_div3{ @@ -32,27 +33,69 @@ &qupv3_se8_i2c { status = "okay"; + cw2217@64 { + compatible = "cellwise,cw2217"; + reg = <0x64>; + status = "okay"; + df-serialnum = "SB18D24973"; + #include "bat_setting/CW_nd50-atl-5000mah.dtsi" + #include "bat_setting/CW_nd50-jiade-5000mah.dtsi" + }; + + sm5602@71 { + compatible = "sm,sm5602"; + reg = <0x71>; + //interrupt-parent = <&tlmm>; + //interrupts = <38 2>; + //qcom,irq-gpio = <&tlmm 38 0x0>; + + sm,en_temp_ex; + //sm,en_temp_in; + sm,en_batt_det; + sm,iocv_man_mode; + sm,misc = <0x0800>; + sm,aging_ctrl = <0x0121>; + sm,cycle_cfg = <0x7000>; + sm,rsns = <1>; + sm,fg_irq_set = <0x07FF>; + sm,low_soc1 = <1>; + sm,low_soc2 = <15>; + sm,v_l_alarm = <3400>; + sm,v_h_alarm = <4450>; + sm,battery_table_num = <0>; + sm,param_version = <3>; + sm,t_l_alarm_in = <54>; + sm,t_h_alarm_in = <1>; + sm,t_l_alarm_ex = <0xD3D8>; + sm,t_h_alarm_ex = <0x9245>; + sm,shutdown-delay-enable; + + df-serialnum = "SB18D24973"; + #include "bat_setting/SM5602_ND50_ATL_Rhodec.dtsi" + #include "bat_setting/SM5602_ND50_JIADE_Rhodec.dtsi" + }; +}; + +&qupv3_se6_i2c { + status = "okay"; sgm4154x: sgm4154x@3B { status = "okay"; compatible = "sgm,sgm41542"; reg = <0x3B>; pinctrl-names = "default"; - pinctrl-0 = <&sgm4154x_gpio_pins &gpio6_adc_default>; - #io-channel-cells = <1>; + pinctrl-0 = <&gpio6_adc_default &chg_irq_default>; io-channels = <&pm6125_vadc ADC5_GPIO3_DIV3>; io-channel-names = "gpio3_div3"; interrupt-parent = <&tlmm>; interrupts = <12 0>; //irq num base on hardware design - sgm,irq-gpio = <&tlmm 12 0>; //irq num base on hardware design - sgm,chg-en-gpio = <&tlmm 92 0>; //gpio num base on hardware design 1.MTK parent node name is pio 2.QUALCOMM parent node name is tlmm or other - mmi,wls-en-gpio = <&tlmm 49 0>; + sgm,irq-gpio = <&tlmm 59 0>; //irq num base on hardware design + sgm,chg-en-gpio = <&tlmm 45 0>; //gpio num base on hardware design 1.MTK parent node name is pio 2.QUALCOMM parent node name is tlmm or other - dpdm-supply = <&usb2_phy0>; + dpdm-supply = <&qusb_phy0>; mmi,qc3-support; - input-voltage-limit-microvolt = <4700000>; /* sw jeita parameter customer defined*/ enable_sw_jeita; @@ -82,159 +125,6 @@ temp_neg_10_thres = <0>; }; - bq25890: bq25890@6A { - status = "okay"; - compatible = "ti,bq2589x-1"; - reg = <0x6A>; - - pinctrl-names = "default"; - pinctrl-0 = <&bq2589x_irq &gpio6_adc_default>; - #io-channel-cells = <1>; - io-channels = <&pm6125_vadc ADC5_GPIO3_DIV3>; - io-channel-names = "gpio3_div3"; - - bq2589x_irq-gpio = <&tlmm 12 0>; - bq2589x_en-gpio = <&tlmm 92 0>; - mmi,wls-en-gpio = <&tlmm 49 0>; - dpdm-supply = <&usb2_phy0>; - - mmi,qc3-support; - ti,bq2589x,vbus-volt-high-level = <8700>;/* tune adapter to output 9v */ - ti,bq2589x,vbus-volt-low-level = <4400>;/* tune adapter to output 5v */ - ti,bq2589x,vbat-min-volt-to-tuneup = <3000>; - ti,bq2589x,charge-voltage = <4450>; - ti,bq2589x,charge-current = <3000>; - ti,bq2589x,term-current = <128>; - ti,bq2589x,enable-auto-dpdm; - ti,bq2589x,enable-termination; - ti,bq2589x,enable-ico; - ti,bq2589x,use-absolute-vindpm; - ti,bq2589x,vindpm = <4700>; - }; - - mm8013@55 { - compatible = "mitsumi,mm8013c10"; - reg = <0x55>; - status = "okay"; - io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM2_100K_PU>; - io-channel-names = "batt_therm"; - - pinctrl-names = "default"; - pinctrl-0 = <&pmk8350_gpio1_adc_default>; - - }; - - rt1711h@4e { - dpm_caps { - /* 0: disable, 1: prefer_ufp, 2: prefer_dfp */ - dr_check = <2>; - }; - }; - -}; - -&qupv3_se2_i2c { - status = "okay"; - bq25960_master:bq25960-master@66 { - status = "okay"; - compatible = "ti,bq25960-master"; - reg = <0x66>; - sc8541-addr = <0x6B>; - sc8541-name = "sc8541-master"; - #io-channel-cells = <1>; - interrupt-parent = <&tlmm>; - interrupts = <57 0>; - irq-gpio = <&tlmm 57 0>; - }; - -}; - -&qupv3_se8_i2c { - status = "okay"; - bq25960_slave:bq25960-slave@67 { - status = "okay"; - compatible = "ti,bq25960-slave"; - reg = <0x67>; - sc8541-addr = <0x6C>; - sc8541-name = "sc8541-slave"; - #io-channel-cells = <1>; - interrupt-parent = <&tlmm>; - interrupts = <84 0>; - irq-gpio = <&tlmm 84 0>; - }; - -}; - -&qupv3_se2_i2c { - status = "okay"; - cps-wls-charger@30 { - status = "okay"; - compatible = "cps,wls-charger-cps4019"; - reg = <0x30>; - force_wls_pin = <&tlmm 37 0x00>; - cps_wls_int = <&tlmm 38 0x00>; - interrupt-parent = <&tlmm>; - interrupts = <38 0>; - interrupt-names = "cps_wls_int"; - - pinctrl-names = "default"; - pinctrl-0 = <&cps4019_irq>; - - io-channels = <&mmi_discrete_charger PSY_IIO_MMI_OTG_ENABLE>; - io-channel-names = "otg_enable"; - - main-charger-name = "master_chg"; - supplied-from = "battery"; - - wireless-fw-name = "cps4019.hex"; - fw_ver_major = <0>; - fw_ver_minor = <6>; - - use_bl_in_h; - }; -}; - -&tlmm { - sgm4154x_gpio_pins: sgm4154x_gpio_pins { - mux { - pins = "gpio12"; - function = "gpio"; - }; - - config { - pins = "gpio12"; - drive-strength = <2>; - bias-pull-up; - input-enable; - }; - }; - bq2589x_irq: bq2589x_irq { - mux { - pins = "gpio12"; - function = "gpio"; - }; - - config { - pins = "gpio12"; - drive-strength = <2>; - bias-pull-up; - input-enable; - }; - }; - - cps4019_irq: cps4019_irq { - mux { - pins = "gpio38"; - function = "gpio"; - }; - - config { - pins = "gpio38"; - drive-strength = <2>; - bias-pull-up; - input-enable; - }; - }; }; &soc { @@ -242,12 +132,11 @@ status = "ok"; compatible = "mmi,mmi-charger"; mmi,enable-charging-limit; - mmi,upper-limit-capacity = <65>; - mmi,lower-limit-capacity = <60>; + mmi,upper-limit-capacity = <70>; + mmi,lower-limit-capacity = <65>; mmi,heartbeat-interval = <5000>; - mmi,dcp-power-max = <7500>; + mmi,dcp-power-max = <10000>; mmi,hvdcp-power-max = <15000>; - mmi,wls-power-max = <5000>; }; mmi_discrete_charger: mmi,discrete-charging { @@ -257,128 +146,41 @@ battery-names = "battery"; supplied-from = "mmi_battery"; - mmi,chrg-iterm-ma = <196>; + mmi,chrg-iterm-ma = <243>; mmi,fg-iterm-ma = <500>; - mmi,batt-profile-fv-mv = <4512>; - mmi,max-fv-mv = <4480>; + mmi,max-fv-mv = <4450>; mmi,max-fcc-ma = <4000>; mmi,demo-fv-mv = <4000>; mmi,otg-cl-ua = <1200000>; - mmi,wls-max-icl-ua = <1000000>; - mmi,df-serialnum = "SB18D50729"; - mmi,mmi-temp-zones = <0 4200 800 0>, - <10 4250 2000 1000>, - <15 0 2000 2000>, - <45 0 4000 4000>, - <60 4200 4000 0>; - mmi,mmi-ffc-zones = - <15 4480 196 500>, - <25 4512 590 500>, - <35 4512 712 500>, - <45 4512 804 500>, - <60 4480 196 500>; + mmi,df-serialnum = "SB18D24973"; + mmi,mmi-temp-zones = <0 4200 1000 0>, + <10 4250 2500 1000>, + <15 0 2500 2500>, + <45 0 4000 4000>, + <60 4200 4000 0>; + mmi,thermal-mitigation = <4000000 3000000 2500000 2000000 1500000 1200000 900000 600000 300000>; - mmi,usb-pd-supported; - mmi,cfg-chgmod-to-fg; - }; - - mmi_chrg: mmi_chrg_manager { - compatible = "mmi,chrg-manager"; - #io-channel-cells = <1>; - io-channels = <&mmi_discrete_charger PSY_IIO_HW_CURRENT_MAX>, - <&mmi_discrete_charger PSY_IIO_USB_CHARGING_ENABLED>, - <&mmi_discrete_charger PSY_IIO_TYPEC_MODE>, - <&mmi_discrete_charger PSY_IIO_INPUT_CURRENT_SETTLED>, - <&mmi_discrete_charger PSY_IIO_PD_ACTIVE>, - <&mmi_discrete_charger PSY_IIO_USB_TERMINATION_ENABLED>, - <&mmi_discrete_charger PSY_IIO_USB_REAL_TYPE>, - <&mmi_discrete_charger PSY_IIO_DP_DM>, - <&mmi_discrete_charger PSY_IIO_MMI_QC3P_POWER>, - <&mmi_discrete_charger PSY_IIO_CP_ENABLE>, - <&bq25960_master PSY_IIO_CP_ENABLE>, - <&bq25960_master PSY_IIO_MMI_CP_INPUT_CURRENT_NOW>, - <&bq25960_master PSY_IIO_MMI_CP_INPUT_VOLTAGE_NOW>, - <&bq25960_master PSY_IIO_CP_STATUS1>, - <&bq25960_master PSY_IIO_CP_CLEAR_ERROR>, - <&bq25960_slave PSY_IIO_CP_ENABLE>, - <&bq25960_slave PSY_IIO_MMI_CP_INPUT_CURRENT_NOW>, - <&bq25960_slave PSY_IIO_MMI_CP_INPUT_VOLTAGE_NOW>, - <&bq25960_slave PSY_IIO_CP_STATUS1>, - <&bq25960_slave PSY_IIO_CP_CLEAR_ERROR>; - - io-channel-names = "hw_current_max", - "charging_enabled", - "typec_mode", - "input_current_settled", - "pd_active", - "termination_enabled", - "usb_real_type", - "battery_dp_dm", - "usb_qc3p_power", - "mmi_cp_enabled_status", - "cp_enabled", - "cp_input_current_now", - "cp_input_voltage_settled", - "cp_status1", - "cp_clear_error", - "cp_slave_enabled", - "cp_slave_input_current_now", - "cp_slave_input_voltage_settled", - "cp_slave_status1", - "cp_slave_clear_error"; - - // qcom,usbpd-phandle = <&pm7250b_pdphy>; - mmi,pps-volt-steps = <20000>; - mmi,pps-curr-steps = <100000>; - mmi,pd-volt-max = <11000000>; - mmi,pd-curr-max = <6200000>; - mmi,batt-curr-boost = <300000>; - mmi,batt-ovp-lmt = <4550000>; - mmi,typec-middle-current = <2000000>; - mmi,pd-allow-min-current = <1000000>; - mmi,step-first-current-comp = <0>; - mmi,dont-rerun-aicl; - mmi,qc3p-max-ibus-ma = <3000>; - mmi,qc3p-volt-steps = <20000>; - mmi,qc3p-volt-max = <10000000>; - mmi,chrg-temp-zones-num = <5>; - mmi,mmi-chrg-temp-zones = - <0 4200 800 0 0 0 0 0 0>, - <10 4250 2000 4480 1000 0 0 0 0>, - <15 4480 2000 0 0 0 0 0 0>, - <45 4250 12400 4300 8000 4480 6000 4510 4000>, - <60 4200 4000 0 0 0 0 0 0>; - mmi,thermal-mitigation = - <12400000>, - <11000000>, - <10000000>, - <9000000>, - <8000000>, - <7000000>, - <6000000>, - <5000000>, - <4000000>, - <3000000>, - <2000000>, - <1000000>; - charger_device_0 { - chrg-name = "pmic-sw"; - psy-name = "battery"; - charging-curr-limited = <300000>; }; - charger_device_1 { - chrg-name = "cp-master"; - psy-name = "bq25960-master"; - charging-curr-min = <1500000>; +}; + + +&tlmm { + + chg_irq_default: chg_irq_default { + /* IRQ */ + mux { + pins = "gpio59"; + function = "gpio"; }; - charger_device_2 { - chrg-name = "cp-slave"; - psy-name = "bq25960-slave"; - charging-curr-min = <2000000>; + + config { + pins = "gpio59"; + bias-pull-up; + drive-strength = <2>; /* 2 MA */ + input-enable; }; }; }; - diff --git a/qcom/blair-penang-common-overlay.dtsi b/qcom/holi-penang-common-overlay.dtsi similarity index 64% rename from qcom/blair-penang-common-overlay.dtsi rename to qcom/holi-penang-common-overlay.dtsi index 8b9f43e8e7ae..fc48b915705d 100644 --- a/qcom/blair-penang-common-overlay.dtsi +++ b/qcom/holi-penang-common-overlay.dtsi @@ -10,18 +10,18 @@ * GNU General Public License for more details. */ #include "holi-audio-penang-overlay.dtsi" +#include "holi-nopmi-moto-common-overlay.dtsi" + #include #include #include "holi-pmic-overlay-pm6125.dtsi" #include "holi-thermal-overlay-pm6125.dtsi" #include "display/holi-sde-display-mtp-pm6125.dtsi" -#include "display/blair-sde-display-mtp.dtsi" #include "penang-fps-overlay.dtsi" #include "penang-display.dtsi" #include "penang-touchscreen.dtsi" -#include "penang-sensors.dtsi" -#include "camera/blair-camera-sensor-mot-penang-overlay.dtsi" -#include "penang-wl286xx.dtsi" +#include "penang-fmr-overlay.dtsi" +#include "discrete_charging_penang.dtsi" #include "moto_therm_sys_temp.dtsi" &wcd937x_codec { @@ -37,8 +37,79 @@ cdc-vdd-mic-bias-supply = <>; }; +&holi_snd { + qcom,msm-hs-linein-threshold = <4000>; +}; + +/* Dummy LDO reference */ +&sdhc_1 { + status = "disabled"; + + 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_HIGH>; +}; + +&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 { + nfc { nfc_int_active: nfc_int_active { /* active state */ @@ -72,12 +143,13 @@ nfc_enable_active: nfc_enable_active { mux { - pins = "gpio6"; + /* 48: Enable, 8: Firmware*/ + pins = "gpio48"; function = "gpio"; }; config { - pins = "gpio6"; + pins = "gpio48"; drive-strength = <2>; /* 2 MA */ bias-disable; }; @@ -85,12 +157,13 @@ nfc_enable_suspend: nfc_enable_suspend { mux { - pins = "gpio6"; + /* 48: Enable, 8: Firmware */ + pins = "gpio48"; function = "gpio"; }; config { - pins = "gpio6"; + pins = "gpio48"; drive-strength = <2>; /* 2 MA */ bias-disable; }; @@ -131,72 +204,6 @@ }; }; -/* 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_HIGH>; -}; - -&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"; -}; - &pmk8350_vadc { pmk8350_qtm_n_therm { reg = ; @@ -231,59 +238,22 @@ }; }; -&pmr735a_gpios { - camera_therm { - camera_therm_default:camera_therm_default { - pins = "gpio3"; - bias-high-impedance; - }; - }; -}; - -&pmr735a_vadc { - status = "ok"; - - pinctrl-names = "default"; - pinctrl-0 = <&camera_therm_default>; - - pmr735a_camera_therm { - reg = ; - label = "pmr735a_camera_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; -}; - -&pmr735a_4{ - pmr735a_adc_tm_iio: adc_tm@3400 { - compatible = "qcom,adc-tm5-iio"; - reg = <0x3400>; - #thermal-sensor-cells = <1>; - #address-cells = <1>; - #size-cells = <0>; - io-channels = <&pmr735a_vadc ADC7_GPIO3_100K_PU>; - - pmr735a_camera_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - }; -}; - &qupv3_se7_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 6 0x00>; - st,clkreq_gpio = <&tlmm 7 0x00>; + status = "disabled"; + }; + + nq@28 { + compatible = "qcom,sn-nci"; + mmi,status = "/chosen", "mmi,nfc", "nxp"; + reg = <0x28>; + qcom,sn-irq = <&tlmm 9 0x00>; + qcom,sn-ven = <&tlmm 48 0x00>; + qcom,sn-firm = <&tlmm 8 0x00>; + qcom,sn-clkreq = <&tlmm 7 0x00>; interrupt-parent = <&tlmm>; interrupts = <9 0>; interrupt-names = "nfc_irq"; @@ -295,173 +265,14 @@ }; }; -&thermal_zones { - sdm-skin-therm-usr { - status = "disabled"; - }; - rear-cam-therm-usr { - status = "disabled"; - }; - camera-therm-usr { - status = "disabled"; - }; +&pm8008_8 { + status = "disabled"; +}; - quiet-therm-usr { - status = "disabled"; - }; - - pa-therm0-usr { - status = "disabled"; - }; - - pa-therm1-usr { - status = "disabled"; - }; - - xo-therm-usr { - status = "disabled"; - }; - msm_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pm6125_adc_tm_iio ADC5_GPIO1_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - chg_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pm6125_adc_tm_iio ADC5_GPIO2_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - cam_flash_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmr735a_adc_tm_iio ADC7_GPIO3_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - pa_therm2 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pm6125_adc_tm ADC5_GPIO4_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - pa_therm1 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - quiet_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - - active-config1 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - xo_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - qtm_n_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - qtm_e_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM4_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; +&pm8008_9 { + status = "disabled"; }; &soc { @@ -490,11 +301,288 @@ }; }; -/* Primary USB port related QUSB2 PHY */ -&usb2_phy0 { - qcom,param-override-seq = - <0xa6 0x6c /* override_x0 */ - 0x25 0x70 /* override_x1 */ - 0x16 0x74>; /* override x2 */ +&mot_batterydata { + df-serialnum = "SB18C77591"; + qcom,batt-id-range-pct = <15>; + #include "qg-batterydata-jk50-atl-5000mah.dtsi" + #include "qg-batterydata-jk50-scud-5000mah.dtsi" }; +&thermal_zones { + sdm-skin-therm-usr { + status = "disabled"; + }; + rear-cam-therm-usr { + status = "disabled"; + }; + camera-therm-usr { + status = "disabled"; + }; + quiet-therm-usr { + status = "disabled"; + }; + pa-therm0-usr { + status = "disabled"; + }; + pa-therm1-usr { + status = "disabled"; + }; + xo-therm-usr { + status = "disabled"; + }; + + cam_flash_therm { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pm6125_adc_tm_iio ADC5_GPIO1_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + + chg_therm { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pm6125_adc_tm_iio ADC5_GPIO2_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + + pa_therm2 { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pm6125_adc_tm ADC5_GPIO4_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + + pa_therm1 { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + + quiet_therm { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + + xo_therm { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + + qtm_n_therm { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + + qtm_e_therm { + polling-delay-passive = <5000>; + polling-delay = <20000>; + thermal-governor = "user_space"; + thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM4_100K_PU>; + wake-capable-sensor; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + }; + }; + +}; + +&qupv3_se8_i2c { + + status = "ok"; + + sx937x@2c { + compatible = "Semtech,sx937x"; + reg = <0x2c>; + pinctrl-names = "default","sleep"; + pinctrl-0 = <&sar_int_default>; + pinctrl-1 = <&sar_int_sleep>; + interrupt-parent = <&tlmm>; + interrupts = <24 0x02>; + interrupt-names = "sx937x_irq"; + Semtech,nirq-gpio = <&tlmm 24 0x02>; + //please fix me + cap_vdd-supply = <&pm6125_l9>; + /*use PH4/5/6 as the reference sensor + set it to 0xff if the ref-phases-x is not used*/ + Semtech,ref-phases-a = <5>; + Semtech,ref-phases-b = <6>; + Semtech,ref-phases-c = <0xff>; + Semtech,button-flag = <0x1f>; + Semtech,reg-num = <61>; + Semtech,reg-init = < + 0x8024 0x7F00 + 0x4004 0x70 + 0x4008 0x8 + 0x8020 0x32 + 0x8028 0x8A6 + 0x8034 0x88E + 0x8040 0x8A6 + 0x804C 0x88E + 0x8058 0x88E + 0x8064 0x88E + 0x8070 0x88E + 0x807C 0x88E + 0x8030 0xFFD9FF + 0x803C 0xBFF9FF + 0x8048 0xFFF9FD + 0x8054 0xFEF9FF + 0x8060 0xF7F9FF + 0x806C 0xFFF97F + 0x8078 0xFFF9EF + 0x8084 0xBFF9FF + 0x8098 0x693E + 0x80B8 0x3131 + 0x80D8 0x6833 + 0x80F8 0x2929 + 0x8118 0x4C4C + 0x8138 0x8E + 0x8158 0x8E + 0x8178 0x5A40 + 0x80A0 0x22220001 + 0x80C0 0x1F1F0001 + 0x80E0 0x48540002 + 0x8100 0x1D1D001A + 0x8120 0x1A1A0002 + 0x8188 0x8000015 + 0x818C 0x8000016 + 0x8190 0x10 + 0x8194 0x12 + 0x8090 0x64B45000 + 0x80B0 0x3CD05000 + 0x80D0 0x32D87000 + 0x80F0 0x3CD45000 + 0x8110 0x2CD87000 + 0x8130 0x54AC5000 + 0x8150 0x54AC5000 + 0x8170 0x54AC5000 + 0x8088 0x300000 + 0x80A8 0x300000 + 0x80C8 0x300000 + 0x80E8 0x300000 + 0x8108 0x300000 + 0x8128 0x600000 + 0x8148 0x600000 + 0x8168 0x300000 + 0x808C 0x60200030 + 0x80AC 0x60200030 + 0x80CC 0x60200018 + 0x80EC 0x60200030 + 0x810C 0x60200018 + 0x812C 0x60200030 + 0x814C 0x60200030 + 0x816C 0x60200030 + >; + status = "ok"; + }; +}; + +&qusb_phy0 { + qcom,qusb-phy-init-seq = + /* */ + <0x23 0x210 /* PWR_CTRL1 */ + 0x03 0x04 /* PLL_ANALOG_CONTROLS_TWO */ + 0x7c 0x18c /* PLL_CLOCK_INVERTERS */ + 0x80 0x2c /* PLL_CMODE */ + 0x0a 0x184 /* PLL_LOCK_DELAY */ + 0x19 0xb4 /* PLL_DIGITAL_TIMERS_TWO */ + 0x40 0x194 /* PLL_BIAS_CONTROL_1 */ + 0x1f 0x198 /* PLL_BIAS_CONTROL_2 */ + 0x21 0x214 /* PWR_CTRL2 */ + 0x08 0x220 /* IMP_CTRL1 */ + 0x58 0x224 /* IMP_CTRL2 */ + 0x47 0x240 /* TUNE1 */ + 0x29 0x244 /* TUNE2 */ + 0xca 0x248 /* TUNE3 */ + 0x04 0x24c /* TUNE4 */ + 0x03 0x250 /* TUNE5 */ + 0x30 0x23c /* CHG_CTRL2 */ + 0x22 0x210>; /* PWR_CTRL1 */ + + qcom,qusb-phy-host-init-seq = + /* */ + <0x23 0x210 /* PWR_CTRL1 */ + 0x03 0x04 /* PLL_ANALOG_CONTROLS_TWO */ + 0x7c 0x18c /* PLL_CLOCK_INVERTERS */ + 0x80 0x2c /* PLL_CMODE */ + 0x0a 0x184 /* PLL_LOCK_DELAY */ + 0x19 0xb4 /* PLL_DIGITAL_TIMERS_TWO */ + 0x40 0x194 /* PLL_BIAS_CONTROL_1 */ + 0x1f 0x198 /* PLL_BIAS_CONTROL_2 */ + 0x21 0x214 /* PWR_CTRL2 */ + 0x08 0x220 /* IMP_CTRL1 */ + 0x58 0x224 /* IMP_CTRL2 */ + 0x47 0x240 /* TUNE1 */ + 0x29 0x244 /* TUNE2 */ + 0xca 0x248 /* TUNE3 */ + 0x04 0x24c /* TUNE4 */ + 0x03 0x250 /* TUNE5 */ + 0x30 0x23c /* CHG_CTRL2 */ + 0x22 0x210>; /* PWR_CTRL1 */ +}; diff --git a/qcom/blair-penang-evb1-overlay.dts b/qcom/holi-penang-evt1-overlay.dts similarity index 75% rename from qcom/blair-penang-evb1-overlay.dts rename to qcom/holi-penang-evt1-overlay.dts index 309ec88cbb1e..587571ac77da 100644 --- a/qcom/blair-penang-evb1-overlay.dts +++ b/qcom/holi-penang-evt1-overlay.dts @@ -13,12 +13,12 @@ /dts-v1/; /plugin/; -#include "blair-pm6125-penang-common-overlay.dtsi" +#include "holi-penang-common-overlay.dtsi" / { model = "penang"; - compatible = "qcom,blair-penang", "qcom,blair-moto", "qcom,blair"; - qcom,msm-id = <507 0x10000>; - qcom,board-id = <0x49 0xA100>; + compatible = "qcom,holi-penang", "qcom,holi-moto", "qcom,holi"; + qcom,msm-id = <454 0x10000>, <472 0x10000>; + qcom,board-id = <0x47 0xA100>; }; diff --git a/qcom/penang-display.dtsi b/qcom/penang-display.dtsi index 554c87e6aeaf..f533c8a22b49 100644 --- a/qcom/penang-display.dtsi +++ b/qcom/penang-display.dtsi @@ -1,313 +1,27 @@ #include "dsi-panel-mot-dummy-qhd-video.dtsi" -#include "dsi-panel-mot-tm-nt36672e-678-1080x2460-video.dtsi" -#include "dsi-panel-mot-csot-nt36672e-678-1080x2460-video.dtsi" -#include "dsi-panel-mot-tm-nt36672e-678-1080x2460-video-v1.dtsi" - -&display_panel_avdd { - /delete-property/ gpio; - /delete-property/ pinctrl-0; -}; - - -&tlmm { - lcd_bias_vsp_en_default: lcd_bias_vsp_en_default { - mux { - pins = "gpio85"; - function = "gpio"; - }; - - config { - pins = "gpio85"; - drive-strength = <8>; - bias-disable = <0>; - output-high; - }; - }; - - lcd_bias_vsn_en_default: lcd_bias_vsn_en_default { - mux { - pins = "gpio86"; - function = "gpio"; - }; - - config { - pins = "gpio86"; - drive-strength = <8>; - bias-disable = <0>; - output-high; - }; - }; -}; - -&soc { - lcd_panel_avdd: lcd_gpio_regulator@1 { - compatible = "qti-regulator-fixed"; - regulator-name = "lcd_panel_avdd"; - regulator-min-microvolt = <5500000>; - regulator-max-microvolt = <5500000>; - regulator-enable-ramp-delay = <233>; - gpio = <&tlmm 85 0>; - enable-active-high; - regulator-boot-on; - proxy-supply = <&lcd_panel_avdd>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_bias_vsp_en_default>; - }; - - lcd_panel_avee: lcd_gpio_regulator@2 { - compatible = "qti-regulator-fixed"; - regulator-name = "lcd_panel_avee"; - regulator-min-microvolt = <5500000>; - regulator-max-microvolt = <5500000>; - regulator-enable-ramp-delay = <233>; - gpio = <&tlmm 86 0>; - enable-active-high; - regulator-boot-on; - proxy-supply = <&lcd_panel_avee>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_bias_vsn_en_default>; - }; - - dsi_panel_pwr_supply_ext_bias: dsi_panel_pwr_supply_ext_bias { - #address-cells = <1>; - #size-cells = <0>; - - qcom,panel-supply-entry@0 { - reg = <0>; - qcom,supply-name = "vddio"; - qcom,supply-min-voltage = <1800000>; - qcom,supply-max-voltage = <1800000>; - qcom,supply-enable-load = <62000>; - qcom,supply-disable-load = <80>; - qcom,supply-post-on-sleep = <2>; - qcom,supply-pre-off-sleep = <2>; - qcom,supply-post-off-sleep = <30>; - }; - - qcom,panel-supply-entry@1 { - reg = <1>; - qcom,supply-name = "lab"; - qcom,supply-min-voltage = <5500000>; - qcom,supply-max-voltage = <6000000>; - qcom,supply-enable-load = <100000>; - qcom,supply-disable-load = <100>; - qcom,supply-pre-off-sleep = <2>; - }; - - qcom,panel-supply-entry@2 { - reg = <2>; - qcom,supply-name = "ibb"; - qcom,supply-min-voltage = <5500000>; - qcom,supply-max-voltage = <6000000>; - qcom,supply-enable-load = <100000>; - qcom,supply-disable-load = <100>; - qcom,supply-post-on-sleep = <10>; - }; - }; -}; &sde_dsi { - /delete-property/ lab-supply; - /delete-property/ ibb-supply; - /delete-property/ vddio-supply; - /delete-property/ qcom,dsi-default-panel; - /delete-property/ avdd-supply; - vddio-supply = <&L13A>; - lab-supply = <&lcd_panel_avdd>; - ibb-supply = <&lcd_panel_avee>; - - qcom,dsi-default-panel = <&dsi_nt36672e_fhd_plus_144_video>; + qcom,dsi-default-panel = <&mot_dummy_vid_qhd>; }; -&dsi_tm_nt36672e_678_fhdp_120_video { - qcom,platform-te-gpio = <&tlmm 23 0>; - qcom,platform-reset-gpio = <&pmr735a_gpios 2 0>; - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_ext_bias>; - - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_i2c"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <2047>; - qcom,mdss-dsi-bl-default-level = <1024>; - qcom,mdss-brightness-max-level = <2047>; - - qcom,dsi-supported-dfps-list = <120 90 60>; - qcom,mdss-dsi-pan-enable-dynamic-fps; - qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp"; - - 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_lp_mode"; - qcom,mdss-dsi-panel-status-value = <0x9c>; - qcom,mdss-dsi-panel-status-read-length = <1>; - qcom,mdss-dsi-no-panel-on-read-support; - qcom,mdss-dsi-panel-supplier = "tm"; - - qcom,tp_state_check_enable; - - qcom,mdss-dsi-hbm-on-command = [39 01 00 00 00 00 02 51 FF]; - qcom,mdss-dsi-hbm-on-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-hbm-off-command = [39 01 00 00 00 00 02 51 CC]; - qcom,mdss-dsi-hbm-off-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-hbm-type = "lcd-dcs-wled"; - - qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; - - qcom,mdss-dsi-display-timings { - timing@0 { - qcom,mdss-dsi-panel-phy-timings = [00 1A 07 06 22 21 07 - 07 07 02 04 00 1A 0C]; - qcom,display-topology = <1 1 1>; - qcom,default-topology-index = <0>; - }; - }; -}; &mot_dummy_vid_qhd { - qcom,platform-te-gpio = <&tlmm 23 0>; - qcom,platform-reset-gpio = <&pmr735a_gpios 2 0>; + qcom,platform-te-gpio = <&tlmm 23 0>; + qcom,platform-reset-gpio = <&pmr735a_gpios 2 0>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dummy"; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; - - qcom,mdss-dsi-display-timings { - timing@0 { - qcom,mdss-dsi-panel-phy-timings = [00 0B 02 02 1C 1C 03 - 02 01 02 04 00 0C 12]; - qcom,display-topology = <1 0 1>; - qcom,default-topology-index = <0>; - }; - }; -}; - -&dsi_csot_nt36672e_678_fhdp_120_video { - qcom,platform-te-gpio = <&tlmm 23 0>; - qcom,platform-reset-gpio = <&pmr735a_gpios 2 0>; - - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_ext_bias>; - - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_i2c"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <2047>; - qcom,mdss-dsi-bl-default-level = <1024>; - qcom,mdss-brightness-max-level = <2047>; - - qcom,dsi-supported-dfps-list = <120 90 60>; - qcom,mdss-dsi-pan-enable-dynamic-fps; - qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp"; - - 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_lp_mode"; - qcom,mdss-dsi-panel-status-value = <0x9c>; - qcom,mdss-dsi-panel-status-read-length = <1>; - qcom,mdss-dsi-no-panel-on-read-support; - qcom,mdss-dsi-panel-supplier = "csot"; - - qcom,tp_state_check_enable; - - qcom,mdss-dsi-hbm-on-command = [39 01 00 00 00 00 02 51 FF]; - qcom,mdss-dsi-hbm-on-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-hbm-off-command = [39 01 00 00 00 00 02 51 CC]; - qcom,mdss-dsi-hbm-off-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-hbm-type = "lcd-dcs-wled"; - - qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; - - qcom,mdss-dsi-display-timings { - timing@0 { - qcom,mdss-dsi-panel-phy-timings = [00 1A 07 06 22 21 07 - 07 07 02 04 00 1A 0C]; - qcom,display-topology = <1 1 1>; - qcom,default-topology-index = <0>; - }; - }; -}; - - -&dsi_tianma_nt36672e_678_fhdp_120_video_v1 { - qcom,platform-te-gpio = <&tlmm 23 0>; - qcom,platform-reset-gpio = <&pmr735a_gpios 2 0>; - - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_ext_bias>; - - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_i2c"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <2047>; - qcom,mdss-dsi-bl-default-level = <1024>; - qcom,mdss-brightness-max-level = <2047>; - - qcom,dsi-supported-dfps-list = <120 90 60>; - qcom,mdss-dsi-pan-enable-dynamic-fps; - qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp"; - - 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_lp_mode"; - qcom,mdss-dsi-panel-status-value = <0x9c>; - qcom,mdss-dsi-panel-status-read-length = <1>; - qcom,mdss-dsi-no-panel-on-read-support; - qcom,mdss-dsi-panel-supplier = "tm"; - - qcom,tp_state_check_enable; - - qcom,mdss-dsi-hbm-on-command = [39 01 00 00 00 00 02 51 FF]; - qcom,mdss-dsi-hbm-on-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-hbm-off-command = [39 01 00 00 00 00 02 51 CC]; - qcom,mdss-dsi-hbm-off-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-hbm-type = "lcd-dcs-wled"; - - qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; - - qcom,mdss-dsi-display-timings { - timing@0 { - qcom,mdss-dsi-panel-phy-timings = [00 1A 07 06 22 21 07 - 07 07 02 04 00 1A 0C]; - qcom,display-topology = <1 1 1>; - qcom,default-topology-index = <0>; - }; - }; -}; - -&qupv3_se10_i2c { - status = "ok"; - - lcd_backlight@36 { - compatible = "awinic,aw99703-bl"; - reg = <0x36>; - - /* Awinic, aw99703 */ - aw99703,hwen-gpio = <&tlmm 60 0>; - aw99703,bl-map = <3>; /* brightness map level 1:256,2:1024,3:2048 */ - aw99703,using-lsb; - aw99703,ovp-level = <2>; /* 0:17.5V, 1:24V, 2:31V, 3:38V, 4:41.5V */ - aw99703,ocp-level = <1>; /* 0:0.9A, 1:1.8A, 2:2.7A, 3:3.4A */ - aw99703,switch-freq = <1>; /* 1000kHz(default) */ - aw99703,auto-freq-high = <0x10>; - aw99703,auto-freq-low = <0x05>; - aw99703,bl-fscal-led = <0x19>; /* 24.8mA */ - aw99703,bl-channel = <3>; - aw99703,turn-on-ramp = <0x00>; /* 512us */ - aw99703,turn-off-ramp = <0x04>; /* 8ms */ - aw99703,pwm-trans-dim = <0>; /* 2ms */ - aw99703,i2c-trans-dim = <1>; /* 128ms */ - aw99703,pwm-mode = <1>; /* 1 pwm enable,0 PWM disable */ - aw99703,map-type = <0>; /* 0 exponential, 4 linear */ - aw99703,work-mode = <1>; /* backlight */ - aw99703,default-brightness = <1810>; - - }; -}; - -&qupv3_se10_i2c_sleep { - config { - /delete-property/ bias-disable; - bias-pull-up; - input-enable; + qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; + qcom,mdss-dsi-t-clk-post = <0x09>; + qcom,mdss-dsi-t-clk-pre = <0x15>; + qcom,mdss-dsi-display-timings { + timing@0 { + qcom,mdss-dsi-panel-phy-timings = [00 0B 02 02 1C 1C 03 + 02 01 02 04 00]; + qcom,display-topology = <1 0 1>; + qcom,default-topology-index = <0>; + }; }; }; diff --git a/qcom/penang-fmr-overlay.dtsi b/qcom/penang-fmr-overlay.dtsi new file mode 100644 index 000000000000..7c8b3bb156eb --- /dev/null +++ b/qcom/penang-fmr-overlay.dtsi @@ -0,0 +1,5 @@ +&tlmm { +}; + +&soc { +}; diff --git a/qcom/penang-fps-overlay.dtsi b/qcom/penang-fps-overlay.dtsi index 364d5a440a08..bfc368bf1c2c 100644 --- a/qcom/penang-fps-overlay.dtsi +++ b/qcom/penang-fps-overlay.dtsi @@ -44,12 +44,12 @@ ets_vcc_high: ets_vcc_high { /* INTERRUPT */ mux { - pins = "gpio38"; + pins = "gpio87"; function = "gpio"; }; config { - pins = "gpio38"; + pins = "gpio87"; drive-strength = <2>; /* 2 MA */ output-high; }; @@ -58,12 +58,12 @@ ets_vcc_low: ets_vcc_low { /* INTERRUPT */ mux { - pins = "gpio38"; + pins = "gpio87"; function = "gpio"; }; config { - pins = "gpio38"; + pins = "gpio87"; drive-strength = <2>; /* 2 MA */ output-low; }; @@ -136,7 +136,7 @@ interrupts = <17 0x0>; fp-ctrl-power; fp-gpio-vcc-enable; - egistec,gpio_vcc_en = <&tlmm 38 0x0>; + egistec,gpio_vcc_en = <&tlmm 87 0x0>; egistec,gpio_irq = <&tlmm 17 0x0>; egistec,gpio_reset = <&tlmm 18 0x0>; pinctrl-names = "egis_rst_high", "egis_rst_low", "egis_irq_active", @@ -148,17 +148,4 @@ pinctrl-4 = <&ets_vcc_low>; }; - silead: silead { - compatible = "sil,silead_fp"; - status = "ok"; - reg = <0>; - interrupt-parent = <&tlmm>; - interrupts = <17 0x0>; - avdd-gpios = <&tlmm 38 0x0>; - irq-gpios = <&tlmm 17 0x0>; - rst-gpios = <&tlmm 18 0x0>; - pinctrl-names = "default", "suspend"; - pinctrl-0 = <&fps_rst_active &fps_int_active>; - pinctrl-1 = <&fps_rst_suspend &fps_int_suspend>; - }; }; diff --git a/qcom/penang-sensors.dtsi b/qcom/penang-sensors.dtsi index f3426b6eb2ab..14e283ce4728 100755 --- a/qcom/penang-sensors.dtsi +++ b/qcom/penang-sensors.dtsi @@ -11,41 +11,3 @@ * GNU General Public License for more details. */ -&tlmm { - pen_int_default: pen_int_default { - mux { - pins = "gpio84"; - function = "gpio"; - }; - config { - pins = "gpio84"; - num-grp-pins = <1>; - drive-strength = <2>; - bias-no-pull; - }; - }; - - pen_int_sleep: pen_int_sleep { - mux { - pins = "gpio84"; - function = "gpio"; - }; - config { - pins = "gpio84"; - num-grp-pins = <1>; - drive-strength = <2>; - bias-no-pull; - }; - }; -}; - -&soc { - pen_detect{ - compatible = "rohm,bu520xx_pen_detect"; - pinctrl-names = "default","sleep"; - pinctrl-0 = <&pen_int_default>; - pinctrl-1 = <&pen_int_sleep>; - rohm,nirq-gpio=<&tlmm 84 0x02>; - }; -}; - diff --git a/qcom/penang-touchscreen.dtsi b/qcom/penang-touchscreen.dtsi index 02bc5dd7c72f..29f16ce98a97 100755 --- a/qcom/penang-touchscreen.dtsi +++ b/qcom/penang-touchscreen.dtsi @@ -73,21 +73,5 @@ status = "ok"; pinctrl-0 = <&qupv3_se0_spi_active &qupv3_se0_spi_cs_active>; pinctrl-1 = <&qupv3_se0_spi_sleep &qupv3_se0_spi_cs_sleep>; - novatek@0{ - compatible = "novatek,NVT-ts-spi"; - reg = <0x0>; - spi-max-frequency = <9600000>; /* 4800000,9600000,15000000,19200000 */ - novatek,reset-gpio = <&tlmm 21 0x00>; - novatek,irq-gpio = <&tlmm 22 0x2001>; - novatek,def-max-resolution = <1080 2460>; - novatek,swrst-n8-addr = <0x03F0FE>; - novatek,spi-rd-fast-addr = <0x03F310>; - novatek,report_gesture_key; - novatek,usb_charger; - novatek,edge_cmd = /bits/ 8 <0x72 0x01 0x00>; - novatek,panel-supplier = "tianma","tm","csot"; - panel = <&dsi_tianma_nt36672e_678_fhdp_120_video_v1 &dsi_tm_nt36672e_678_fhdp_120_video &dsi_csot_nt36672e_678_fhdp_120_video>; - status = "ok"; - }; }; diff --git a/qcom/penang-wl286xx.dtsi b/qcom/penang-wl286xx.dtsi deleted file mode 100644 index 80bd9f868469..000000000000 --- a/qcom/penang-wl286xx.dtsi +++ /dev/null @@ -1,74 +0,0 @@ -&tlmm{ - pmic1_en_default: pmic1_en_default { - mux { - pins = "gpio33"; - function = "gpio"; - }; - config { - pins = "gpio33"; - drive-strength = <2>; - bias-pull-down; - }; - }; -}; - -&gcc { - qcom,critical-devices = <&qupv3_se10_i2c>; -}; - -&qupv3_se10_i2c { - status = "ok"; - - cam_pmic1: wl2864c@29{ - compatible = "semi,wl2864c"; - reg = <0x29>; - semi,cs-gpios = <&tlmm 33 0>; - pinctrl-names = "default"; - pinctrl-0 = <&pmic1_en_default>; - vin1-supply = <&S6A>; - - regulators { - cam_pmic1_ldo1_dvdd1: ldo1 { - regulator-name = "ldo1"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1800000>; - }; - - cam_pmic1_ldo2_dvdd2: ldo2 { - regulator-name = "ldo2"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1800000>; - }; - - cam_pmic1_ldo3_avdd1: ldo3 { - regulator-name = "ldo3"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_pmic1_ldo4_avdd2: ldo4 { - regulator-name = "ldo4"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_pmic1_ldo5_vddaf: ldo5 { - regulator-name = "ldo5"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_pmic1_ldo6_vddois: ldo6 { - regulator-name = "ldo6"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_pmic1_ldo7_vddio: ldo7 { - regulator-name = "ldo7"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - }; - }; -};