diff options
| author | Kumar Gala <galak@codeaurora.org> | 2015-01-16 10:44:27 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@codeaurora.org> | 2015-01-20 15:37:28 -0600 |
| commit | dc49ce7c1f889abdfbf43f0cc27a0cc1992c6e4b (patch) | |
| tree | 112ab837e61d670fac8d4409353b6067171913c9 | |
| parent | b2a12530c9dd87a845af18b7eaeac280f88299db (diff) | |
arm64: dts: update 8916/8939 dts files with msm-3.14
23 files changed, 2012 insertions, 1205 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm-pm8916.dtsi index 9b9615c81748..6fe1957888e2 100644 --- a/arch/arm64/boot/dts/qcom/msm-pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm-pm8916.dtsi @@ -31,6 +31,7 @@ interrupt-names = "kpdpwr", "resin"; qcom,pon-dbc-delay = <15625>; qcom,system-reset; + qcom,clear-warm-reset; qcom,pon_1 { qcom,pon-type = <0>; @@ -196,6 +197,7 @@ qcom,adc-bit-resolution = <15>; qcom,adc-vdd-reference = <1800>; qcom,adc_tm-vadc = <&pm8916_vadc>; + qcom,pmic-revid = <&pm8916_revid>; }; pm8916_chg: qcom,charger { @@ -538,6 +540,7 @@ reg-names = "qpnp-lpg-channel-base"; qcom,channel-id = <0>; qcom,supported-sizes = <6>, <9>; + #pwm-cells = <2>; }; pm8916_vib: qcom,vibrator@c000 { diff --git a/arch/arm64/boot/dts/qcom/msm8916-512mb-qrd-skui.dts b/arch/arm64/boot/dts/qcom/msm8916-512mb-qrd-skui.dts index f309f68cefc4..0613f11e3809 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-512mb-qrd-skui.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-512mb-qrd-skui.dts @@ -38,6 +38,54 @@ regulator-name = "smb1360_otg_vreg"; }; }; + + i2c@78b9000 { /* BLSP1 QUP5 */ + focaltech@38 { + compatible = "focaltech,5x06"; + reg = <0x38>; + interrupt-parent = <&msm_gpio>; + interrupts = <13 0x2008>; + vdd-supply = <&pm8916_l17>; + vcc_i2c-supply = <&pm8916_l6>; + /* pins used by touchscreen */ + pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release"; + pinctrl-0 = <&ts_int_active &ts_reset_active>; + pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; + pinctrl-2 = <&ts_release>; + focaltech,name = "ft6436"; + focaltech,family-id = <0x36>; + focaltech,reset-gpio = <&msm_gpio 12 0x0>; + focaltech,irq-gpio = <&msm_gpio 13 0x2008>; + focaltech,display-coords = <0 0 480 854>; + focaltech,panel-coords = <0 0 480 950>; + focaltech,button-map= <139 102 158>; + focaltech,no-force-update; + focaltech,i2c-pull-up; + focaltech,group-id = <1>; + focaltech,hard-reset-delay-ms = <20>; + focaltech,soft-reset-delay-ms = <200>; + focaltech,num-max-touches = <5>; + focaltech,fw-delay-aa-ms = <30>; + focaltech,fw-delay-55-ms = <30>; + focaltech,fw-upgrade-id1 = <0x79>; + focaltech,fw-upgrade-id2 = <0x18>; + focaltech,fw-delay-readid-ms = <10>; + focaltech,fw-delay-era-flsh-ms = <2000>; + focaltech,fw-auto-cal; + focaltech,ignore-id-check; + }; + }; + + gen-vkeys { + compatible = "qcom,gen-vkeys"; + label = "ft5x06_ts"; + qcom,disp-maxx = <480>; + qcom,disp-maxy = <854>; + qcom,panel-maxx = <480>; + qcom,panel-maxy = <946>; + qcom,key-codes = <139 172 158>; + qcom,y-offset = <0>; + }; }; &pm8916_chg { diff --git a/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi b/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi index be603637b8be..79f499cc3260 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi @@ -10,8 +10,73 @@ * GNU General Public License for more details. */ +#include <dt-bindings/msm/msm-bus-rule-ops.h> + &soc { - ad_hoc_bus: ad-hoc-bus { }; + ad_hoc_bus: ad-hoc-bus { }; + + static-rules { + compatible = "qcom,msm-bus-static-bw-rules"; + + rule0 { + qcom,src-nodes = <&mas_apss>; + qcom,src-field = <FLD_IB>; + qcom,src-op = <OP_LE>; + qcom,thresh = <1600000>; + qcom,mode = <THROTTLE_ON>; + qcom,dest-node = <&mas_apss>; + qcom,dest-bw = <600000>; + }; + + + rule1 { + qcom,src-nodes = <&mas_apss>; + qcom,src-field = <FLD_IB>; + qcom,src-op = <OP_LE>; + qcom,thresh = <3200000>; + qcom,mode = <THROTTLE_ON>; + qcom,dest-node = <&mas_apss>; + qcom,dest-bw = <1200000>; + }; + + rule2 { + qcom,src-nodes = <&mas_apss>; + qcom,src-field = <FLD_IB>; + qcom,src-op = <OP_GT>; + qcom,thresh = <3200000>; + qcom,mode = <THROTTLE_OFF>; + qcom,dest-node = <&mas_apss>; + }; + + rule3 { + qcom,src-nodes = <&mas_gfx>; + qcom,src-field = <FLD_IB>; + qcom,src-op = <OP_LE>; + qcom,thresh = <1600000>; + qcom,mode = <THROTTLE_ON>; + qcom,dest-node = <&mas_gfx>; + qcom,dest-bw = <600000>; + }; + + rule4 { + qcom,src-nodes = <&mas_gfx>; + qcom,src-field = <FLD_IB>; + qcom,src-op = <OP_LE>; + qcom,thresh = <3200000>; + qcom,mode = <THROTTLE_ON>; + qcom,dest-node = <&mas_gfx>; + qcom,dest-bw = <1200000>; + }; + + rule5 { + qcom,src-nodes = <&mas_gfx>; + qcom,src-field = <FLD_IB>; + qcom,src-op = <OP_GT>; + qcom,thresh = <3200000>; + qcom,mode = <THROTTLE_OFF>; + qcom,dest-node = <&mas_gfx>; + }; + }; }; &ad_hoc_bus { @@ -339,6 +404,9 @@ qcom,prio-lvl = <0>; qcom,prio-rd = <0>; qcom,prio-wr = <0>; + qcom,ws = <10000>; + qcom,gp = <5000>; + qcom,thmp = <50>; qom,buswidth = <8>; }; @@ -382,6 +450,9 @@ qcom,prio-rd = <0>; qcom,prio-wr = <0>; qom,buswidth = <8>; + qcom,ws = <10000>; + qcom,gp = <5000>; + qcom,thmp = <50>; }; bimc_snoc_mas: bimc-snoc-mas { diff --git a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi index 39f193453e24..561442ab3655 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi @@ -12,12 +12,6 @@ */ &soc { - - led_flash0: qcom,camera-led-flash { - cell-index = <0>; - compatible = "qcom,camera-led-flash"; - qcom,flash-type = <1>; - }; }; &cci { @@ -87,7 +81,6 @@ qcom,csid-sd-index = <0>; qcom,mount-angle = <90>; qcom,actuator-src = <&actuator0>; - qcom,led-flash-src = <&led_flash0>; cam_vdig-supply = <&pm8916_s4>; cam_vana-supply = <&pm8916_l17>; cam_vio-supply = <&pm8916_l6>; diff --git a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi index 39f193453e24..7636fbc79644 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi @@ -12,12 +12,6 @@ */ &soc { - - led_flash0: qcom,camera-led-flash { - cell-index = <0>; - compatible = "qcom,camera-led-flash"; - qcom,flash-type = <1>; - }; }; &cci { @@ -35,6 +29,156 @@ qcom,cam-vreg-op-mode = <80000>; }; + led_flash0: qcom,led-flash@0 { + cell-index = <0>; + reg = <0x66>; + qcom,slave-id = <0x66 0x00 0x0011>; + compatible = "qcom,led-flash1"; + label = "bd7710"; + qcom,flash-type = <1>; + qcom,gpio-no-mux = <0>; + qcom,enable_pinctrl; + pinctrl-names = "cam_flash_default", "cam_flash_suspend"; + pinctrl-0 = <&cam_sensor_flash_default>; + pinctrl-1 = <&cam_sensor_flash_sleep>; + gpios = <&msm_gpio 36 0>, + <&msm_gpio 32 0>, + <&msm_gpio 31 0>; + qcom,gpio-flash-reset = <0>; + qcom,gpio-flash-en = <1>; + qcom,gpio-flash-now = <2>; + qcom,gpio-req-tbl-num = <0 1 2>; + qcom,gpio-req-tbl-flags = <0 0 0>; + qcom,gpio-req-tbl-label = "FLASH_RST", + "FLASH_EN", + "FLASH_NOW"; + qcom,cci-master = <0>; + }; + + eeprom0: qcom,eeprom@20 { + cell-index = <0>; + reg = <0x20>; + qcom,eeprom-name = "sonyimx135"; + compatible = "qcom,eeprom"; + qcom,slave-addr = <0x20>; + qcom,cci-master = <0>; + qcom,num-blocks = <16>; + + qcom,page0 = <1 0x3b02 2 0x10 1 5>; + qcom,pageen0 = <1 0x3b00 2 0x01 1 5>; + qcom,poll0 = <1 0x3b01 2 0x01 1 5>; + qcom,mem0 = <8 0x3b04 2 0 1 0>; + + qcom,page1 = <1 0x3b02 2 0x0F 1 5>; + qcom,pageen1 = <1 0x3b00 2 0x01 1 5>; + qcom,poll1 = <1 0x3b01 2 0x01 1 5>; + qcom,mem1 = <8 0x3b04 2 0 1 0>; + + qcom,page2 = <1 0x3b02 2 0x0E 1 5>; + qcom,pageen2 = <1 0x3b00 2 0x01 1 5>; + qcom,poll2 = <1 0x3b01 2 0x01 1 5>; + qcom,mem2 = <8 0x3b04 2 0 1 0>; + + qcom,page3 = <1 0x3b02 2 0x0D 1 5>; + qcom,pageen3 = <1 0x3b00 2 0x01 1 5>; + qcom,poll3 = <1 0x3b01 2 0x01 1 5>; + qcom,mem3 = <8 0x3b04 2 0 1 0>; + + qcom,page4 = <1 0x3b02 2 0x12 1 5>; + qcom,pageen4 = <1 0x3b00 2 0x01 1 5>; + qcom,poll4 = <1 0x3b01 2 0x01 1 5>; + qcom,mem4 = <7 0x3b09 2 0 1 0>; + + qcom,page5 = <1 0x3b02 2 0x11 1 5>; + qcom,pageen5 = <1 0x3b00 2 0x01 1 5>; + qcom,poll5 = <1 0x3b01 2 0x01 1 5>; + qcom,mem5 = <7 0x3b09 2 0 1 0>; + + qcom,page6 = <1 0x3b02 2 0x10 1 5>; + qcom,pageen6 = <1 0x3b00 2 0x01 1 5>; + qcom,poll6 = <1 0x3b01 2 0x01 1 5>; + qcom,mem6 = <7 0x3b09 2 0 1 0>; + + qcom,page7 = <1 0x3b02 2 0x09 1 5>; + qcom,pageen7 = <1 0x3b00 2 0x01 1 5>; + qcom,poll7 = <1 0x3b01 2 0x01 1 5>; + qcom,mem7 = <7 0x3b09 2 0 1 0>; + + qcom,page8 = <1 0x3b02 2 0x01 1 5>; + qcom,pageen8 = <1 0x3b00 2 0x01 1 5>; + qcom,poll8 = <1 0x3b01 2 0x01 1 5>; + qcom,mem8 = <64 0x3b04 2 0 1 0>; + + qcom,page9 = <1 0x3b02 2 0x02 1 5>; + qcom,pageen9 = <1 0x3b00 2 0x01 1 5>; + qcom,poll9 = <1 0x3b01 2 0x01 1 5>; + qcom,mem9 = <64 0x3b04 2 0 1 0>; + + qcom,page10 = <1 0x3b02 2 0x03 1 5>; + qcom,pageen10 = <1 0x3b00 2 0x01 1 5>; + qcom,poll10 = <1 0x3b01 2 0x01 1 5>; + qcom,mem10 = <64 0x3b04 2 0 1 0>; + + qcom,page11 = <1 0x3b02 2 0x04 1 5>; + qcom,pageen11 = <1 0x3b00 2 0x01 1 5>; + qcom,poll11 = <1 0x3b01 2 0x01 1 5>; + qcom,mem11 = <64 0x3b04 2 0 1 0>; + + qcom,page12 = <1 0x3b02 2 0x05 1 5>; + qcom,pageen12 = <1 0x3b00 2 0x01 1 5>; + qcom,poll12 = <1 0x3b01 2 0x01 1 5>; + qcom,mem12 = <64 0x3b04 2 0 1 0>; + + qcom,page13 = <1 0x3b02 2 0x06 1 5>; + qcom,pageen13 = <1 0x3b00 2 0x01 1 5>; + qcom,poll13 = <1 0x3b01 2 0x01 1 5>; + qcom,mem13 = <64 0x3b04 2 0 1 0>; + + qcom,page14 = <1 0x3b02 2 0x07 1 5>; + qcom,pageen14 = <1 0x3b00 2 0x01 1 5>; + qcom,poll14 = <1 0x3b01 2 0x01 1 5>; + qcom,mem14 = <64 0x3b04 2 0 1 0>; + + qcom,page15 = <1 0x3b02 2 0x08 1 5>; + qcom,pageen15 = <1 0x3b00 2 0x01 1 5>; + qcom,poll15 = <1 0x3b01 2 0x01 1 5>; + qcom,mem15 = <56 0x3b04 2 0 1 0>; + + cam_vdig-supply = <&pm8916_s4>; + cam_vio-supply = <&pm8916_l17>; + cam_vana-supply = <&pm8916_l6>; + qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana"; + qcom,cam-vreg-type = <0 1 0>; + qcom,cam-vreg-min-voltage = <2100000 0 2850000 2800000>; + qcom,cam-vreg-max-voltage = <2100000 0 2850000 2800000>; + qcom,cam-vreg-op-mode = <200000 0 80000 100000>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_default &cam_sensor_rear_default>; + pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep>; + qcom,gpio-no-mux = <0>; + gpios = <&msm_gpio 26 0>, + <&msm_gpio 35 0>, + <&msm_gpio 34 0>; + qcom,gpio-reset = <1>; + qcom,gpio-standby = <2>; + qcom,gpio-req-tbl-num = <0 1 2>; + qcom,gpio-req-tbl-flags = <1 0 0>; + qcom,gpio-req-tbl-label = "CAMIF_MCLK", + "CAM_RESET1", + "CAM_STANDBY"; + qcom,gpio-set-tbl-num = <1 1>; + qcom,gpio-set-tbl-flags = <0 2>; + qcom,gpio-set-tbl-delay = <1000 4000>; + qcom,csi-lane-assign = <0x4320>; + qcom,csi-lane-mask = <0x3>; + qcom,cam-power-seq-type = "sensor_vreg", "sensor_vreg", "sensor_vreg", + "sensor_gpio", "sensor_gpio" , "sensor_clk"; + qcom,cam-power-seq-val = "cam_vdig", "cam_vana", "cam_vio", + "sensor_gpio_reset", "sensor_gpio_standby","sensor_cam_mclk"; + qcom,cam-power-seq-cfg-val = <1 1 1 1 1 24000000>; + qcom,cam-power-seq-delay = <1 1 1 30 30 5>; + }; + qcom,camera@78 { compatible = "ovti,ov5645"; reg = <0x78 0x0>; @@ -48,12 +192,11 @@ cam_vio-supply = <&pm8916_l6>; qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana"; qcom,cam-vreg-type = <0 1 0>; - qcom,cam-vreg-min-voltage = <2100000 0 2800000>; - qcom,cam-vreg-max-voltage = <2100000 0 2800000>; + qcom,cam-vreg-min-voltage = <2100000 0 2850000>; + qcom,cam-vreg-max-voltage = <2100000 0 2850000>; qcom,cam-vreg-op-mode = <200000 0 80000>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_default - &cam_sensor_front_default>; + pinctrl-0 = <&cam_sensor_mclk1_default &cam_sensor_front_default>; pinctrl-1 = <&cam_sensor_mclk1_sleep &cam_sensor_front_sleep>; gpios = <&msm_gpio 27 0>, <&msm_gpio 28 0>, @@ -87,6 +230,7 @@ qcom,csid-sd-index = <0>; qcom,mount-angle = <90>; qcom,actuator-src = <&actuator0>; + qcom,eeprom-src = <&eeprom0>; qcom,led-flash-src = <&led_flash0>; cam_vdig-supply = <&pm8916_s4>; cam_vana-supply = <&pm8916_l17>; @@ -99,8 +243,7 @@ qcom,cam-vreg-max-voltage = <2100000 0 2850000 2800000>; qcom,cam-vreg-op-mode = <200000 0 80000 100000>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_default - &cam_sensor_rear_default>; + pinctrl-0 = <&cam_sensor_mclk0_default &cam_sensor_rear_default>; pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep>; gpios = <&msm_gpio 26 0>, <&msm_gpio 35 0>, diff --git a/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi b/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi index c76351800f72..42655298d9f3 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi @@ -249,7 +249,8 @@ <&clock_gcc clk_gcc_camss_ahb_clk>; clock-names = "camss_top_ahb_clk", "cci_src_clk", "cci_ahb_clk", "cci_clk", "camss_ahb_clk"; - qcom,clock-rates = <0 19200000 80000000 0 0>; + qcom,clock-rates = <0 19200000 80000000 0 0>, + <0 37500000 80000000 0 0>; pinctrl-names = "cci_default", "cci_suspend"; pinctrl-0 = <&cci0_default>; pinctrl-1 = <&cci0_sleep>; @@ -268,6 +269,11 @@ i2c_freq_custom: qcom,i2c_custom_mode { status = "disabled"; }; + + i2c_freq_1Mhz: qcom,i2c_fast_plus_mode { + status = "disabled"; + }; + }; }; @@ -292,7 +298,7 @@ qcom,hw-tsu-sta = <21>; qcom,hw-thd-dat = <13>; qcom,hw-thd-sta = <18>; - qcom,hw-tbuf = <25>; + qcom,hw-tbuf = <32>; qcom,hw-scl-stretch-en = <0>; qcom,hw-trdhld = <6>; qcom,hw-tsp = <3>; @@ -312,3 +318,18 @@ qcom,hw-tsp = <3>; status = "ok"; }; + +&i2c_freq_1Mhz { + qcom,hw-thigh = <16>; + qcom,hw-tlow = <22>; + qcom,hw-tsu-sto = <17>; + qcom,hw-tsu-sta = <18>; + qcom,hw-thd-dat = <16>; + qcom,hw-thd-sta = <15>; + qcom,hw-tbuf = <19>; + qcom,hw-scl-stretch-en = <1>; + qcom,hw-trdhld = <3>; + qcom,hw-tsp = <3>; + qcom,cci-clk-src = <37500000>; + status = "ok"; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi index 58d640012bdb..afa3684e9da2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi @@ -30,9 +30,10 @@ vdd-supply = <&pm8916_l17>; vcc_i2c-supply = <&pm8916_l6>; /* pins used by touchscreen */ - pinctrl-names = "pmx_ts_active","pmx_ts_suspend"; + pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release"; pinctrl-0 = <&ts_int_active &ts_reset_active>; pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; + pinctrl-2 = <&ts_release>; synaptics,irq-gpio = <&msm_gpio 13 0x2008>; synaptics,reset-gpio = <&msm_gpio 12 0x0>; synaptics,i2c-pull-up; @@ -46,7 +47,7 @@ synaptics,device2 { synaptics,package-id = <3408>; synaptics,display-coords = <0 0 1079 1919>; - synaptics,panel-coords = <0 0 1079 2084>; + synaptics,panel-coords = <0 0 1079 2063>; }; }; }; @@ -203,6 +204,7 @@ qcom,msm-ext-pa = "primary"; qcom,msm-mbhc-hphl-swh = <0>; qcom,msm-mbhc-gnd-swh = <0>; + qcom,msm-micbias1-ext-cap; qcom,msm-mclk-freq = <9600000>; qcom,msm-hs-micbias-type = "internal"; qcom,audio-routing = @@ -214,7 +216,11 @@ "MIC BIAS Internal3", "Secondary Mic", "AMIC1", "MIC BIAS Internal1", "AMIC2", "MIC BIAS Internal2", - "AMIC3", "MIC BIAS Internal3"; + "AMIC3", "MIC BIAS Internal3", + "DMIC1", "MIC BIAS Internal1", + "MIC BIAS Internal1", "Digital Mic1", + "DMIC2", "MIC BIAS Internal1", + "MIC BIAS Internal1", "Digital Mic2"; pinctrl-names = "cdc_lines_act", "cdc_lines_sus", "cdc_lines_sec_ext_act", @@ -416,6 +422,7 @@ #include "dsi-panel-jdi-1080p-video.dtsi" #include "dsi-panel-nt35590-720p-video.dtsi" #include "dsi-panel-nt35590-720p-cmd.dtsi" +#include "dsi-panel-hx8394d-720p-video.dtsi" &mdss_mdp { qcom,mdss-pref-prim-intf = "dsi"; @@ -447,14 +454,32 @@ qcom,esd-check-enabled; }; -&pmx_mdss { - qcom,num-grp-pins = <3>; - qcom,pins = <&gp 97>, <&gp 25>, <&gp 98>; +&dsi_hx8394d_720_vid { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm"; + qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>; + qcom,mdss-dsi-bl-pmic-bank-select = <0>; + qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>; + qcom,cont-splash-enabled; }; -&pmx_mdss_te { - qcom,num-grp-pins = <1>; - qcom,pins = <&gp 24>; +&mdss_dsi_active { + pinmux { + function = "gpio"; + pins = "gpio97", "gpio25", "gpio98"; + }; + pinconf { + pins = "gpio97", "gpio25", "gpio98"; + }; +}; + +&mdss_dsi_suspend { + pinmux { + function = "gpio"; + pins = "gpio97", "gpio25", "gpio98"; + }; + pinconf { + pins = "gpio97", "gpio25", "gpio98"; + }; }; &mdss_dsi0 { @@ -473,12 +498,8 @@ pinctrl-names = "seta-pctrl", "setb-pctrl", "sdcard", "trace", "swduart", "swdtrc", "jtag", "spmi"; /* Mictor */ - pinctrl-0 = <&seta_1 &seta_2 &seta_3 &seta_4 &seta_5 &seta_6 &seta_7 - &seta_8 &seta_9 &seta_10 &seta_11 &seta_12 &seta_13 - &seta_14 &seta_15 &seta_16 &seta_17 &seta_18>; - pinctrl-1 = <&setb_1 &setb_2 &setb_3 &setb_4 &setb_5 &setb_6 &setb_7 - &setb_8 &setb_9 &setb_10 &setb_11 &setb_12 &setb_13 - &setb_14 &setb_15 &setb_16 &setb_17 &setb_18>; + pinctrl-0 = <&tpiu_seta>; + pinctrl-1 = <&tpiu_setb>; /* NIDnT */ pinctrl-2 = <&qdsd_clk_sdcard &qdsd_cmd_sdcard &qdsd_data0_sdcard &qdsd_data1_sdcard diff --git a/arch/arm64/boot/dts/qcom/msm8916-coresight.dtsi b/arch/arm64/boot/dts/qcom/msm8916-coresight.dtsi index 8150855a765c..dc5c1b0f2931 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-coresight.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-coresight.dtsi @@ -180,6 +180,9 @@ coresight-outports = <0>; coresight-child-list = <&funnel_in0>; coresight-child-ports = <7>; + + qcom,data-barrier; + clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; clock-names = "core_clk", "core_a_clk"; @@ -211,6 +214,7 @@ coresight-outports = <0>; coresight-child-list = <&funnel_apss>; coresight-child-ports = <0>; + coresight-etm-cpu = <&CPU0>; clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; @@ -228,11 +232,11 @@ coresight-outports = <0>; coresight-child-list = <&funnel_apss>; coresight-child-ports = <1>; + coresight-etm-cpu = <&CPU1>; clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; clock-names = "core_clk", "core_a_clk"; - }; etm2: etm@85e000 { @@ -246,6 +250,7 @@ coresight-outports = <0>; coresight-child-list = <&funnel_apss>; coresight-child-ports = <2>; + coresight-etm-cpu = <&CPU2>; clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; @@ -263,6 +268,7 @@ coresight-outports = <0>; coresight-child-list = <&funnel_apss>; coresight-child-ports = <3>; + coresight-etm-cpu = <&CPU3>; clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; diff --git a/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi b/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi index eb0a81b44ee1..e4690c606ed4 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi @@ -50,9 +50,9 @@ qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = <26 512 0 0>, - <26 512 0 1600000>, - <26 512 0 3200000>, - <26 512 0 4264000>; + <26 512 160000 1600000>, + <26 512 800000 3200000>, + <26 512 1066000 4264000>; /* GDSC oxili regulators */ vdd-supply = <&gdsc_oxili_gx>; @@ -69,7 +69,8 @@ coresight-child-ports = <5>; /* CPU latency parameter */ - qcom,pm-qos-latency = <701>; + qcom,pm-qos-active-latency = <701>; + qcom,pm-qos-wakeup-latency = <701>; /* Power levels */ qcom,gpu-pwrlevels { diff --git a/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi index 98a01799822c..51e8cd9a9ad4 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi @@ -17,8 +17,8 @@ cell-index = <0>; #clock-cells = <1>; - reg = <0x1a98300 0xd4>; - reg-names = "pll_base"; + reg = <0x1a98300 0xd4>, <0x0184d074 0x8>; + reg-names = "pll_base", "gdsc_base"; gdsc-supply = <&gdsc_mdss>; vddio-supply = <&pm8916_l6>; diff --git a/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi index dd847bcbf62e..02d82bb64562 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi @@ -97,7 +97,9 @@ mdss_fb0: qcom,mdss_fb_primary { cell-index = <0>; compatible = "qcom,mdss-fb"; - qcom,memblock-reserve = <0x83200000 0xfa0000>; + qcom,cont-splash-memory { + linux,contiguous-region = <&cont_splash_mem>; + }; }; mdss_fb1: qcom,mdss_fb_wfd { @@ -111,9 +113,10 @@ label = "MDSS DSI CTRL->0"; cell-index = <0>; reg = <0x1a98000 0x25c>, - <0x1a98500 0x2b0>, + <0x1a98500 0x280>, + <0x1a98780 0x30>, <0x193e000 0x30>; - reg-names = "dsi_ctrl", "dsi_phy", "mmss_misc_phys"; + reg-names = "dsi_ctrl", "dsi_phy", "dsi_phy_regulator", "mmss_misc_phys"; qcom,mdss-fb-map = <&mdss_fb0>; qcom,mdss-mdp = <&mdss_mdp>; gdsc-supply = <&gdsc_mdss>; @@ -130,7 +133,7 @@ "byte_clk", "pixel_clk", "core_clk"; qcom,platform-strength-ctrl = [ff 06]; qcom,platform-bist-ctrl = [00 00 b1 ff 00 00]; - qcom,platform-regulator-settings = [07 09 03 00 20 00 01]; + qcom,platform-regulator-settings = [03 08 07 00 20 07 01]; qcom,platform-lane-config = [00 00 00 00 00 00 00 01 97 00 00 00 00 05 00 00 01 97 00 00 00 00 0a 00 00 01 97 @@ -139,6 +142,7 @@ qcom,mmss-ulp-clamp-ctrl-offset = <0x20>; qcom,mmss-phyreset-ctrl-offset = <0x24>; + qcom,timing-db-mode; qcom,core-supply-entries { #address-cells = <1>; @@ -202,4 +206,5 @@ }; #include "dsi-panel-sim-video.dtsi" +#include "dsi-panel-sim-cmd.dtsi" diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp-smb1360.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp-smb1360.dts index cd9135dacfcb..f6c9a6c69b27 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mtp-smb1360.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp-smb1360.dts @@ -32,9 +32,10 @@ pinctrl-0 = <&smb_int_default>; regulator-name = "smb1360_otg_vreg"; + qcom,empty-soc-disabled; qcom,chg-inhibit-disabled; qcom,float-voltage-mv = <4200>; - qcom,iterm-ma = <100>; + qcom,iterm-ma = <200>; qcom,charging-disabled; qcom,recharge-thresh-mv = <100>; qcom,thermal-mitigation = <1500 700 600 0>; diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi index 639e7be944c2..0884b8b63e0c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi @@ -30,9 +30,10 @@ vdd-supply = <&pm8916_l17>; vcc_i2c-supply = <&pm8916_l6>; /* pins used by touchscreen */ - pinctrl-names = "pmx_ts_active","pmx_ts_suspend"; + pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_suspend"; pinctrl-0 = <&ts_int_active &ts_reset_active>; pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; + pinctrl-2 = <&ts_release>; synaptics,display-coords = <0 0 1079 1919>; synaptics,panel-coords = <0 0 1079 2084>; synaptics,irq-gpio = <&msm_gpio 13 0x2008>; @@ -40,6 +41,10 @@ synaptics,i2c-pull-up; synaptics,power-down; synaptics,disable-gpios; + /* Underlying clocks used by secure touch */ + clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>, + <&clock_gcc clk_gcc_blsp1_qup5_i2c_apps_clk>; + clock-names = "iface_clk", "core_clk"; }; }; @@ -135,6 +140,7 @@ qcom,msm-mclk-freq = <9600000>; qcom,msm-mbhc-hphl-swh = <0>; qcom,msm-mbhc-gnd-swh = <0>; + qcom,msm-micbias1-ext-cap; qcom,msm-hs-micbias-type = "internal"; qcom,audio-routing = "RX_BIAS", "MCLK", @@ -145,7 +151,11 @@ "MIC BIAS External", "Secondary Mic", "AMIC1", "MIC BIAS External", "AMIC2", "MIC BIAS Internal2", - "AMIC3", "MIC BIAS External"; + "AMIC3", "MIC BIAS External", + "DMIC1", "MIC BIAS Internal1", + "MIC BIAS Internal1", "Digital Mic1", + "DMIC2", "MIC BIAS Internal1", + "MIC BIAS Internal1", "Digital Mic2"; pinctrl-names = "cdc_lines_act", "cdc_lines_sus", "cdc_lines_sec_ext_act", @@ -166,8 +176,9 @@ &blsp1_uart2 { status = "ok"; - pinctrl-names = "default"; - pinctrl-0 = <&uart_console_sleep>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart_console_default>; + pinctrl-1 = <&uart_console_sleep>; }; &soc { @@ -324,14 +335,24 @@ }; -&pmx_mdss { - qcom,num-grp-pins = <3>; - qcom,pins = <&gp 97>, <&gp 25>, <&gp 98>; +&mdss_dsi_active { + pinmux { + function = "gpio"; + pins = "gpio97", "gpio25", "gpio98"; + }; + pinconf { + pins = "gpio97", "gpio25", "gpio98"; + }; }; -&pmx_mdss_te { - qcom,num-grp-pins = <1>; - qcom,pins = <&gp 24>; +&mdss_dsi_suspend { + pinmux { + function = "gpio"; + pins = "gpio97", "gpio25", "gpio98"; + }; + pinconf { + pins = "gpio97", "gpio25", "gpio98"; + }; }; &mdss_dsi0 { diff --git a/arch/arm64/boot/dts/qcom/msm8916-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pinctrl.dtsi index 78a00d550192..1fe709e8624d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pinctrl.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pinctrl.dtsi @@ -10,1322 +10,1556 @@ * GNU General Public License for more details. */ -&soc { - tlmm_pinmux: pinctrl@1000000 { - compatible = "qcom,msm-tlmm-8916"; - reg = <0x1000000 0x300000>; - interrupts = <0 208 0>; - - /*General purpose pins*/ - gp: gp { - qcom,num-pins = <122>; - #qcom,pin-cells = <1>; - msm_gpio: msm_gpio { - compatible = "qcom,msm-tlmm-gp"; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - num_irqs = <122>; - }; - }; - - ext-cdc-tlmm-lines { - qcom,pins = <&gp 116>, <&gp 112>, <&gp 117>, - <&gp 118>, <&gp 119>; - qcom,num-grp-pins = <5>; - qcom,pin-func = <1>; - label = "ext-cdc-tlmm-lines"; - ext_cdc_tlmm_lines_act: tlmm_lines_on { +&msm_gpio { + ext-cdc-tlmm-lines { + ext_cdc_tlmm_lines_act: tlmm_lines_on { + pinmux_pri { + function = "pri_mi2s"; + pins = "gpio116"; + }; + pinmux_sec { + function = "sec_mi2s"; + pins = "gpio112", "gpio117", "gpio118", + "gpio119"; + }; + pinconf { + pins = "gpio112", "gpio116", "gpio117", + "gpio118", "gpio119"; drive-strength = <8>; bias-pull-none; }; - ext_cdc_tlmm_lines_sus: tlmm_lines_off { + }; + ext_cdc_tlmm_lines_sus: tlmm_lines_off { + pinmux_pri { + function = "pri_mi2s"; + pins = "gpio116"; + }; + pinmux_sec { + function = "sec_mi2s"; + pins = "gpio112", "gpio117", "gpio118", + "gpio119"; + }; + pinconf { + pins = "gpio112", "gpio116", "gpio117", + "gpio118", "gpio119"; drive-strength = <2>; bias-disable; }; }; + }; - ext-codec-lines { - qcom,pins = <&gp 67>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <0>; - label = "ext-codec-lines"; - ext_codec_lines_act: lines_on { + ext-codec-lines { + ext_codec_lines_act: lines_on { + pinmux { + function = "gpio"; + pins = "gpio67"; + }; + pinconf { + pins = "gpio67"; drive-strength = <8>; bias-disable; output-high; }; - ext_codec_lines_sus: lines_off { + }; + ext_codec_lines_sus: lines_off { + pinmux { + function = "gpio"; + pins = "gpio67"; + }; + pinconf { + pins = "gpio67"; drive-strength = <2>; bias-disable; }; }; + }; - cdc-pdm-lines { - qcom,pins = <&gp 63>, <&gp 64>, <&gp 65>, - <&gp 66>, <&gp 67>, <&gp 68>; - qcom,num-grp-pins = <6>; - qcom,pin-func = <1>; - label = "cdc-pdm-lines"; - cdc_pdm_lines_act: pdm_lines_on { + cdc-pdm-lines { + cdc_pdm_lines_act: pdm_lines_on { + pinmux { + function = "cdc_pdm0"; + pins = "gpio63", "gpio64", "gpio65", "gpio66", + "gpio67", "gpio68"; + }; + pinconf { + pins = "gpio63", "gpio64", "gpio65", "gpio66", + "gpio67", "gpio68"; drive-strength = <8>; bias-pull-none; }; - cdc_pdm_lines_sus: pdm_lines_off { + }; + cdc_pdm_lines_sus: pdm_lines_off { + pinmux { + function = "cdc_pdm0"; + pins = "gpio63", "gpio64", "gpio65", "gpio66", + "gpio67", "gpio68"; + }; + pinconf { + pins = "gpio63", "gpio64", "gpio65", "gpio66", + "gpio67", "gpio68"; drive-strength = <2>; bias-disable; }; }; + }; - cdc-ext-pa-lines { - qcom,pins = <&gp 113>, <&gp 114>, - <&gp 115>, <&gp 116>; - qcom,num-grp-pins = <4>; - qcom,pin-func = <1>; - label = "cdc-ext-pa-lines"; - cdc_ext_pa_act: ext_pa_on { + cdc-ext-pa-lines { + cdc_ext_pa_act: ext_pa_on { + pinmux { + function = "pri_mi2s"; + pins = "gpio113", "gpio114", "gpio115", + "gpio116"; + }; + pinconf { + pins = "gpio113", "gpio114", "gpio115", + "gpio116"; drive-strength = <8>; bias-pull-none; }; - cdc_ext_pa_sus: ext_pa_off { + }; + cdc_ext_pa_sus: ext_pa_off { + pinmux { + function = "pri_mi2s"; + pins = "gpio113", "gpio114", "gpio115", + "gpio116"; + }; + pinconf { + pins = "gpio113", "gpio114", "gpio115", + "gpio116"; drive-strength = <2>; bias-disable; }; }; + }; - cdc-ext-pa-ws-line { - qcom,pins = <&gp 110>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "cdc-ext-pa-ws-line"; - cdc_ext_pa_ws_act: ext_pa_on { + cdc-ext-pa-ws-line { + cdc_ext_pa_ws_act: ext_pa_on { + pinmux { + function = "pri_mi2s_ws"; + pins = "gpio110"; + }; + pinconf { + pins = "gpio110"; drive-strength = <8>; bias-pull-none; }; - cdc_ext_pa_ws_sus: ext_pa_off { + }; + cdc_ext_pa_ws_sus: ext_pa_off { + pinmux { + function = "pri_mi2s_ws"; + pins = "gpio110"; + }; + pinconf { + pins = "gpio110"; drive-strength = <2>; bias-disable; }; }; + }; - cross-conn-det { - qcom,pins = <&gp 120>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <0>; - label = "cross-conn-det-sw"; - cross_conn_det_act: lines_on { + cdc-dmic-lines { + cdc_dmic_lines_act: dmic_lines_on { + pinmux_dmic0_clk { + function = "dmic0_clk"; + pins = "gpio0"; + }; + pinmux_dmic0_data { + function = "dmic0_data"; + pins = "gpio1"; + }; + pinconf { + pins = "gpio0", "gpio1"; drive-strength = <8>; - bias-pull-none; }; - cross_conn_det_sus: lines_off { + }; + cdc_dmic_lines_sus: dmic_lines_off { + pinconf { + pins = "gpio0", "gpio1"; drive-strength = <2>; bias-disable; }; }; - pmx-uartconsole { - qcom,pins = <&gp 4>, <&gp 5>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <2>; - label = "uart-console"; + }; + cross-conn-det { + cross_conn_det_act: lines_on { + pinmux { + function = "gpio"; + pins = "gpio120"; + }; + pinconf { + pins = "gpio120"; + drive-strength = <8>; + output-low; + bias-pull-down; + }; + }; + cross_conn_det_sus: lines_off { + pinmux { + function = "gpio"; + pins = "gpio120"; + }; + pinconf { + pins = "gpio120"; + drive-strength = <2>; + bias-disable; + }; + }; + }; + + pmx-uartconsole { + uart_console_default: default { + pinmux { + function = "blsp_uart2"; + pins = "gpio4", "gpio5"; + }; + pinconf { + pins = "gpio4", "gpio5"; + drive-strength = <16>; + bias-disable; + }; + }; uart_console_sleep: uart-console { + pinmux { + function = "blsp_uart2"; + pins = "gpio4", "gpio5"; + }; + pinconf { + pins = "gpio4", "gpio5"; drive-strength = <2>; bias-pull-down; }; }; + }; - blsp1_uart1_active { - qcom,pins = <&gp 0>, <&gp 1>, <&gp 2>, <&gp 3>; - qcom,num-grp-pins = <4>; - qcom,pin-func = <2>; - label = "blsp1_uart1_active"; - - hsuart_active: default { + blsp1_uart1_active { + hsuart_active: default { + pinmux { + function = "blsp_uart1"; + pins = "gpio0", "gpio1", "gpio2", "gpio3"; + }; + pinconf { + pins = "gpio0", "gpio1", "gpio2", "gpio3"; drive-strength = <16>; bias-disable; }; }; + }; - blsp1_uart1_sleep { - qcom,pins = <&gp 0>, <&gp 1>, <&gp 2>, <&gp 3>; - qcom,num-grp-pins = <4>; - qcom,pin-func = <0>; - label = "blsp1_uart1_sleep"; - - hsuart_sleep: sleep { + blsp1_uart1_sleep { + hsuart_sleep: sleep { + pinmux { + function = "blsp_uart1"; + pins = "gpio0", "gpio1", "gpio2", "gpio3"; + }; + pinconf { + pins = "gpio0", "gpio1", "gpio2", "gpio3"; drive-strength = <2>; bias-disable; }; }; + }; - sdhc2_cd_pin { - qcom,pins = <&gp 38>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <0>; - label = "cd-gpio"; - sdc2_cd_on: cd_on { + sdhc2_cd_pin { + sdc2_cd_on: cd_on { + pinmux { + function = "gpio"; + pins = "gpio38"; + }; + pinconf { + pins = "gpio38"; drive-strength = <2>; bias-pull-up; }; - sdc2_cd_off: cd_off { + }; + sdc2_cd_off: cd_off { + pinmux { + function = "gpio"; + pins = "gpio38"; + }; + pinconf { + pins = "gpio38"; drive-strength = <2>; bias-disable; }; }; + }; - /* SDC pin type */ - sdc: sdc { - /* 0-2 for sdc1 4-6 for sdc2 */ - qcom,num-pins = <7>; - /* Order of pins */ - /* SDC1: CLK -> 0, CMD -> 1, DATA -> 2 */ - /* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */ - #qcom,pin-cells = <1>; + pmx_sdc1_clk { + sdc1_clk_on: clk_on { + pinmux { + pins = "sdc1_clk"; + }; + pinconf { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <16>; + }; }; - - pmx_sdc1_clk { - qcom,pins = <&sdc 0>; - qcom,num-grp-pins = <1>; - label = "sdc1-clk"; - sdc1_clk_on: clk_on { - bias-disable; /* NO pull */ - drive-strength = <16>; /* 16 MA */ + sdc1_clk_off: clk_off { + pinmux { + pins = "sdc1_clk"; }; - sdc1_clk_off: clk_off { - bias-disable; /* NO pull */ - drive-strength = <2>; /* 2 MA */ + pinconf { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <2>; }; }; + }; - pmx_sdc1_cmd { - qcom,pins = <&sdc 1>; - qcom,num-grp-pins = <1>; - label = "sdc1-cmd"; - sdc1_cmd_on: cmd_on { - bias-pull-up; /* pull up */ - drive-strength = <10>; /* 10 MA */ + pmx_sdc1_cmd { + sdc1_cmd_on: cmd_on { + pinmux { + pins = "sdc1_cmd"; }; - sdc1_cmd_off: cmd_off { - bias-pull-up; /* pull up */ - drive-strength = <2>; /* 2 MA */ + pinconf { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <10>; }; }; + sdc1_cmd_off: cmd_off { + pinmux { + pins = "sdc1_cmd"; + }; + pinconf { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <2>; + }; + }; + }; - pmx_sdc1_data { - qcom,pins = <&sdc 2>; - qcom,num-grp-pins = <1>; - label = "sdc1-data"; - sdc1_data_on: data_on { - bias-pull-up; /* pull up */ - drive-strength = <10>; /* 10 MA */ + pmx_sdc1_data { + sdc1_data_on: data_on { + pinmux { + pins = "sdc1_data"; }; - sdc1_data_off: data_off { - bias-pull-up; /* pull up */ - drive-strength = <2>; /* 2 MA */ + pinconf { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <10>; }; }; + sdc1_data_off: data_off { + pinmux { + pins = "sdc1_data"; + }; + pinconf { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <2>; + }; + }; + }; - pmx_sdc2_clk { - qcom,pins = <&sdc 4>; - qcom,num-grp-pins = <1>; - label = "sdc2-clk"; - sdc2_clk_on: clk_on { - bias-disable; /* NO pull */ - drive-strength = <16>; /* 16 MA */ + pmx_sdc2_clk { + sdc2_clk_on: clk_on { + pinmux { + pins = "sdc2_clk"; + }; + pinconf { + pins = "sdc2_clk"; + bias-disable; + drive-strength = <16>; }; - sdc2_clk_off: clk_off { - bias-disable; /* NO pull */ - drive-strength = <2>; /* 2 MA */ + }; + sdc2_clk_off: clk_off { + pinmux { + pins = "sdc2_clk"; + }; + pinconf { + pins = "sdc2_clk"; + bias-disable; + drive-strength = <2>; }; }; + }; - pmx_sdc2_cmd { - qcom,pins = <&sdc 5>; - qcom,num-grp-pins = <1>; - label = "sdc2-cmd"; - sdc2_cmd_on: cmd_on { - bias-pull-up; /* pull up */ - drive-strength = <10>; /* 10 MA */ + pmx_sdc2_cmd { + sdc2_cmd_on: cmd_on { + pinmux { + pins = "sdc2_cmd"; }; - sdc2_cmd_off: cmd_off { - bias-pull-up; /* pull up */ - drive-strength = <2>; /* 2 MA */ + pinconf { + pins = "sdc2_cmd"; + bias-pull-up; + drive-strength = <10>; }; }; + sdc2_cmd_off: cmd_off { + pinmux { + pins = "sdc2_cmd"; + }; + pinconf { + pins = "sdc2_cmd"; + bias-pull-up; + drive-strength = <2>; + }; + }; + }; - pmx_sdc2_data { - qcom,pins = <&sdc 6>; - qcom,num-grp-pins = <1>; - label = "sdc2-data"; - sdc2_data_on: data_on { - bias-pull-up; /* pull up */ - drive-strength = <10>; /* 10 MA */ + pmx_sdc2_data { + sdc2_data_on: data_on { + pinmux { + pins = "sdc2_data"; + }; + pinconf { + pins = "sdc2_data"; + bias-pull-up; + drive-strength = <10>; }; - sdc2_data_off: data_off { - bias-pull-up; /* pull up */ - drive-strength = <2>; /* 2 MA */ + }; + sdc2_data_off: data_off { + pinmux { + pins = "sdc2_data"; + }; + pinconf { + pins = "sdc2_data"; + bias-pull-up; + drive-strength = <2>; }; }; + }; - usb-id-pin { - qcom,pins = <&gp 110>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <0>; - label = "usb-id-pin"; - usbid_default: default { + usb-id-pin { + usbid_default: default { + pinmux { + function = "gpio"; + pins = "gpio110"; + }; + pinconf { + pins = "gpio110"; drive-strength = <8>; bias-pull-up; }; }; + }; - spi0_active { - /* MOSI, MISO, CLK */ - qcom,pins = <&gp 8>, <&gp 9>, <&gp 11>; - qcom,num-grp-pins = <3>; - qcom,pin-func = <1>; - label = "spi0-active"; - /* active state */ - spi0_default: default { - drive-strength = <12>; /* 12 MA */ - bias-disable = <0>; /* No PULL */ + spi0 { + /* MOSI, MISO, CLK */ + spi0_default: default { + pinmux { + function = "blsp_spi3"; + pins = "gpio8", "gpio9", "gpio11"; + }; + pinconf { + pins = "gpio8", "gpio9", "gpio11"; + drive-strength = <12>; + bias-disable = <0>; }; }; - spi0_suspend { - /* MOSI, MISO, CLK */ - qcom,pins = <&gp 8>, <&gp 9>, <&gp 11>; - qcom,num-grp-pins = <3>; - qcom,pin-func = <0>; - label = "spi0-suspend"; - /* suspended state */ - spi0_sleep: sleep { - drive-strength = <2>; /* 2 MA */ - bias-pull-down; /* pull down */ + spi0_sleep: sleep { + pinmux { + function = "gpio"; + pins = "gpio8", "gpio9", "gpio11"; + }; + pinconf { + pins = "gpio8", "gpio9", "gpio11"; + drive-strength = <2>; + bias-pull-down; }; }; - spi0_cs0_active { - /* CS */ - qcom,pins = <&gp 10>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <1>; - label = "spi0-cs0-active"; - spi0_cs0_active: cs0_active { + + /* CS */ + spi0_cs0_active: cs0_active { + pinmux { + function = "blsp_spi3"; + pins = "gpio10"; + }; + pinconf { + pins = "gpio10"; drive-strength = <2>; bias-disable = <0>; }; }; - - spi0_cs0_suspend { - /* CS */ - qcom,pins = <&gp 10>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <0>; - label = "spi0-cs0-suspend"; - spi0_cs0_sleep: cs0_sleep { + spi0_cs0_sleep: cs0_sleep { + pinmux { + function = "gpio"; + pins = "gpio10"; + }; + pinconf { + pins = "gpio10"; drive-strength = <2>; bias-disable = <0>; }; }; + }; - ice40-spi-usb-pins { - qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>, <&gp 114>; - qcom,num-grp-pins = <4>; - qcom,pin-func = <0>; - label = "ice40-spi-usb-pins"; - - /* active state */ - ice40_default: default { + ice40-spi-usb-pins { + ice40_default: default { + pinmux { + function = "gpio"; + pins = "gpio0", "gpio1", "gpio3", "gpio114"; + }; + pinconf { + pins = "gpio0", "gpio1", "gpio3", "gpio114"; drive-strength = <8>; bias-disable; }; + }; - /* sleep state */ - ice40_sleep: sleep { + ice40_sleep: sleep { + pinmux { + function = "gpio"; + pins = "gpio0", "gpio1", "gpio3", "gpio114"; + }; + pinconf { + pins = "gpio0", "gpio1", "gpio3", "gpio114"; drive-strength = <2>; bias-pull-down; }; }; + }; - - pmx_i2c_0 { - /* CLK, DATA */ - qcom,pins = <&gp 7>, <&gp 6>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <3>; - label = "pmx_i2c_0"; - - i2c_0_active: i2c_0_active { - drive-strength = <2>; /* 2 MA */ - bias-disable; /* No PULL */ + i2c_0 { + /* CLK, DATA */ + i2c_0_active: i2c_0_active { + pinmux { + function = "blsp_i2c2"; + pins = "gpio6", "gpio7"; }; - - i2c_0_sleep: i2c_0_sleep { - drive-strength = <2>; /* 2 MA */ - bias-disable; /* No PULL */ + pinconf { + pins = "gpio6", "gpio7"; + drive-strength = <2>; + bias-disable; }; }; - pmx_i2c_5 { - /* CLK, DATA */ - qcom,pins = <&gp 19>, <&gp 18>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <2>; - label = "pmx_i2c_5"; - - i2c_5_active: i2c_5_active { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + i2c_0_sleep: i2c_0_sleep { + pinmux { + function = "blsp_i2c2"; + pins = "gpio6", "gpio7"; }; - - i2c_5_sleep: i2c_5_sleep { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + pinconf { + pins = "gpio6", "gpio7"; + drive-strength = <2>; + bias-disable; }; }; + }; - /* QDSD pin type */ - qdsd: qdsd { - /* 0-> clk, 1 -> cmd, 2->data0, 3->data1, 4->data2, 5->data3 */ - qcom,num-pins = <6>; - - #qcom,pin-cells = <1>; + i2c_5 { + /* CLK, DATA */ + i2c_5_active: i2c_5_active { + pinmux { + function = "blsp_i2c5"; + pins = "gpio18", "gpio19"; + }; + pinconf { + pins = "gpio18", "gpio19"; + drive-strength = <2>; + bias-disable = <0>; + }; }; - pmx_qdsd_clk { - qcom,pins = <&qdsd 0>; - qcom,num-grp-pins = <1>; - label = "qdsd-clk"; - qdsd_clk_sdcard: clk_sdcard { - bias-disable; /* NO pull */ - drive-strength = <7>; /* 7 MA */ + i2c_5_sleep: i2c_5_sleep { + pinmux { + function = "blsp_i2c5"; + pins = "gpio18", "gpio19"; }; - qdsd_clk_trace: clk_trace { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "gpio18", "gpio19"; + drive-strength = <2>; + bias-disable = <0>; }; - qdsd_clk_swdtrc: clk_swdtrc { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + }; + }; + + pmx_qdsd_clk { + qdsd_clk_sdcard: clk_sdcard { + pinmux { + pins = "qdsd_clk"; }; - qdsd_clk_spmi: clk_spmi { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_clk"; + bias-disable; + drive-strength = <7>; }; }; - - pmx_qdsd_cmd { - qcom,pins = <&qdsd 1>; - qcom,num-grp-pins = <1>; - label = "qdsd-cmd"; - qdsd_cmd_sdcard: cmd_sdcard { - bias-pull-down; /* pull down */ - drive-strength = <3>; /* 3 MA */ + qdsd_clk_trace: clk_trace { + pinmux { + pins = "qdsd_clk"; }; - qdsd_cmd_trace: cmd_trace { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_clk"; + bias-pull-down; + drive-strength = <0>; }; - qdsd_cmd_swduart: cmd_uart { - bias-pull-up; /* pull up */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_clk_swdtrc: clk_swdtrc { + pinmux { + pins = "qdsd_clk"; }; - qdsd_cmd_swdtrc: cmd_swdtrc { - bias-pull-up; /* pull up */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_clk"; + bias-pull-down; + drive-strength = <0>; }; - qdsd_cmd_jtag: cmd_jtag { - bias-disable; /* NO pull */ - drive-strength = <3>; /* 3 MA */ + }; + qdsd_clk_spmi: clk_spmi { + pinmux { + pins = "qdsd_clk"; }; - qdsd_cmd_spmi: cmd_spmi { - bias-pull-down; /* pull down */ - drive-strength = <4>; /* 4 MA */ + pinconf { + pins = "qdsd_clk"; + bias-pull-down; + drive-strength = <0>; }; }; + }; - pmx_qdsd_data0 { - qcom,pins = <&qdsd 2>; - qcom,num-grp-pins = <1>; - label = "qdsd-data0"; - qdsd_data0_sdcard: data0_sdcard { - bias-pull-down; /* pull down */ - drive-strength = <3>; /* 3 MA */ + pmx_qdsd_cmd { + qdsd_cmd_sdcard: cmd_sdcard { + pinmux { + pins = "qdsd_cmd"; }; - qdsd_data0_trace: data0_trace { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_cmd"; + bias-pull-down; + drive-strength = <3>; }; - qdsd_data0_swduart: data0_uart { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_cmd_trace: cmd_trace { + pinmux { + pins = "qdsd_cmd"; }; - qdsd_data0_swdtrc: data0_swdtrc { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_cmd"; + bias-pull-down; + drive-strength = <0>; }; - qdsd_data0_jtag: data0_jtag { - bias-pull-up; /* pull up */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_cmd_swduart: cmd_uart { + pinmux { + pins = "qdsd_cmd"; }; - qdsd_data0_spmi: data0_spmi { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_cmd"; + bias-pull-up; + drive-strength = <0>; }; }; - - pmx_qdsd_data1 { - qcom,pins = <&qdsd 3>; - qcom,num-grp-pins = <1>; - label = "qdsd-data1"; - qdsd_data1_sdcard: data1_sdcard { - bias-pull-down; /* pull down */ - drive-strength = <3>; /* 3 MA */ + qdsd_cmd_swdtrc: cmd_swdtrc { + pinmux { + pins = "qdsd_cmd"; }; - qdsd_data1_trace: data1_trace { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_cmd"; + bias-pull-up; + drive-strength = <0>; }; - qdsd_data1_swduart: data1_uart { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_cmd_jtag: cmd_jtag { + pinmux { + pins = "qdsd_cmd"; }; - qdsd_data1_swdtrc: data1_swdtrc { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_cmd"; + bias-disable; + drive-strength = <3>; }; - qdsd_data1_jtag: data1_jtag { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_cmd_spmi: cmd_spmi { + pinmux { + pins = "qdsd_cmd"; + }; + pinconf { + pins = "qdsd_cmd"; + bias-pull-down; + drive-strength = <4>; }; }; + }; - pmx_qdsd_data2 { - qcom,pins = <&qdsd 4>; - qcom,num-grp-pins = <1>; - label = "qdsd-data2"; - qdsd_data2_sdcard: data2_sdcard { - bias-pull-down; /* pull down */ - drive-strength = <3>; /* 3 MA */ + pmx_qdsd_data0 { + qdsd_data0_sdcard: data0_sdcard { + pinmux { + pins = "qdsd_data0"; }; - qdsd_data2_trace: data2_trace { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ - }; - qdsd_data2_swduart: data2_uart { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_data0"; + bias-pull-down; + drive-strength = <3>; }; - qdsd_data2_swdtrc: data2_swdtrc { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_data0_trace: data0_trace { + pinmux { + pins = "qdsd_data0"; }; - qdsd_data2_jtag: data2_jtag { - bias-pull-up; /* pull up */ - drive-strength = <3>; /* 3 MA */ + pinconf { + pins = "qdsd_data0"; + bias-pull-down; + drive-strength = <0>; }; }; - - pmx_qdsd_data3 { - qcom,pins = <&qdsd 5>; - qcom,num-grp-pins = <1>; - label = "qdsd-data3"; - qdsd_data3_sdcard: data3_sdcard { - bias-pull-down; /* pull down */ - drive-strength = <3>; /* 3 MA */ + qdsd_data0_swduart: data0_uart { + pinmux { + pins = "qdsd_data0"; }; - qdsd_data3_trace: data3_trace { - bias-pull-down; /* pull down */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_data0"; + bias-pull-down; + drive-strength = <0>; }; - qdsd_data3_swduart: data3_uart { - bias-pull-up; /* pull up */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_data0_swdtrc: data0_swdtrc { + pinmux { + pins = "qdsd_data0"; }; - qdsd_data3_swdtrc: data3_swdtrc { - bias-pull-up; /* pull up */ - drive-strength = <0>; /* 0 MA */ + pinconf { + pins = "qdsd_data0"; + bias-pull-down; + drive-strength = <0>; }; - qdsd_data3_jtag: data3_jtag { - bias-pull-up; /* pull up */ - drive-strength = <0>; /* 0 MA */ + }; + qdsd_data0_jtag: data0_jtag { + pinmux { + pins = "qdsd_data0"; }; - qdsd_data3_spmi: data3_spmi { - bias-pull-down; /* pull down */ - drive-strength = <3>; /* 3 MA */ + pinconf { + pins = "qdsd_data0"; + bias-pull-up; + drive-strength = <0>; }; }; - - pmx_mdss: pmx_mdss { - label = "mdss-pins"; - qcom,pin-func = <0>; - mdss_dsi_active: active { - drive-strength = <8>; /* 8 mA */ - bias-disable = <0>; /* no pull */ - output-high; + qdsd_data0_spmi: data0_spmi { + pinmux { + pins = "qdsd_data0"; }; - mdss_dsi_suspend: suspend { - drive-strength = <2>; /* 2 mA */ - bias-pull-down; /* pull down */ - output-low; + pinconf { + pins = "qdsd_data0"; + bias-pull-down; + drive-strength = <0>; }; }; + }; - wcnss_pmux_5wire: wcnss_pmux_5wire { - /* Uses general purpose pins */ - qcom,pins = <&gp 40>, <&gp 41>, - <&gp 42>, <&gp 43>, - <&gp 44>; - qcom,num-grp-pins = <5>; - qcom,pin-func = <1>; - label = "wcnss_5wire_pins"; - /* Active configuration of bus pins */ - wcnss_default: wcnss_default { - drive-strength = <6>; /* 6 MA */ - bias-pull-up; /* PULL UP */ + pmx_qdsd_data1 { + qdsd_data1_sdcard: data1_sdcard { + pinmux { + pins = "qdsd_data1"; }; - wcnss_sleep: wcnss_sleep { - drive-strength = <2>; /* 2 MA */ - bias-pull-down; /* PULL Down */ + pinconf { + pins = "qdsd_data1"; + bias-pull-down; + drive-strength = <3>; }; }; - - wcnss_pmux_gpio: wcnss_pmux_gpio { - /* Uses general purpose pins */ - qcom,pins = <&gp 40>, <&gp 41>, - <&gp 42>, <&gp 43>, - <&gp 44>; - qcom,num-grp-pins = <5>; - qcom,pin-func = <0>; - label = "wcnss_5gpio_pins"; - /* Active configuration of bus pins */ - wcnss_gpio_default: wcnss_gpio_default { - drive-strength = <6>; /* 6 MA */ - bias-pull-up; /* PULL UP */ + qdsd_data1_trace: data1_trace { + pinmux { + pins = "qdsd_data1"; + }; + pinconf { + pins = "qdsd_data1"; + bias-pull-down; + drive-strength = <3>; }; }; - - pmx_i2c_6 { - /* CLK, DATA */ - qcom,pins = <&gp 22>, <&gp 23>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <2>; - label = "pmx_i2c_6"; - /* active state */ - i2c_6_active: i2c_6_active{ - drive-strength = <2>; /* 2 MA */ - bias-disable; /* No PULL */ + qdsd_data1_swduart: data1_uart { + pinmux { + pins = "qdsd_data1"; }; - /*suspended state */ - i2c_6_sleep: i2c_6_sleep { - drive-strength = <2>; /* 2 MA */ - bias-disable; /* No PULL */ + pinconf { + pins = "qdsd_data1"; + bias-pull-down; + drive-strength = <0>; }; }; - - pmx_rd_nfc_int{ - qcom,pins = <&gp 21>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "pmx_nfc_int"; - - nfc_int_active: active { - drive-strength = <6>; - bias-pull-up; + qdsd_data1_swdtrc: data1_swdtrc { + pinmux { + pins = "qdsd_data1"; }; - - nfc_int_suspend: suspend { - drive-strength = <6>; - bias-pull-up; + pinconf { + pins = "qdsd_data1"; + bias-pull-down; + drive-strength = <0>; }; }; - - pmx_nfc_reset{ - qcom,pins = <&gp 20>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "pmx_nfc_disable"; - - nfc_disable_active: active { - drive-strength = <6>; - bias-pull-up; + qdsd_data1_jtag: data1_jtag { + pinmux { + pins = "qdsd_data1"; }; - - nfc_disable_suspend: suspend { - drive-strength = <6>; - bias-disable; + pinconf { + pins = "qdsd_data1"; + bias-pull-down; + drive-strength = <0>; }; }; + }; - pmx_mdss_te: pmx_mdss_te { - label = "mdss-te-pin"; - qcom,pin-func = <1>; - mdss_te_active: active { - drive-strength = <2>; /* 2 mA */ - bias-pull-down; /* pull down */ - input-debounce = <0>; + pmx_qdsd_data2 { + qdsd_data2_sdcard: data2_sdcard { + pinmux { + pins = "qdsd_data2"; }; - mdss_te_suspend: suspend { - drive-strength = <2>; /* 2 mA */ - bias-pull-down; /* pull down */ - input-debounce = <0>; + pinconf { + pins = "qdsd_data2"; + bias-pull-down; + drive-strength = <3>; }; }; - - /* CoreSight */ - tpiu_seta_1 { - qcom,pins = <&gp 8>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <3>; - label = "tpiu-seta-1"; - seta_1: seta { - drive-strength = <16>; - bias-disable; + qdsd_data2_trace: data2_trace { + pinmux { + pins = "qdsd_data2"; }; - }; - - tpiu_seta_2 { - qcom,pins = <&gp 9>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-2"; - seta_2: seta { - drive-strength = <16>; - bias-disable; + pinconf { + pins = "qdsd_data2"; + bias-pull-down; + drive-strength = <3>; }; }; - - tpiu_seta_3 { - qcom,pins = <&gp 10>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <3>; - label = "tpiu-seta-3"; - seta_3: seta { - drive-strength = <16>; - bias-disable; + qdsd_data2_swduart: data2_uart { + pinmux { + pins = "qdsd_data2"; + }; + pinconf { + pins = "qdsd_data2"; + bias-pull-down; + drive-strength = <0>; }; }; - - tpiu_seta_4 { - qcom,pins = <&gp 39>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-4"; - seta_4: seta { - drive-strength = <16>; - bias-disable; + qdsd_data2_swdtrc: data2_swdtrc { + pinmux { + pins = "qdsd_data2"; + }; + pinconf { + pins = "qdsd_data2"; + bias-pull-down; + drive-strength = <0>; }; }; - - tpiu_seta_5 { - qcom,pins = <&gp 40>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-5"; - seta_5: seta { - drive-strength = <16>; - bias-disable; + qdsd_data2_jtag: data2_jtag { + pinmux { + pins = "qdsd_data2"; + }; + pinconf { + pins = "qdsd_data2"; + bias-pull-up; + drive-strength = <3>; }; }; + }; - tpiu_seta_6 { - qcom,pins = <&gp 41>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-6"; - seta_6: seta { - drive-strength = <16>; - bias-disable; + pmx_qdsd_data3 { + qdsd_data3_sdcard: data3_sdcard { + pinmux { + pins = "qdsd_data3"; + }; + pinconf { + pins = "qdsd_data3"; + bias-pull-down; + drive-strength = <3>; }; }; - - tpiu_seta_7 { - qcom,pins = <&gp 42>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-7"; - seta_7: seta { - drive-strength = <16>; - bias-disable; + qdsd_data3_trace: data3_trace { + pinmux { + pins = "qdsd_data3"; + }; + pinconf { + pins = "qdsd_data3"; + bias-pull-down; + drive-strength = <3>; }; }; - - tpiu_seta_8 { - qcom,pins = <&gp 43>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <3>; - label = "tpiu-seta-8"; - seta_8: seta { - drive-strength = <16>; - bias-disable; + qdsd_data3_swduart: data3_uart { + pinmux { + pins = "qdsd_data3"; + }; + pinconf { + pins = "qdsd_data3"; + bias-pull-up; + drive-strength = <0>; }; }; - - tpiu_seta_9 { - qcom,pins = <&gp 45>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <3>; - label = "tpiu-seta-9"; - seta_9: seta { - drive-strength = <16>; - bias-disable; + qdsd_data3_swdtrc: data3_swdtrc { + pinmux { + pins = "qdsd_data3"; + }; + pinconf { + pins = "qdsd_data3"; + bias-pull-up; + drive-strength = <0>; }; }; - - tpiu_seta_10 { - qcom,pins = <&gp 46>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-10"; - seta_10: seta { - drive-strength = <16>; - bias-disable; + qdsd_data3_jtag: data3_jtag { + pinmux { + pins = "qdsd_data3"; + }; + pinconf { + pins = "qdsd_data3"; + bias-pull-up; + drive-strength = <0>; }; }; - - tpiu_seta_11 { - qcom,pins = <&gp 47>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <3>; - label = "tpiu-seta-11"; - seta_11: seta { - drive-strength = <16>; - bias-disable; + qdsd_data3_spmi: data3_spmi { + pinmux { + pins = "qdsd_data3"; + }; + pinconf { + pins = "qdsd_data3"; + bias-pull-down; + drive-strength = <3>; }; }; + }; - tpiu_seta_12 { - qcom,pins = <&gp 48>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-12"; - seta_12: seta { - drive-strength = <16>; - bias-disable; + pmx_mdss { + mdss_dsi_active: active { + pinconf { + drive-strength = <8>; + bias-disable = <0>; + output-high; }; }; - - tpiu_seta_13 { - qcom,pins = <&gp 62>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-13"; - seta_13: seta { - drive-strength = <16>; - bias-disable; + mdss_dsi_suspend: suspend { + pinconf { + drive-strength = <2>; + bias-pull-down; + output-low; }; }; + }; - tpiu_seta_14 { - qcom,pins = <&gp 69>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <2>; - label = "tpiu-seta-14"; - seta_14: seta { - drive-strength = <16>; - bias-disable; + wcnss_pmux_5wire: wcnss_pmux_5wire { + wcnss_default: wcnss_default { + pinmux2 { + function = "wcss_wlan2"; + pins = "gpio40"; + }; + pinmux1 { + function = "wcss_wlan1"; + pins = "gpio41"; + }; + pinmux0 { + function = "wcss_wlan0"; + pins = "gpio42"; + }; + pinmux { + function = "wcss_wlan"; + pins = "gpio43", "gpio44"; + }; + pinconf { + pins = "gpio40", "gpio41", "gpio42", "gpio43", + "gpio44"; + drive-strength = <6>; + bias-pull-up; }; }; - tpiu_seta_15 { - qcom,pins = <&gp 112>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <5>; - label = "tpiu-seta-15"; - seta_15: seta { - drive-strength = <16>; - bias-disable; + wcnss_sleep: wcnss_sleep { + pinmux2 { + function = "wcss_wlan2"; + pins = "gpio40"; + }; + pinmux1 { + function = "wcss_wlan1"; + pins = "gpio41"; + }; + pinmux0 { + function = "wcss_wlan0"; + pins = "gpio42"; + }; + pinmux { + function = "wcss_wlan"; + pins = "gpio43", "gpio44"; + }; + pinconf { + pins = "gpio40", "gpio41", "gpio42", "gpio43", + "gpio44"; + drive-strength = <2>; + bias-pull-down; }; }; + }; - tpiu_seta_16 { - qcom,pins = <&gp 113>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <9>; - label = "tpiu-seta-16"; - seta_16: seta { - drive-strength = <16>; - bias-disable; + wcnss_pmux_gpio: wcnss_pmux_gpio { + wcnss_gpio_default: wcnss_gpio_default { + pinmux { + function = "gpio"; + pins = "gpio40", "gpio41", "gpio42", "gpio43", + "gpio44"; + }; + pinconf { + pins = "gpio40", "gpio41", "gpio42", "gpio43", + "gpio44"; + drive-strength = <6>; + bias-pull-up; }; }; + }; - tpiu_seta_17 { - qcom,pins = <&gp 114>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <8>; - label = "tpiu-seta-17"; - seta_17: seta { - drive-strength = <16>; + pmx_i2c_6 { + /* CLK, DATA */ + i2c_6_active: i2c_6_active{ + pinmux { + function = "blsp_i2c6"; + pins = "gpio22", "gpio23"; + }; + pinconf { + pins = "gpio22", "gpio23"; + drive-strength = <2>; bias-disable; }; }; - tpiu_seta_18 { - qcom,pins = <&gp 115>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <8>; - label = "tpiu-seta-18"; - seta_18: seta { - drive-strength = <16>; + i2c_6_sleep: i2c_6_sleep { + pinmux { + function = "blsp_i2c6"; + pins = "gpio22", "gpio23"; + }; + pinconf { + pins = "gpio22", "gpio23"; + drive-strength = <2>; bias-disable; }; }; + }; - tpiu_setb_1 { - qcom,pins = <&gp 4>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <5>; - label = "tpiu-setb-1"; - setb_1: setb { - drive-strength = <16>; - bias-disable; + pmx_rd_nfc_int{ + nfc_int_active: active { + pinmux { + function = "gpio"; + pins = "gpio21"; + }; + pinconf { + pins = "gpio21"; + drive-strength = <6>; + bias-pull-up; }; }; - tpiu_setb_2 { - qcom,pins = <&gp 5>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <5>; - label = "tpiu-setb-2"; - setb_2: setb { - drive-strength = <16>; - bias-disable; + nfc_int_suspend: suspend { + pinmux { + function = "gpio"; + pins = "gpio21"; + }; + pinconf { + pins = "gpio21"; + drive-strength = <6>; + bias-pull-up; }; }; + }; - tpiu_setb_3 { - qcom,pins = <&gp 26>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <7>; - label = "tpiu-setb-3"; - setb_3: setb { - drive-strength = <16>; - bias-disable; + pmx_nfc_reset{ + nfc_disable_active: active { + pinmux { + function = "gpio"; + pins = "gpio20"; + }; + pinconf { + pins = "gpio20"; + drive-strength = <6>; + bias-pull-up; }; }; - tpiu_setb_4 { - qcom,pins = <&gp 27>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <9>; - label = "tpiu-setb-4"; - setb_4: setb { - drive-strength = <16>; + nfc_disable_suspend: suspend { + pinmux { + function = "gpio"; + pins = "gpio20"; + }; + pinconf { + pins = "gpio20"; + drive-strength = <6>; bias-disable; }; }; + }; - tpiu_setb_5 { - qcom,pins = <&gp 28>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <7>; - label = "tpiu-setb-5"; - setb_5: setb { - drive-strength = <16>; - bias-disable; + pmx_mdss_te: pmx_mdss_te { + mdss_te_active: active { + pinmux { + function = "mdp_vsync"; + pins = "gpio24"; + }; + pinconf { + pins = "gpio24"; + drive-strength = <2>; + bias-pull-down; + input-debounce = <0>; }; }; - tpiu_setb_6 { - qcom,pins = <&gp 29>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <7>; - label = "tpiu-setb-6"; - setb_6: setb { - drive-strength = <16>; - bias-disable; + mdss_te_suspend: suspend { + pinmux { + function = "mdp_vsync"; + pins = "gpio24"; + }; + pinconf { + pins = "gpio24"; + drive-strength = <2>; + bias-pull-down; + input-debounce = <0>; }; }; + }; - tpiu_setb_7 { - qcom,pins = <&gp 30>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <9>; - label = "tpiu-setb-7"; - setb_7: setb { - drive-strength = <16>; - bias-disable; - }; + /* CoreSight */ + tpiu_seta: seta { + pinmux_data { + function = "qdss_tracedata_a"; + pins = "gpio8", "gpio9", "gpio10", "gpio39", "gpio40", + "gpio41", "gpio42", "gpio43", "gpio47", "gpio48", + "gpio62", "gpio69", "gpio112", "gpio113", "gpio114", + "gpio115"; + }; + pinmux_ctl { + function = "qdss_tracectl_a"; + pins = "gpio45"; + }; + pinmux_clk { + function = "qdss_traceclk_a"; + pins = "gpio46"; + }; + pinconf { + pins = "gpio8", "gpio9", "gpio10", "gpio39", "gpio40", + "gpio41", "gpio42", "gpio43", "gpio45", "gpio46", + "gpio47", "gpio48", "gpio62", "gpio69", "gpio112", + "gpio113", "gpio114", "gpio115"; + drive-strength = <16>; + bias-disable; }; + }; - tpiu_setb_8 { - qcom,pins = <&gp 31>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <10>; - label = "tpiu-setb-8"; - setb_8: setb { - drive-strength = <16>; - bias-disable; - }; + tpiu_setb: setb { + pinmux_data { + function = "qdss_tracedata_b"; + pins = "gpio26", "gpio27", "gpio28", "gpio29", "gpio30", + "gpio31", "gpio32", "gpio33", "gpio34", "gpio35", + "gpio36", "gpio37", "gpio110", "gpio111", "gpio120", + "gpio121"; + }; + pinmux_ctl { + function = "qdss_tracectl_b"; + pins = "gpio4"; + }; + pinmux_clk { + function = "qdss_traceclk_b"; + pins = "gpio5"; + }; + pinconf { + pins = "gpio4", "gpio5", "gpio26", "gpio27", "gpio28", + "gpio29", "gpio30", "gpio31", "gpio32", "gpio33", + "gpio34", "gpio35", "gpio36", "gpio37", "gpio110", + "gpio111", "gpio120", "gpio121"; + drive-strength = <16>; + bias-disable; }; + }; - tpiu_setb_9 { - qcom,pins = <&gp 32>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <10>; - label = "tpiu-setb-9"; - setb_9: setb { - drive-strength = <16>; - bias-disable; + tlmm_gpio_key { + gpio_key_active: gpio_key_active { + pinmux { + function = "gpio"; + pins = "gpio107", "gpio108", "gpio109"; + }; + pinconf { + pins = "gpio107", "gpio108", "gpio109"; + drive-strength = <2>; + bias-pull-up; }; }; - - tpiu_setb_10 { - qcom,pins = <&gp 33>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <9>; - label = "tpiu-setb-10"; - setb_10: setb { - drive-strength = <16>; - bias-disable; + gpio_key_suspend: gpio_key_suspend { + pinmux { + function = "gpio"; + pins = "gpio107", "gpio108", "gpio109"; + }; + pinconf { + pins = "gpio107", "gpio108", "gpio109"; + drive-strength = <2>; + bias-pull-up; }; }; + }; - tpiu_setb_11 { - qcom,pins = <&gp 34>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <9>; - label = "tpiu-setb-11"; - setb_11: setb { - drive-strength = <16>; + gpio_led_pins { + gpio_led_off: led_off { + pinmux { + function = "gpio"; + pins = "gpio8", "gpio9", "gpio10"; + }; + pinconf { + pins = "gpio8", "gpio9", "gpio10"; + drive-strength = <2>; bias-disable; + output-low; }; }; + }; - tpiu_setb_12 { - qcom,pins = <&gp 35>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <9>; - label = "tpiu-setb-12"; - setb_12: setb { + /* add pingrp for touchscreen */ + pmx_ts_int_active { + ts_int_active: ts_int_active { + pinmux { + function = "gpio"; + pins = "gpio13"; + }; + pinconf { + pins = "gpio13"; drive-strength = <16>; - bias-disable; + bias-pull-up; }; }; + }; - tpiu_setb_13 { - qcom,pins = <&gp 36>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <8>; - label = "tpiu-setb-13"; - setb_13: setb { - drive-strength = <16>; - bias-disable; + pmx_ts_int_suspend { + ts_int_suspend: ts_int_suspend { + pinmux { + function = "gpio"; + pins = "gpio13"; + }; + pinconf { + pins = "gpio13"; + drive-strength = <2>; + bias-pull-down; }; }; + }; - tpiu_setb_14 { - qcom,pins = <&gp 37>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <7>; - label = "tpiu-setb-14"; - setb_14: setb { + pmx_ts_reset_active { + ts_reset_active: ts_reset_active { + pinmux { + finction = "gpio"; + pins = "gpio12"; + }; + pinconf { + pins = "gpio12"; drive-strength = <16>; - bias-disable; + bias-pull-up; }; }; + }; - tpiu_setb_15 { - qcom,pins = <&gp 110>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <4>; - label = "tpiu-setb-15"; - setb_15: setb { - drive-strength = <16>; - bias-disable; + pmx_ts_reset_suspend { + ts_reset_suspend: ts_reset_suspend { + pinmux { + function = "gpio"; + pins = "gpio12"; + }; + pinconf { + pins = "gpio12"; + drive-strength = <2>; + bias-pull-down; }; }; + }; - tpiu_setb_16 { - qcom,pins = <&gp 111>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <1>; - label = "tpiu-setb-16"; - setb_16: setb { - drive-strength = <16>; - bias-disable; + pmx_ts_release { + ts_release: ts_release { + pinmux { + function = "gpio"; + pins = "gpio12", "gpio13"; + }; + pinconf { + pins = "gpio12", "gpio13"; + drive-strength = <2>; + bias-pull-down; }; }; + }; - tpiu_setb_17 { - qcom,pins = <&gp 120>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <10>; - label = "tpiu-setb-17"; - setb_17: setb { - drive-strength = <16>; - bias-disable; + cci0_pinmux { + /* CLK, DATA */ + cci0_default: default { + pinmux { + function = "cci_i2c"; + pins = "gpio29", "gpio30"; + }; + pinconf { + pins = "gpio29", "gpio30"; + drive-strength = <2>; + bias-disable = <0>; }; }; - - tpiu_setb_18 { - qcom,pins = <&gp 121>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <11>; - label = "tpiu-setb-18"; - setb_18: setb { - drive-strength = <16>; - bias-disable; + cci0_sleep: sleep { + pinmux { + function = "cci_i2c"; + pins = "gpio29", "gpio30"; + }; + pinconf { + pins = "gpio29", "gpio30"; + drive-strength = <2>; + bias-disable = <0>; }; }; + }; - tlmm_gpio_key { - qcom,pins = <&gp 107>, <&gp 108>, <&gp 109>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <3>; - label = "tlmm_gpio_key"; - gpio_key_active: gpio_key_active { - drive-strength = <2>; - bias-pull-up; + cam_sensor_mclk0 { + /* MCLK */ + cam_sensor_mclk0_default: default { + pinmux { + function = "cam_mclk"; + pins = "gpio26"; }; - gpio_key_suspend: gpio_key_suspend { + pinconf { + pins = "gpio26"; drive-strength = <2>; - bias-pull-up; + bias-disable = <0>; }; }; + }; - gpio_led_pins { - qcom,pins = <&gp 8>, <&gp 9>, <&gp 10>; - qcom,num-grp-pins = <3>; - label = "gpio-led-pins"; - gpio_led_off: led_off { + cam_sensor_mclk0_sleep { + /* MCLK */ + cam_sensor_mclk0_sleep: sleep { + pinmux { + function = "cam_mclk"; + pins = "gpio26"; + }; + pinconf { + pins = "gpio26"; drive-strength = <2>; - bias-disable; - output-low; + bias-pull-down; }; }; + }; - /* add pingrp for touchscreen */ - pmx_ts_int_active { - qcom,pins = <&gp 13>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "pmx_ts_int_active"; - - ts_int_active: ts_int_active { - drive-strength = <16>; - bias-pull-up; + cam_sensor_mclk1 { + /* MCLK */ + cam_sensor_mclk1_default: default { + pinmux { + function = "cam_mclk"; + pins = "gpio27"; + }; + pinconf { + pins = "gpio27"; + drive-strength = <2>; + bias-disable = <0>; }; }; + }; - pmx_ts_int_suspend { - qcom,pins = <&gp 13>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "pmx_ts_int_suspend"; - - ts_int_suspend: ts_int_suspend { + cam_sensor_mclk1_sleep { + /* MCLK */ + cam_sensor_mclk1_sleep: sleep { + pinmux { + function = "cam_mclk"; + pins = "gpio27"; + }; + pinconf { + pins = "gpio27"; drive-strength = <2>; bias-pull-down; }; }; + }; - pmx_ts_reset_active { - qcom,pins = <&gp 12>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "pmx_ts_reset_active"; - - ts_reset_active: ts_reset_active { - drive-strength = <16>; - bias-pull-up; + cam_sensor_rear { + /* RESET, STANDBY */ + cam_sensor_rear_default: default { + pinmux { + function = "gpio"; + pins = "gpio34", "gpio35"; + }; + pinconf { + pins = "gpio34", "gpio35"; + drive-strength = <2>; + bias-disable = <0>; }; }; + }; - pmx_ts_reset_suspend { - qcom,pins = <&gp 12>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "pmx_ts_reset_suspend"; - - ts_reset_suspend: ts_reset_suspend { + cam_sensor_rear_sleep { + /* RESET, STANDBY */ + cam_sensor_rear_sleep: sleep { + pinmux { + function = "gpio"; + pins = "gpio34", "gpio35"; + }; + pinconf { + pins = "gpio34", "gpio35"; drive-strength = <2>; bias-pull-down; }; }; + }; - pmx_ts_release { - qcom,pins = <&gp 13>, <&gp 12>; - qcom,num-grp-pins = <2>; - label = "pmx_ts_release"; - - ts_release: ts_release { + cam_sensor_front { + /* RESET, STANDBY */ + cam_sensor_front_default: default { + pinmux { + function = "gpio"; + pins = "gpio28", "gpio33"; + }; + pinconf { + pins = "gpio28", "gpio33"; drive-strength = <2>; - bias-pull-down; + bias-disable = <0>; }; }; + }; - cci0_pinmux { - /* CLK, DATA */ - qcom,pins = <&gp 29>, <&gp 30>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <1>; - label = "cci0"; - /* active state */ - cci0_default: default { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + cam_sensor_front_sleep { + /* RESET, STANDBY */ + cam_sensor_front_sleep: sleep { + pinmux { + function = "gpio"; + pins = "gpio28", "gpio33"; }; - /*suspended state */ - cci0_sleep: sleep { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + pinconf { + pins = "gpio28", "gpio33"; + drive-strength = <2>; + bias-pull-down = <0>; }; }; + }; - cam_sensor_mclk0 { - /* MCLK */ - qcom,pins = <&gp 26>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <1>; - label = "cam-sensor-mclk0"; - /* active state */ - cam_sensor_mclk0_default: default { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + cam_sensor_flash { + /* FLASH_RESET,FLASH_EN,FLASH_NOW */ + cam_sensor_flash_default: default { + pinmux { + function = "gpio"; + pins = "gpio31", "gpio32", "gpio36"; }; - /*suspended state */ - cam_sensor_mclk0_sleep: sleep { - drive-strength = <2>; /* 2 MA */ - bias-pull-down; /* PULL DOWN */ + pinconf { + pins = "gpio31", "gpio32", "gpio36"; + drive-strength = <2>; + bias-disable = <0>; }; }; - cam_sensor_mclk1 { - /* MCLK */ - qcom,pins = <&gp 27>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <1>; - label = "cam-sensor-mclk1"; - /* active state */ - cam_sensor_mclk1_default: default { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + cam_sensor_flash_sleep: sleep { + pinmux { + function = "gpio"; + pins = "gpio31", "gpio32", "gpio36"; }; - /*suspended state */ - cam_sensor_mclk1_sleep: sleep { - drive-strength = <2>; /* 2 MA */ - bias-pull-down; /* PULL DOWN */ + pinconf { + pins = "gpio31", "gpio32", "gpio36"; + drive-strength = <2>; + bias-pull-down = <0>; }; }; + }; - cam_sensor_rear { - /* RESET, STANDBY */ - qcom,pins = <&gp 35>, <&gp 34>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <0>; - label = "cam-sensor-rear"; - /* active state */ - cam_sensor_rear_default: default { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + pmx_i2c_4 { + /* CLK, DATA */ + i2c_4_active: i2c_4_active { + pinmux { + function = "blsp_i2c4"; + pins = "gpio14", "gpio15"; }; - /*suspended state */ - cam_sensor_rear_sleep: sleep { - drive-strength = <2>; /* 2 MA */ - bias-pull-down; /* PULL DOWN */ + pinconf { + pins = "gpio14", "gpio15"; + drive-strength = <2>; + bias-disable = <0>; }; }; - cam_sensor_front { - /* RESET, STANDBY */ - qcom,pins = <&gp 28>, <&gp 33>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <0>; - label = "cam_sensor_front"; - /* active state */ - cam_sensor_front_default: default { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + i2c_4_sleep: i2c_4_sleep { + pinmux { + function = "blsp_i2c4"; + pins = "gpio14", "gpio15"; }; - /*suspended state */ - cam_sensor_front_sleep: sleep { - drive-strength = <2>; /* 2 MA */ - bias-pull-down = <0>; /* PULL DOWN */ + pinconf { + pins = "gpio14", "gpio15"; + drive-strength = <2>; + bias-disable = <0>; }; }; + }; - pmx_i2c_4 { - /* CLK, DATA */ - qcom,pins = <&gp 14>, <&gp 15>; - qcom,num-grp-pins = <2>; - qcom,pin-func = <2>; - label = "pmx_i2c_4"; - - i2c_4_active: i2c_4_active { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ - }; - - i2c_4_sleep: i2c_4_sleep { - drive-strength = <2>; /* 2 MA */ - bias-disable = <0>; /* No PULL */ + smb_int_pin { + smb_int_default: smb_int_default { + pinmux { + function = "gpio"; + pins = "gpio62"; + }; + pinconf { + pins = "gpio62"; + drive-strength = <2>; + bias-pull-up; }; - }; + }; - smb_int_pin { - qcom,pins = <&gp 62>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <0>; - label = "smb1360_int_gpio"; - smb_int_default: smb_int_default { - drive-strength = <2>; /* 2 MA */ - bias-pull-up; /* PULL UP*/ + button_backlight_pin { + button_backlight_off: button_backlight_off { + pinmux { + function = "gpio"; + pins = "gpio119"; }; - }; - - button_backlight_pin { - qcom,pins = <&gp 119>; - qcom,num-grp-pins = <1>; - qcom,pin-func = <0>; - label = "button-backlight-pin"; - button_backlight_off: button_backlight_off { + pinconf { + pins = "gpio119"; drive-strength = <2>; bias-disable; output-low; }; }; + }; - mpu6050_int_pin { - qcom,pins = <&gp 115>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "mpu6050-irq"; - mpu6050_default: mpu6050_default { + mpu6050_int_pin { + mpu6050_default: mpu6050_default { + pinmux { + function = "gpio"; + pins = "gpio115"; + }; + pinconf { + pins = "gpio115"; drive-strength = <6>; bias-pull-up; }; - mpu6050_sleep: mpu6050_sleep { + }; + mpu6050_sleep: mpu6050_sleep { + pinmux { + function = "gpio"; + pins = "gpio115"; + }; + pinconf { + pins = "gpio115"; drive-strength = <2>; }; }; + }; - apds99xx_int_pin { - qcom,pins = <&gp 113>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "apds99xx-irq"; - apds99xx_default: apds99xx_default { + apds99xx_int_pin { + apds99xx_default: apds99xx_default { + pinmux { + function = "gpio"; + pins = "gpio113"; + }; + pinconf { + pins = "gpio113"; drive-strength = <6>; bias-pull-up; }; - apds99xx_sleep: apds99xx_sleep { + }; + apds99xx_sleep: apds99xx_sleep { + pinmux { + function = "gpio"; + pins = "gpio113"; + }; + pinconf { + pins = "gpio113"; drive-strength = <2>; bias-pull-down; }; }; - ak8963_int_pin { - qcom,pins = <&gp 69>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "ak8963-irq"; - ak8963_default: ak8963_default { + }; + + ak8963_int_pin { + ak8963_default: ak8963_default { + pinmux { + function = "gpio"; + pins = "gpio69"; + }; + pinconf { + pins = "gpio69"; drive-strength = <6>; bias-pull-up; }; - ak8963_sleep: ak8963_sleep { + }; + ak8963_sleep: ak8963_sleep { + pinmux { + function = "gpio"; + pins = "gpio69"; + }; + pinconf { + pins = "gpio69"; drive-strength = <2>; bias-pull-down; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm.dtsi index 6d521304b67c..815aaf4e8e52 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pm.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pm.dtsi @@ -23,8 +23,6 @@ qcom,saw2-spm-dly= <0x3C102800>; qcom,saw2-spm-ctl = <0xe>; qcom,saw2-spm-cmd-wfi = [60 03 60 0B 0f]; - qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B - 94 5B 80 10 26 30 0f]; qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B 94 5B 80 10 26 30 0f]; }; @@ -41,8 +39,6 @@ qcom,saw2-spm-dly= <0x3c102800>; qcom,saw2-spm-ctl = <0xe>; qcom,saw2-spm-cmd-wfi = [60 03 60 0B 0f]; - qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B - 94 5B 80 10 26 30 0f]; qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B 94 5B 80 10 26 30 0f]; }; @@ -59,8 +55,6 @@ qcom,saw2-spm-dly= <0x3c102800>; qcom,saw2-spm-ctl = <0xe>; qcom,saw2-spm-cmd-wfi = [60 03 60 0B 0f]; - qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B - 94 5B 80 10 26 30 0f]; qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B 94 5B 80 10 26 30 0f]; }; @@ -77,8 +71,6 @@ qcom,saw2-spm-dly= <0x3c102800>; qcom,saw2-spm-ctl = <0xe>; qcom,saw2-spm-cmd-wfi = [60 03 60 0B 0f]; - qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B - 94 5B 80 10 26 30 0f]; qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3B 76 76 0B 94 5B 80 10 26 30 0f]; }; @@ -91,20 +83,23 @@ qcom,name = "system-l2"; qcom,core-id = <0xffff>; /* L2/APCS SAW */ qcom,saw2-ver-reg = <0xfd0>; - qcom,saw2-cfg = <0x14>; + qcom,saw2-cfg = <0x1F>; qcom,saw2-spm-dly= <0x3C102800>; qcom,saw2-spm-ctl = <0xe>; - qcom,saw2-pmic-data0 = <0x04030080>; + qcom,saw2-pmic-data0 = <0x05030080>; qcom,saw2-pmic-data1 = <0x00030000>; + qcom,saw2-pmic-data4 = <0x00010080>; + qcom,saw2-pmic-data5 = <0x00010000>; qcom,vctl-timeout-us = <50>; qcom,vctl-port = <0x0>; qcom,phase-port = <0x1>; qcom,pfm-port = <0x2>; qcom,cpu-vctl-mask = <0xf>; + qcom,supports-rpm-hs; qcom,saw2-spm-cmd-ret = [00 03 00 0f]; qcom,saw2-spm-cmd-gdhs = [00 20 32 6B C0 E0 D0 42 F0 03 50 4E 02 02 D0 E0 C0 22 6B 02 32 52 F0 0F]; - qcom,saw2-spm-cmd-pc = [00 32 B0 10 E0 D0 6B C0 42 11 07 01 + qcom,saw2-spm-cmd-pc = [00 32 B0 10 E0 D0 6B C0 42 51 11 03 01 41 B0 50 4E 02 02 C0 D0 12 E0 6B 02 32 50 0F]; }; @@ -147,10 +142,10 @@ reg = <2>; label = "l2-pc"; qcom,spm-l2-mode = "pc"; - qcom,latency-us = <10900>; + qcom,latency-us = <11030>; qcom,ss-power = <490>; - qcom,energy-overhead = <950000>; - qcom,time-overhead = <1450>; + qcom,energy-overhead = <972390>; + qcom,time-overhead = <1580>; qcom,min-child-idx = <2>; qcom,notify-rpm; }; @@ -329,7 +324,7 @@ qcom,rpm-log@29dc00 { compatible = "qcom,rpm-log"; reg = <0x29dc00 0x4000>; - qcom,rpm-addr-phys = <0xfc000000>; + qcom,rpm-addr-phys = <0x200000>; qcom,offset-version = <4>; qcom,offset-page-buffer-addr = <36>; qcom,offset-log-len = <40>; diff --git a/arch/arm64/boot/dts/qcom/msm8916-qrd-skuh.dtsi b/arch/arm64/boot/dts/qcom/msm8916-qrd-skuh.dtsi index ba622e145462..f8c1c1787093 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-qrd-skuh.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-qrd-skuh.dtsi @@ -14,45 +14,68 @@ #include "dsi-panel-innolux-720p-video.dtsi" #include "msm8916-camera-sensor-qrd.dtsi" -&tlmm_pinmux { +&msm_gpio { akm_reset_pin { - qcom,pins = <&gp 36>; - qcom,pin-func = <0>; - qcom,num-grp-pins = <1>; - label = "akm_reset_pin"; akm_default: akm_default { - drive-strength = <6>; - bias-pull-up; + pinmux { + function = "gpio"; + pins = "gpio36"; + }; + pinconf { + pins = "gpio36"; + drive-strength = <6>; + bias-pull-up; + }; }; akm_sleep: akm_sleep { - drive-strength = <2>; - bias-pull-down; + pinmux { + function = "gpio"; + pins = "gpio36"; + }; + pinconf { + pins = "gpio36"; + drive-strength = <2>; + bias-pull-down; + }; }; }; lis3dh_int1_pin { - qcom,pins = <&gp 115>; - qcom,num-grp-pins = <1>; - label = "lis3dh_int_pin"; lis3dh_int1_default: int1_default { - drive-strength = <6>; - bias-pull-down; + pinmux { + function = "gpio"; + pins = "gpio115"; + }; + pinconf { + pins = "gpio115"; + drive-strength = <6>; + bias-pull-down; + }; }; lis3dh_int1_sleep: int1_sleep { - drive-strength = <2>; - bias-pull-down; + pinmux { + function = "gpio"; + pins = "gpio115"; + }; + pinconf { + pins = "gpio115"; + drive-strength = <2>; + bias-pull-down; + }; }; }; tps65132-en-pin { - qcom,pins = <&gp 32>, <&gp 97>; - qcom,num-grp-pins = <2>; - label = "tps65132_en_pins"; - qcom,pin-func = <0>; - tps65132_en_default: en-default { - drive-strength = <2>; - bias-pull-down; + pinmux { + function = "gpio"; + pins = "gpio32", "gpio97"; + }; + pinconf { + pins = "gpio32", "gpio97"; + drive-strength = <2>; + bias-pull-down; + }; }; }; }; @@ -89,7 +112,7 @@ avago,als-B = <186>; avago,als-C = <75>; avago,als-D = <129>; - avago,ga-value = <98>; + avago,ga-value = <313>; }; st@18 { @@ -149,9 +172,24 @@ qcom,mdss-pref-prim-intf = "dsi"; }; -&pmx_mdss { - qcom,num-grp-pins = <1>; - qcom,pins = <&gp 25>; +&mdss_dsi_active { + pinmux { + function = "gpio"; + pins = "gpio25"; + }; + pinconf { + pins = "gpio25"; + }; +}; + +&mdss_dsi_suspend { + pinmux { + function = "gpio"; + pins = "gpio25"; + }; + pinconf { + pins = "gpio25"; + }; }; &mdss_dsi0 { @@ -241,6 +279,46 @@ pinctrl-0 = <&cdc_pdm_lines_act>; pinctrl-1 = <&cdc_pdm_lines_sus>; }; + + i2c@78b9000 { /* BLSP1 QUP5 */ + synaptics@70 { + compatible = "synaptics,rmi4"; + reg = <0x70>; + interrupt-parent = <&msm_gpio>; + interrupts = <13 0x2008>; + vdd-supply = <&vdd_vreg>; + vcc_i2c-supply = <&pm8916_l16>; + /* pins used by touchscreen */ + pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_suspend"; + pinctrl-0 = <&ts_int_active &ts_reset_active>; + pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; + pinctrl-2 = <&ts_release>; + synaptics,display-coords = <0 0 1100 1756>; + synaptics,panel-coords = <0 0 1100 1899>; + synaptics,irq-gpio = <&msm_gpio 13 0x2008>; + synaptics,reset-gpio = <&msm_gpio 12 0x0>; + synaptics,i2c-pull-up; + synaptics,power-down; + synaptics,disable-gpios; + synaptics,fw-image-name = "PR1601177-s3207_8916_qrd_00430000.img"; + }; + }; + + vdd_vreg: vdd_vreg { + compatible = "regulator-fixed"; + status = "ok"; + regulator-name = "vdd_vreg"; + }; + + gen-vkeys { + compatible = "qcom,gen-vkeys"; + label = "synaptics_rmi4_i2c"; + qcom,disp-maxx = <720>; + qcom,disp-maxy = <1280>; + qcom,panel-maxx = <720>; + qcom,panel-maxy = <1385>; + qcom,key-codes = <158 172 139>; + }; }; &pm8916_vadc { diff --git a/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dts b/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dts index c7e56688015e..28ac5e477a93 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dts @@ -35,9 +35,58 @@ qcom,iterm-ma = <200>; qcom,recharge-thresh-mv = <100>; qcom,thermal-mitigation = <1500 700 600 0>; + qcom,fg-auto-recharge-soc = <99>; regulator-name = "smb1360_otg_vreg"; }; }; + + i2c@78b9000 { /* BLSP1 QUP5 */ + focaltech@38 { + compatible = "focaltech,5x06"; + reg = <0x38>; + interrupt-parent = <&msm_gpio>; + interrupts = <13 0x2008>; + vdd-supply = <&pm8916_l17>; + vcc_i2c-supply = <&pm8916_l6>; + /* pins used by touchscreen */ + pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release"; + pinctrl-0 = <&ts_int_active &ts_reset_active>; + pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; + pinctrl-2 = <&ts_release>; + focaltech,name = "ft6436"; + focaltech,family-id = <0x36>; + focaltech,reset-gpio = <&msm_gpio 12 0x0>; + focaltech,irq-gpio = <&msm_gpio 13 0x2008>; + focaltech,display-coords = <0 0 480 854>; + focaltech,panel-coords = <0 0 480 950>; + focaltech,button-map= <139 102 158>; + focaltech,no-force-update; + focaltech,i2c-pull-up; + focaltech,group-id = <1>; + focaltech,hard-reset-delay-ms = <20>; + focaltech,soft-reset-delay-ms = <200>; + focaltech,num-max-touches = <5>; + focaltech,fw-delay-aa-ms = <30>; + focaltech,fw-delay-55-ms = <30>; + focaltech,fw-upgrade-id1 = <0x79>; + focaltech,fw-upgrade-id2 = <0x18>; + focaltech,fw-delay-readid-ms = <10>; + focaltech,fw-delay-era-flsh-ms = <2000>; + focaltech,fw-auto-cal; + focaltech,ignore-id-check; + }; + }; + + gen-vkeys { + compatible = "qcom,gen-vkeys"; + label = "ft5x06_ts"; + qcom,disp-maxx = <480>; + qcom,disp-maxy = <854>; + qcom,panel-maxx = <480>; + qcom,panel-maxy = <946>; + qcom,key-codes = <139 172 158>; + qcom,y-offset = <0>; + }; }; &pm8916_chg { diff --git a/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dtsi b/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dtsi index 1c5f32c47a87..4709a78ab081 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-qrd-skui.dtsi @@ -12,55 +12,9 @@ #include "msm8916-qrd.dtsi" #include "dsi-panel-otm8019a-fwvga-video.dtsi" +#include "msm8916-camera-sensor-qrd-skui.dtsi" &soc { - i2c@78b9000 { /* BLSP1 QUP5 */ - focaltech@38 { - compatible = "focaltech,5x06"; - reg = <0x38>; - interrupt-parent = <&msm_gpio>; - interrupts = <13 0x2008>; - vdd-supply = <&pm8916_l17>; - vcc_i2c-supply = <&pm8916_l6>; - /* pins used by touchscreen */ - pinctrl-names = "pmx_ts_active","pmx_ts_suspend"; - pinctrl-0 = <&ts_int_active &ts_reset_active>; - pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; - focaltech,name = "ft6436"; - focaltech,family-id = <0x36>; - focaltech,reset-gpio = <&msm_gpio 12 0x0>; - focaltech,irq-gpio = <&msm_gpio 13 0x2008>; - focaltech,display-coords = <0 0 480 854>; - focaltech,panel-coords = <0 0 480 950>; - focaltech,button-map= <139 102 158>; - focaltech,no-force-update; - focaltech,i2c-pull-up; - focaltech,group-id = <1>; - focaltech,hard-reset-delay-ms = <20>; - focaltech,soft-reset-delay-ms = <200>; - focaltech,num-max-touches = <5>; - focaltech,fw-delay-aa-ms = <30>; - focaltech,fw-delay-55-ms = <30>; - focaltech,fw-upgrade-id1 = <0x79>; - focaltech,fw-upgrade-id2 = <0x18>; - focaltech,fw-delay-readid-ms = <10>; - focaltech,fw-delay-era-flsh-ms = <2000>; - focaltech,fw-auto-cal; - focaltech,ignore-id-check; - }; - }; - - gen-vkeys { - compatible = "qcom,gen-vkeys"; - label = "ft5x06_ts"; - qcom,disp-maxx = <480>; - qcom,disp-maxy = <854>; - qcom,panel-maxx = <480>; - qcom,panel-maxy = <946>; - qcom,key-codes = <139 172 158>; - qcom,y-offset = <0>; - }; - gpio-leds { compatible = "gpio-leds"; status = "okay"; @@ -115,9 +69,24 @@ qcom,mdss-pref-prim-intf = "dsi"; }; -&pmx_mdss { - qcom,num-grp-pins = <1>; - qcom,pins = <&gp 25>; +&mdss_dsi_active { + pinmux { + function = "gpio"; + pins = "gpio25"; + }; + pinconf { + pins = "gpio25"; + }; +}; + +&mdss_dsi_suspend { + pinmux { + function = "gpio"; + pins = "gpio25"; + }; + pinconf { + pins = "gpio25"; + }; }; &mdss_dsi0 { @@ -133,24 +102,32 @@ qcom,cont-splash-enabled; }; -&tlmm_pinmux { +&msm_gpio { bma2x2_int1_pin { - qcom,pins = <&gp 112>; - qcom,num-grp-pins = <1>; - label = "bma2x2_int1_pin"; bma2x2_int1_default: int1_default { - drive-strength = <6>; - bias-pull-up; + pinmux { + function = "gpio"; + pins = "gpio112"; + }; + pinconf { + pins = "gpio112"; + drive-strength = <6>; + bias-pull-up; + }; }; }; bma2x2_int2_pin { - qcom,pins = <&gp 114>; - qcom,num-grp-pins = <1>; - label = "bma2x2_int2_pin"; bma2x2_int2_default: int2_default { - drive-strength = <6>; - bias-pull-up; + pinmux { + function = "gpio"; + pins = "gpio114"; + }; + pinconf { + pins = "gpio114"; + drive-strength = <6>; + bias-pull-up; + }; }; }; }; @@ -171,10 +148,10 @@ avago,ps-hysteresis-threshold = <500>; avago,ps-pulse = <8>; avago,ps-pgain = <0>; - avago,als-B = <223>; - avago,als-C = <70>; - avago,als-D = <142>; - avago,ga-value = <48>; + avago,als-B = <186>; + avago,als-C = <75>; + avago,als-D = <129>; + avago,ga-value = <768>; }; bosch@18 { /* Accelerometer sensor */ @@ -217,9 +194,17 @@ }; }; -&sdhc_2 { - qcom,nonremovable; +&sdc2_cd_on { + /delete-property/ bias-pull-up; + bias-pull-down; +}; + +&sdc2_cd_off { + /delete-property/ bias-disable; + bias-pull-down; +}; +&sdhc_2 { interrupts = <0 1>; interrupt-map = <0 &intc 0 125 0 1 &intc 0 221 0>; diff --git a/arch/arm64/boot/dts/qcom/msm8916-qrd-skuic.dtsi b/arch/arm64/boot/dts/qcom/msm8916-qrd-skuic.dtsi index 1af56ed5a60b..b96f3cdcb0a2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-qrd-skuic.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-qrd-skuic.dtsi @@ -11,9 +11,91 @@ */ #include "msm8916-qrd-skui.dtsi" +#include "dsi-panel-hx8379a-fwvga-video.dtsi" / { model = "Qualcomm Technologies, Inc. MSM 8916 QRD SKUIC"; compatible = "qcom,msm8916-qrd-skuic", "qcom,msm8916-qrd", "qcom,msm8916", "qcom,qrd"; }; + +&soc { + i2c@78b9000 { /* BLSP1 QUP5 */ + mstar@26 { + compatible = "mstar,msg21xx"; + reg = <0x26>; + interrupt-parent = <&msm_gpio>; + interrupts = <13 0x2008>; + mstar,irq-gpio = <&msm_gpio 13 0x00000001>; + mstar,reset-gpio = <&msm_gpio 12 0x0>; + vdd-supply = <&pm8916_l17>; + vcc_i2c-supply = <&pm8916_l6>; + mstar,display-coords = <0 0 480 854>; + pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release"; + pinctrl-0 = <&ts_int_active &ts_reset_active>; + pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; + pinctrl-2 = <&ts_release>; + mstar,button-map = <172 139 158>; + mstar,ic-type = <2>; + mstar,num-max-touches = <2>; + mstar,hard-reset-delay-ms = <100>; + mstar,post-hard-reset-delay-ms = <100>; + }; + }; +}; + +&mdss_dsi0 { + qcom,dsi-pref-prim-pan = <&dsi_hx8379a_fwvga_video>; + pinctrl-names = "mdss_default", "mdss_sleep"; + pinctrl-0 = <&mdss_dsi_active>; + pinctrl-1 = <&mdss_dsi_suspend>; + + qcom,platform-reset-gpio = <&msm_gpio 25 0>; +}; + +&dsi_hx8379a_fwvga_video { + qcom,cont-splash-enabled; +}; + +&pm8916_chg { + qcom,vddmax-mv = <4350>; + qcom,vddsafe-mv = <4380>; + qcom,vinmin-mv = <4470>; + qcom,batt-hot-percentage = <35>; + qcom,batt-cold-percentage = <70>; + qcom,tchg-mins = <360>; + qcom,disable-vbatdet-based-recharge; + status = "okay"; +}; + +/ { + qrd_batterydata: qcom,battery-data { + qcom,rpull-up-kohm = <100>; + qcom,vref-batt-therm = <1800000>; + + #include "batterydata-qrd-skuic-4v35-1850mah.dtsi" + }; +}; + +&pm8916_bms { + status = "okay"; + qcom,force-bms-active-on-charger; + qcom,battery-data = <&qrd_batterydata>; +}; + +&i2c_0 { /* BLSP1 QUP2 */ + bosch@18 { /* Accelerometer sensor */ + compatible = "bosch,bma2x2"; + reg = <0x18>; + pinctrl-names = "default"; + pinctrl-0 = <&bma2x2_int1_default &bma2x2_int2_default>; + interrupt-parent = <&msm_gpio>; + interrupts = <112 0x2002>; + vdd-supply = <&pm8916_l17>; + vio-supply = <&pm8916_l6>; + bosch,init-interval = <200>; + bosch,place = <4>; + bosch,gpio-int1 = <&msm_gpio 112 0x2002>; + bosch,gpio-int2 = <&msm_gpio 114 0x2002>; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8916-qrd.dtsi b/arch/arm64/boot/dts/qcom/msm8916-qrd.dtsi index acbbc745e3eb..500b8391d1a5 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-qrd.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-qrd.dtsi @@ -20,45 +20,6 @@ }; &soc { - i2c@78b9000 { /* BLSP1 QUP5 */ - synaptics@70 { - compatible = "synaptics,rmi4"; - reg = <0x70>; - interrupt-parent = <&msm_gpio>; - interrupts = <13 0x2008>; - vdd-supply = <&vdd_vreg>; - vcc_i2c-supply = <&pm8916_l16>; - /* pins used by touchscreen */ - pinctrl-names = "pmx_ts_active","pmx_ts_suspend"; - pinctrl-0 = <&ts_int_active &ts_reset_active>; - pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; - synaptics,display-coords = <0 0 1100 1756>; - synaptics,panel-coords = <0 0 1100 1899>; - synaptics,irq-gpio = <&msm_gpio 13 0x2008>; - synaptics,reset-gpio = <&msm_gpio 12 0x0>; - synaptics,i2c-pull-up; - synaptics,power-down; - synaptics,disable-gpios; - synaptics,fw-image-name = "PR1601177-s3207_8916_qrd_00430000.img"; - }; - }; - - vdd_vreg: vdd_vreg { - compatible = "regulator-fixed"; - status = "ok"; - regulator-name = "vdd_vreg"; - }; - - gen-vkeys { - compatible = "qcom,gen-vkeys"; - label = "synaptics_rmi4_i2c"; - qcom,disp-maxx = <720>; - qcom,disp-maxy = <1280>; - qcom,panel-maxx = <720>; - qcom,panel-maxy = <1369>; - qcom,key-codes = <158 172 139>; - }; - i2c@78ba000 { /* BLSP1 QUP6 */ nfc-nci@e { compatible = "qcom,nfc-nci"; @@ -94,7 +55,7 @@ &mdss_dsi0 { qcom,regulator-ldo-mode; - qcom,platform-regulator-settings = [02 09 03 00 20 00 01]; + qcom,platform-regulator-settings = [00 01 01 00 20 07 00]; }; &soc { diff --git a/arch/arm64/boot/dts/qcom/msm8916-regulator.dtsi b/arch/arm64/boot/dts/qcom/msm8916-regulator.dtsi index 88453bb305a0..464425fc7fac 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-regulator.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-regulator.dtsi @@ -48,7 +48,7 @@ regulator-name = "apc_corner"; qcom,cpr-fuse-corners = <3>; regulator-min-microvolt = <1>; - regulator-max-microvolt = <7>; + regulator-max-microvolt = <8>; qcom,cpr-voltage-ceiling = <1050000 1150000 1350000>; qcom,cpr-voltage-floor = <1050000 1050000 1162500>; @@ -85,7 +85,7 @@ <27 0 6 0>; qcom,cpr-init-voltage-ref = <1050000 1150000 1350000>; qcom,cpr-init-voltage-step = <10000>; - qcom,cpr-corner-map = <1 1 2 2 3 3 3>; + qcom,cpr-corner-map = <1 1 2 2 3 3 3 3>; qcom,cpr-corner-frequency-map = <1 200000000>, <2 400000000>, @@ -93,10 +93,12 @@ <4 800000000>, <5 998400000>, <6 1094400000>, - <7 1190400000>; - qcom,speed-bin-fuse-sel = <1 34 3 0>; + <7 1152000000>, + <8 1209600000>; + qcom,speed-bin-fuse-sel = <0 55 2 0>; qcom,cpr-speed-bin-max-corners = - <0 0 2 4 7>; + <0 0 2 4 8>, + <1 0 2 4 7>; qcom,cpr-quot-adjust-scaling-factor-max = <650>; qcom,cpr-enable; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-sim.dts b/arch/arm64/boot/dts/qcom/msm8916-sim.dts index 19e4a736ffba..3480caf895ab 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-sim.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-sim.dts @@ -107,9 +107,30 @@ status = "ok"; }; -&pmx_mdss { - qcom,num-grp-pins = <3>; - qcom,pins = <&gp 24>, <&gp 25>, <&gp 98>; +&mdss_dsi_active { + pinmux { + function = "gpio"; + pins = "gpio24", "gpio25", "gpio98"; + }; + pinconf { + pins = "gpio24", "gpio25", "gpio98"; + drive-strength = <8>; + bias-disable = <0>; + output-high; + }; +}; + +&mdss_dsi_suspend { + pinmux { + function = "gpio"; + pins = "gpio24", "gpio25", "gpio98"; + }; + pinconf { + pins = "gpio24", "gpio25", "gpio98"; + drive-strength = <2>; + bias-pull-down; + output-low; + }; }; &mdss_dsi0 { diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index ca18eddefe27..f526271f7d12 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -22,6 +22,11 @@ <250 0>; interrupt-parent = <&intc>; + + chosen { + bootargs = "sched_enable_hmp=1"; + }; + aliases { sdhc1 = &sdhc_1; /* SDC1 eMMC slot */ sdhc2 = &sdhc_2; /* SDC2 SD card slot */ @@ -52,7 +57,7 @@ CPU0: cpu@0 { device_type = "cpu"; - compatible = "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0>; enable-method = "qcom,arm-cortex-acc"; qcom,acc = <&acc0>; @@ -66,7 +71,7 @@ CPU1: cpu@1 { device_type = "cpu"; - compatible = "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x1>; enable-method = "qcom,arm-cortex-acc"; qcom,acc = <&acc1>; @@ -75,7 +80,7 @@ CPU2: cpu@2 { device_type = "cpu"; - compatible = "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x2>; enable-method = "qcom,arm-cortex-acc"; qcom,acc = <&acc2>; @@ -84,7 +89,7 @@ CPU3: cpu@3 { device_type = "cpu"; - compatible = "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x3>; enable-method = "qcom,arm-cortex-acc"; qcom,acc = <&acc3>; @@ -97,7 +102,6 @@ #include "msm8916-coresight.dtsi" #include "msm8916-smp2p.dtsi" -#include "msm8916-pinctrl.dtsi" #include "msm8916-camera.dtsi" #include "msm8916-ipcrouter.dtsi" #include "msm-gdsc-8916.dtsi" @@ -152,6 +156,16 @@ <0x0b002000 0x1000>; }; + msm_gpio: pinctrl@1000000 { + compatible = "qcom,msm8916-pinctrl"; + reg = <0x1000000 0x300000>; + interrupts = <0 208 0>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; + wcd9xxx_intc: wcd9xxx_irq { compatible = "qcom,wcd9xxx-irq"; interrupt-controller; @@ -286,6 +300,7 @@ <0x5c000 0x1000>; reg-names = "tsens_physical", "tsens_eeprom_physical"; interrupts = <0 184 0>; + interrupt-names = "tsens-upper-lower"; qcom,sensors = <5>; qcom,slope = <3200 3200 3200 3200 3200>; qcom,sensor-id = <0 1 2 4 5>; @@ -293,8 +308,9 @@ qcom,clock-a7@0b011050 { compatible = "qcom,clock-a53-8916"; - reg = <0x0b011050 0x8>; - reg-names = "rcg-base"; + reg = <0x0b011050 0x8>, + <0x0005c004 0x8>; + reg-names = "rcg-base", "efuse1"; qcom,safe-freq = < 400000000 >; cpu-vdd-supply = <&apc_vreg_corner>; clocks = <&clock_gcc clk_gpll0_ao_clk_src>, @@ -308,7 +324,18 @@ < 800000000 4>, < 998400000 5>, < 1094400000 6>, - < 1190400000 7>; + < 1152000000 7>, + < 1209600000 8>; + + qcom,speed1-bin-v0 = + < 0 0>, + < 200000000 1>, + < 400000000 2>, + < 533333000 3>, + < 800000000 4>, + < 998400000 5>, + < 1094400000 6>, + < 1152000000 7>; }; cpubw: qcom,cpubw { @@ -317,12 +344,17 @@ qcom,src-dst-ports = <1 512>; qcom,active-only; qcom,bw-tbl = - /* 73 9.60 MHz */ - /* 381 50MHz */ < 762 /* 100 MHz */>, < 1525 /* 200 MHz */>, < 3051 /* 400 MHz */>, < 4066 /* 533 MHz */>; + qcom,ab-percent = < 30 >; + }; + + qcom,armbw-pm { + compatible = "qcom,armbw-pm"; + interrupts = <1 7 0xF1>; + qcom,bytes-per-beat = <16>; }; devfreq-cpufreq { @@ -330,9 +362,9 @@ target-dev = <&cpubw>; cpu-to-dev-map = < 400000 762>, - < 998400 1525>, + < 800000 1525>, < 1094400 3051>, - < 1190400 4066>; + < 1152000 4066>; }; }; @@ -346,7 +378,8 @@ < 800000 >, < 998400 >, < 1094400 >, - < 1190400 >; + < 1152000 >, + < 1209600 >; }; qcom,sps { @@ -435,6 +468,7 @@ compatible = "qcom,hsusb-otg"; reg = <0x78d9000 0x400>; + reg-names = "core"; interrupts = <0 134 0>,<0 140 0>; interrupt-names = "core_irq", "async_irq"; @@ -449,26 +483,34 @@ qcom,hsusb-otg-mode = <1>; qcom,hsusb-otg-otg-control = <2>; qcom,dp-manual-pullup; + qcom,hsusb-otg-mpm-dpsehv-int = <49>; + qcom,hsusb-otg-mpm-dmsehv-int = <58>; qcom,msm-bus,name = "usb2"; qcom,msm-bus,num-cases = <3>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = <87 512 0 0>, - <87 512 60000 960000>, + <87 512 80000 0>, <87 512 6000 6000>; clocks = <&clock_gcc clk_gcc_usb_hs_ahb_clk>, <&clock_gcc clk_gcc_usb_hs_system_clk>, <&clock_gcc clk_gcc_usb2a_phy_sleep_clk>, + <&clock_rpm clk_bimc_usb_a_clk>, + <&clock_rpm clk_snoc_usb_a_clk>, + <&clock_rpm clk_pcnoc_usb_a_clk>, <&clock_rpm clk_xo_otg_clk>; clock-names = "iface_clk", "core_clk", "sleep_clk", + "bimc_clk", "snoc_clk", "pcnoc_clk", "xo"; + qcom,bus-clk-rate = <400000000 200000000 100000000>; }; android_usb: android_usb@086000c8 { compatible = "qcom,android-usb"; reg = <0x086000c8 0xc8>; qcom,pm-qos-latency = <2 1001 12701>; + qcom,streaming-func = "mtp"; qcom,android-usb-uicc-nluns = /bits/ 8 <1>; }; @@ -508,6 +550,8 @@ clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; clock-names = "core_clk", "core_a_clk"; + + qcom,coresight-jtagmm-cpu = <&CPU0>; }; jtag_mm1: jtagmm@85d000 { @@ -519,6 +563,8 @@ clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; clock-names = "core_clk", "core_a_clk"; + + qcom,coresight-jtagmm-cpu = <&CPU1>; }; jtag_mm2: jtagmm@85e000 { @@ -530,6 +576,8 @@ clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; clock-names = "core_clk", "core_a_clk"; + + qcom,coresight-jtagmm-cpu = <&CPU2>; }; jtag_mm3: jtagmm@85f000 { @@ -541,6 +589,8 @@ clocks = <&clock_rpm clk_qdss_clk>, <&clock_rpm clk_qdss_a_clk>; clock-names = "core_clk", "core_a_clk"; + + qcom,coresight-jtagmm-cpu = <&CPU3>; }; sdhc_1: sdhci@07824000 { @@ -645,8 +695,10 @@ "iface_clk", "bus_clk"; qcom,use-sw-aes-cbc-ecb-ctr-algo; qcom,use-sw-aes-xts-algo; + qcom,use-sw-aes-ccm-algo; qcom,use-sw-ahash-algo; status = "disabled"; + qcom,ce-opp-freq = <100000000>; }; qcom_cedev: qcedev@720000 { @@ -672,6 +724,7 @@ clock-names = "core_clk_src", "core_clk", "iface_clk", "bus_clk"; status = "disabled"; + qcom,ce-opp-freq = <100000000>; }; qcom_seecom: qseecom@86000000 { @@ -685,6 +738,7 @@ qcom,msm-bus,num-cases = <4>; qcom,msm-bus,num-paths = <1>; qcom,support-bus-scaling; + qcom,support-fde; qcom,msm-bus,vectors-KBps = <55 512 0 0>, <55 512 0 0>, @@ -697,6 +751,7 @@ clock-names = "core_clk_src", "core_clk", "iface_clk", "bus_clk"; status = "disabled"; + qcom,ce-opp-freq = <100000000>; }; qcom,wdt@b017000 { @@ -1302,7 +1357,7 @@ interrupt-names = "spi_irq", "spi_bam_irq"; interrupts = <0 97 0>, <0 238 0>; spi-max-frequency = <50000000>; - pinctrl-names = "default", "sleep"; + pinctrl-names = "spi_default", "spi_sleep"; pinctrl-0 = <&spi0_default &spi0_cs0_active>; pinctrl-1 = <&spi0_sleep &spi0_cs0_sleep>; clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>, @@ -1324,6 +1379,7 @@ spi-cpha = <1>; core-vcc-supply = <&pm8916_l2>; spi-vcc-supply = <&pm8916_l5>; + qcom,pm-qos-latency = <2>; lattice,reset-gpio = <&msm_gpio 3 0>; lattice,config-done-gpio = <&msm_gpio 1 0>; lattice,vcc-en-gpio = <&msm_gpio 114 0>; @@ -1522,14 +1578,15 @@ qcom,core-limit-temp = <80>; qcom,core-temp-hysteresis = <10>; qcom,core-control-mask = <0xe>; - qcom,hotplug-temp = <110>; - qcom,hotplug-temp-hysteresis = <20>; + qcom,hotplug-temp = <82>; + qcom,hotplug-temp-hysteresis = <15>; qcom,cpu-sensors = "tsens_tz_sensor5", "tsens_tz_sensor5", "tsens_tz_sensor4", "tsens_tz_sensor4"; - qcom,freq-mitigation-temp = <110>; - qcom,freq-mitigation-temp-hysteresis = <20>; - qcom,freq-mitigation-value = <960000>; + qcom,freq-mitigation-temp = <82>; + qcom,freq-mitigation-temp-hysteresis = <10>; + qcom,freq-mitigation-value = <400000>; qcom,freq-mitigation-control-mask = <0x01>; + qcom,online-hotplug-core; qcom,vdd-restriction-temp = <5>; qcom,vdd-restriction-temp-hysteresis = <10>; vdd-dig-supply = <&pm8916_s1_floor_corner>; @@ -1547,15 +1604,11 @@ }; }; - qcom,bcl { - compatible = "qcom,bcl"; - }; - qcom,memshare { compatible = "qcom,memshare"; qcom,client_1 { - compatible = "memshare,peripheral"; + compatible = "qcom,memshare-peripheral"; qcom,peripheral-size = <2097152>; label = "modem"; }; @@ -1591,12 +1644,14 @@ qcom,firmware-name = "modem"; qcom,pil-self-auth; qcom,sysmon-id = <0>; + qcom,ssctl-instance-id = <0x12>; /* GPIO inputs from mss */ qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_1_in 0 0>; qcom,gpio-err-ready = <&smp2pgpio_ssr_smp2p_1_in 1 0>; qcom,gpio-proxy-unvote = <&smp2pgpio_ssr_smp2p_1_in 2 0>; qcom,gpio-stop-ack = <&smp2pgpio_ssr_smp2p_1_in 3 0>; + qcom,gpio-ramdump-disable = <&smp2pgpio_ssr_smp2p_1_in 15 0>; /* GPIO output to mss */ qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>; @@ -1612,19 +1667,24 @@ <&clock_gcc clk_gcc_venus0_ahb_clk>, <&clock_gcc clk_gcc_venus0_axi_clk>; clock-names = "core_clk", "iface_clk", "bus_clk"; - qcom,clock-names = "core_clk", "iface_clk", "bus_clk"; qcom,clock-configs = <0x1 0x0 0x0>; qcom,sw-power-collapse; qcom,load-freq-tbl = <352800 228570000 0xffffffff>, + <352800 228570000 0x55555555>, <244800 160000000 0xffffffff>, - <108000 100000000 0xffffffff>; + <244800 160000000 0x55555555>, + <108000 100000000 0xffffffff>, + <108000 100000000 0x55555555>; qcom,hfi = "venus"; qcom,reg-presets = <0xE0020 0x05555556>, <0xE0024 0x05555556>, <0x80124 0x00000003>; - qcom,buffer-type-tz-usage-table = <0x241 0x1>, - <0x106 0x2>, - <0x480 0x3>; + qcom,qdss-presets = <0x826000 0x1000>, + <0x827000 0x1000>, + <0x822000 0x1000>, + <0x803000 0x1000>, + <0x9180000 0x1000>, + <0x9181000 0x1000>; qcom,max-hw-load = <352800>; /* 720p @ 30 + 1080p @ 30 */ qcom,enable-idle-indicator; qcom,vidc-iommu-domains { @@ -1649,25 +1709,29 @@ qcom,msm-bus-clients { qcom,msm-bus-client@0 { qcom,msm-bus,name = "venc-ddr"; - qcom,msm-bus,num-cases = <4>; + qcom,msm-bus,num-cases = <6>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = <63 512 0 0>, - <63 512 133600 674400>, - <63 512 400900 1079000>, - <63 512 908600 1537600>; + <63 512 133600 674400>, /* VGA 30 fps */ + <63 512 400900 1079000>, /* VGA 60 fps */ + <63 512 400900 1079000>, /* 720p 30 fps */ + <63 512 908600 1537600>, /* 720p 60 fps */ + <63 512 908600 1537600>; /* 1080p 30 fps */ qcom,bus-configs = <0x01000414>; }; qcom,msm-bus-client@1 { qcom,msm-bus,name = "vdec-ddr"; - qcom,msm-bus,num-cases = <4>; + qcom,msm-bus,num-cases = <6>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = <63 512 0 0>, - <63 512 99600 831900>, - <63 512 298900 831900>, - <63 512 677600 1331000>; + <63 512 99600 831900>, /* VGA 30 fps */ + <63 512 298900 831900>, /* VGA 60 fps */ + <63 512 298900 831900>, /* 720p 30 fps */ + <63 512 677600 1331000>, /* 720p 60 fps */ + <63 512 677600 1331000>; /* 1080p 30 fps */ qcom,bus-configs = <0x030fcfff>; }; }; @@ -1697,6 +1761,7 @@ qcom,proxy-timeout-ms = <10000>; qcom,smem-id = <422>; qcom,sysmon-id = <6>; + qcom,ssctl-instance-id = <0x13>; qcom,firmware-name = "wcnss"; /* GPIO inputs from wcnss */ @@ -1748,12 +1813,13 @@ }; &gdsc_oxili_gx { - clock-names = "core_clk"; + clock-names = "core_root_clk"; clocks = <&clock_gcc clk_gfx3d_clk_src>; qcom,enable-root-clk; status = "okay"; }; +#include "msm8916-pinctrl.dtsi" #include "msm-pm8916-rpm-regulator.dtsi" #include "msm-pm8916.dtsi" #include "msm8916-regulator.dtsi" @@ -1833,7 +1899,7 @@ qcom,pre-div-channel-scaling = <0>; qcom,calibration-type = "ratiometric"; qcom,scale-function = <1>; - qcom,hw-settle-time = <2>; + qcom,hw-settle-time = <0xb>; qcom,fast-avg-setup = <0>; }; @@ -1844,7 +1910,7 @@ qcom,pre-div-channel-scaling = <0>; qcom,calibration-type = "ratiometric"; qcom,scale-function = <0>; - qcom,hw-settle-time = <2>; + qcom,hw-settle-time = <0xb>; qcom,fast-avg-setup = <0>; }; @@ -1891,8 +1957,8 @@ qcom,pre-div-channel-scaling = <0>; qcom,calibration-type = "ratiometric"; qcom,scale-function = <1>; - qcom,hw-settle-time = <2>; - qcom,fast-avg-setup = <3>; + qcom,hw-settle-time = <0xb>; + qcom,fast-avg-setup = <2>; qcom,btm-channel-number = <0x48>; }; @@ -1903,8 +1969,8 @@ qcom,pre-div-channel-scaling = <1>; qcom,calibration-type = "absolute"; qcom,scale-function = <0>; - qcom,hw-settle-time = <0>; - qcom,fast-avg-setup = <3>; + qcom,hw-settle-time = <0xb>; + qcom,fast-avg-setup = <2>; qcom,btm-channel-number = <0x68>; }; }; |