diff --git a/arch/arm64/boot/dts/qcom/batterydata-d5-atl-3400mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-d5-atl-3400mAh.dtsi index e8126e43d8db..bb4f0fccef6a 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-d5-atl-3400mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-d5-atl-3400mAh.dtsi @@ -2,85 +2,80 @@ qcom,d5_atl_3400mah { /* #2957455_Xiaomi_D5scud_3400mAh_averaged_MasterSlave_Jun6th2017*/ qcom,max-voltage-uv = <4400000>; - qcom,fastchg-current-ma = <3300>; + qcom,fastchg-current-ma = <3300>; qcom,nom-batt-capacity-mah = <3400>; qcom,fg-cc-cv-threshold-mv = <4390>; qcom,batt-id-kohm = <68>; qcom,battery-beta = <3380>; qcom,battery-type = "d5_atl"; - qcom,jeita-fcc-ranges = <0 50 330000 - 51 100 990000 - 101 150 990000 - 151 450 3300000 - 451 600 1650000>; - qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; + qcom,jeita-fcc-ranges = <0 50 330000 + 51 100 990000 + 101 150 990000 + 151 450 3300000 + 451 600 1650000>; + qcom,jeita-fv-ranges = <0 50 4400000 + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0x8E3D>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - 0A 1F 3A 06 - 00 0A C7 06 - D4 1C 0C 02 - 98 0D C7 0A - 95 17 D6 23 - 7F 44 31 5A - 6F 00 00 00 - 11 00 00 00 - 00 00 D8 BB - 61 CD DF A2 - 26 00 08 00 - AB EA 51 EC - D1 FC BB F3 - 58 0C F3 FA - 62 06 BB 32 - 1F 06 09 20 - 27 00 14 00 - 18 20 25 05 - D4 0A F4 05 - C8 1C ED 02 - 1A 0C 19 12 - 91 18 AC 23 - 20 44 D6 5A - 6E 00 00 00 - 0E 00 00 00 - 00 00 86 D5 - 3E CA 24 CA - 1E 00 00 00 - 5B F2 51 EC - 7B F4 22 EB - 7A 07 87 FB - 69 BA BC 1B - AB 33 CC FF - 07 10 00 00 - 3E 0D 66 46 - 1E 00 40 00 - 66 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + 0A 1F 3A 06 + 00 0A C7 06 + D4 1C 0C 02 + 98 0D C7 0A + 95 17 D6 23 + 7F 44 31 5A + 6F 00 00 00 + 11 00 00 00 + 00 00 D8 BB + 61 CD DF A2 + 26 00 08 00 + AB EA 51 EC + D1 FC BB F3 + 58 0C F3 FA + 62 06 BB 32 + 1F 06 09 20 + 27 00 14 00 + 18 20 25 05 + D4 0A F4 05 + C8 1C ED 02 + 1A 0C 19 12 + 91 18 AC 23 + 20 44 D6 5A + 6E 00 00 00 + 0E 00 00 00 + 00 00 86 D5 + 3E CA 24 CA + 1E 00 00 00 + 5B F2 51 EC + 7B F4 22 EB + 7A 07 87 FB + 69 BA BC 1B + AB 33 CC FF + 07 10 00 00 + 3E 0D 66 46 + 1E 00 40 00 + 66 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-d5-cos-3400mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-d5-cos-3400mAh.dtsi index 21f3690da1f6..7a449f0fece9 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-d5-cos-3400mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-d5-cos-3400mAh.dtsi @@ -1,85 +1,81 @@ qcom,d5_cos_3400mah { + /* #2957479_Xiaomi_D5cos_3400mAh_averaged_MasterSlave_Jun6th2017*/ qcom,max-voltage-uv = <4400000>; - qcom,fastchg-current-ma = <3300>; + qcom,fastchg-current-ma = <3300>; qcom,nom-batt-capacity-mah = <3400>; qcom,fg-cc-cv-threshold-mv = <4390>; qcom,batt-id-kohm = <100>; qcom,battery-beta = <3380>; qcom,battery-type = "d5_cos"; - qcom,jeita-fcc-ranges = <0 50 330000 - 51 100 990000 + qcom,jeita-fcc-ranges = <0 50 330000 + 51 100 990000 101 150 990000 - 151 450 3300000 - 451 600 1650000>; - qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 + 151 450 3300000 + 451 600 1650000>; + qcom,jeita-fv-ranges = <0 50 4400000 + 51 100 4400000 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0x1313>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - A1 20 86 04 - 28 0B C6 05 - 01 1D 7B 01 - 47 05 43 03 - A3 17 C6 23 - A1 44 0E 5A - 8C 00 00 00 - 11 00 00 00 - 00 00 FB BC - CA CD D1 BA - 26 00 08 00 - A2 DB AA E4 - 43 FC 28 01 - 61 0C 6C 01 - 5C 06 41 32 - 21 06 09 20 - 27 00 14 00 - 96 20 97 04 - 34 0B A3 05 - D8 1C AD 02 - 9A 0C 98 0B - 90 18 B6 23 - 11 44 E1 5A - 76 00 00 00 - 0E 00 00 00 - 00 00 AE D5 - 2A CA 82 C3 - 1E 00 00 00 - 6E EA AA E4 - 8F FD B2 00 - 44 ED 03 03 - BD 03 48 22 - C3 33 CC FF - 07 10 00 00 - 33 0D 66 46 - 1E 00 40 00 - 60 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + A1 20 86 04 + 28 0B C6 05 + 01 1D 7B 01 + 47 05 43 03 + A3 17 C6 23 + A1 44 0E 5A + 8C 00 00 00 + 11 00 00 00 + 00 00 FB BC + CA CD D1 BA + 26 00 08 00 + A2 DB AA E4 + 43 FC 28 01 + 61 0C 6C 01 + 5C 06 41 32 + 21 06 09 20 + 27 00 14 00 + 96 20 97 04 + 34 0B A3 05 + D8 1C AD 02 + 9A 0C 98 0B + 90 18 B6 23 + 11 44 E1 5A + 76 00 00 00 + 0E 00 00 00 + 00 00 AE D5 + 2A CA 82 C3 + 1E 00 00 00 + 6E EA AA E4 + 8F FD B2 00 + 44 ED 03 03 + BD 03 48 22 + C3 33 CC FF + 07 10 00 00 + 33 0D 66 46 + 1E 00 40 00 + 60 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3070mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3070mAh.dtsi index 13010ac50081..bf4bab293eae 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3070mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3070mAh.dtsi @@ -1,78 +1,79 @@ qcom,e1_scud_3070mAh { + /* #3151767_Xiaomi_E1scud_3170mAh_averaged_MasterSlave_Oct18th2017*/ qcom,max-voltage-uv = <4400000>; - qcom,fastchg-current-ma = <3300>; + qcom,fastchg-current-ma = <3300>; qcom,nom-batt-capacity-mah = <3400>; qcom,fg-cc-cv-threshold-mv = <4390>; qcom,batt-id-kohm = <68>; qcom,battery-beta = <3380>; qcom,battery-type = "e1_scud"; - qcom,jeita-fcc-ranges = <0 50 330000 - 51 150 990000 - 151 450 3300000 - 451 600 1650000>; - qcom,jeita-fv-ranges = <0 50 4400000 - 51 150 4400000 - 151 450 4400000 - 451 600 4100000>; + qcom,jeita-fcc-ranges = <0 50 330000 + 51 150 990000 + 151 450 3300000 + 451 600 1650000>; + qcom,jeita-fv-ranges = <0 50 4400000 + 51 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0x6E77>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - 86 1F 90 05 - 94 0A 27 06 - 71 1D AD F5 - 1C 12 6A 14 - 8E 19 EC 1B - 5D 3D 62 4A - 52 00 00 00 - 16 00 00 00 - 00 00 4A BD - EA CD 2E C2 - 23 00 08 00 - E5 E2 F2 EC - E7 06 3E F2 - 8D 01 C3 12 - 6A 00 17 32 - 1E 06 09 20 - 27 00 14 00 - FE 1F 3D 05 - C4 0A 04 06 - 39 1D 33 FA - C9 F3 DA 0D - 34 19 CD 22 - 96 45 D1 52 - 59 00 00 00 - 0D 00 00 00 - 00 00 BD CC - 00 9C 9D C3 - 1D 00 00 00 - 56 F2 F2 EC - 58 07 BC E3 - 0F EC 33 02 - F9 EA D3 1A - AD 33 CC FF - 07 10 00 00 - 2F 0C 66 46 - 1D 00 40 00 - 5D 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + 86 1F 90 05 + 94 0A 27 06 + 71 1D AD F5 + 1C 12 6A 14 + 8E 19 EC 1B + 5D 3D 62 4A + 52 00 00 00 + 16 00 00 00 + 00 00 4A BD + EA CD 2E C2 + 23 00 08 00 + E5 E2 F2 EC + E7 06 3E F2 + 8D 01 C3 12 + 6A 00 17 32 + 1E 06 09 20 + 27 00 14 00 + FE 1F 3D 05 + C4 0A 04 06 + 39 1D 33 FA + C9 F3 DA 0D + 34 19 CD 22 + 96 45 D1 52 + 59 00 00 00 + 0D 00 00 00 + 00 00 BD CC + 00 9C 9D C3 + 1D 00 00 00 + 56 F2 F2 EC + 58 07 BC E3 + 0F EC 33 02 + F9 EA D3 1A + AD 33 CC FF + 07 10 00 00 + 2F 0C 66 46 + 1D 00 40 00 + 5D 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3400mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3400mAh.dtsi index c8e06b8fad6e..b382a6f387d6 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3400mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e1-atl-3400mAh.dtsi @@ -1,5 +1,6 @@ qcom,e1_atl_3400mAh { qcom, = <24>; + /* #3331499_Xiaomi_BM3Escud_3400mAh_averaged_MasterSlave_Feb20th2018*/ qcom,max-voltage-uv = <4400000>; qcom,nom-batt-capacity-mah = <3400>; qcom,batt-id-kohm = <68>; @@ -8,24 +9,19 @@ qcom,e1_atl_3400mAh { qcom,battery-type = "e1_atl_3400mAh"; qcom,fastchg-current-ma = <3300>; qcom,jeita-fcc-ranges = <0 50 330000 - 51 100 990000 - 101 150 1650000 - 151 450 3300000 - 451 600 1650000>; + 51 100 990000 + 101 150 1650000 + 151 450 3300000 + 451 600 1650000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0xC3C7>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - F0 1E 58 06 + F0 1E 58 06 CB 03 B7 FD D9 1C 03 02 9C 0D C5 0A diff --git a/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3070mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3070mAh.dtsi index 3f04921a6e21..f598d3d46292 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3070mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3070mAh.dtsi @@ -1,78 +1,79 @@ qcom,e1_coslight_3070mAh { + /* #3124728_Xiaomi_E1cos_3170mAh_averaged_MasterSlave_Sept25th2017*/ qcom,max-voltage-uv = <4400000>; - qcom,fastchg-current-ma = <3300>; + qcom,fastchg-current-ma = <3300>; qcom,nom-batt-capacity-mah = <3400>; qcom,fg-cc-cv-threshold-mv = <4390>; qcom,batt-id-kohm = <100>; qcom,battery-beta = <3380>; qcom,battery-type = "e1_coslight"; - qcom,jeita-fcc-ranges = <0 50 330000 - 51 150 990000 - 151 450 3300000 - 451 600 1650000>; - qcom,jeita-fv-ranges = <0 50 4400000 - 51 150 4400000 - 151 450 4400000 - 451 600 4100000>; + qcom,jeita-fcc-ranges = <0 50 330000 + 51 150 990000 + 151 450 3300000 + 451 600 1650000>; + qcom,jeita-fv-ranges = <0 50 4400000 + 51 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0xDF1B>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - 40 1F F1 05 - 35 0A 25 FD - 6C 1D 6D F5 - 39 12 2E 14 - 80 18 26 23 - 41 45 46 53 - 55 00 00 00 - 0E 00 00 00 - 00 00 8F C3 - 2D CC 00 AC - 35 00 08 00 - F1 DA B3 E4 - 29 05 A3 FB - 89 0D EF 03 - 52 E5 BD 23 - 39 06 09 20 - 27 00 14 00 - AA 1F C3 05 - 40 0A 33 FD - 57 1D 95 EB - 73 0A 34 15 - 18 19 F0 22 - 67 45 1E 53 - 55 00 00 00 - 0D 00 00 00 - 00 00 B0 CC - 27 C3 0F BC - 23 00 00 00 - 91 EA B3 E4 - D1 FC CF 00 - 55 F5 F3 01 - 63 02 E9 23 - CB 33 CC FF - 07 10 00 00 - 71 0C 66 46 - 23 00 40 00 - 5E 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + 40 1F F1 05 + 35 0A 25 FD + 6C 1D 6D F5 + 39 12 2E 14 + 80 18 26 23 + 41 45 46 53 + 55 00 00 00 + 0E 00 00 00 + 00 00 8F C3 + 2D CC 00 AC + 35 00 08 00 + F1 DA B3 E4 + 29 05 A3 FB + 89 0D EF 03 + 52 E5 BD 23 + 39 06 09 20 + 27 00 14 00 + AA 1F C3 05 + 40 0A 33 FD + 57 1D 95 EB + 73 0A 34 15 + 18 19 F0 22 + 67 45 1E 53 + 55 00 00 00 + 0D 00 00 00 + 00 00 B0 CC + 27 C3 0F BC + 23 00 00 00 + 91 EA B3 E4 + D1 FC CF 00 + 55 F5 F3 01 + 63 02 E9 23 + CB 33 CC FF + 07 10 00 00 + 71 0C 66 46 + 23 00 40 00 + 5E 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3400mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3400mAh.dtsi index b87378493572..8dc6d7da3408 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3400mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e1-coslight-3400mAh.dtsi @@ -1,5 +1,6 @@ qcom,e1_coslight_3400mAh { qcom, = <24>; + /* #3351164_Xiaomi_BM3Ecos_3400mAh_averaged_MasterSlave_Feb20th2018*/ qcom,max-voltage-uv = <4400000>; qcom,nom-batt-capacity-mah = <3400>; qcom,batt-id-kohm = <100>; @@ -8,24 +9,19 @@ qcom,e1_coslight_3400mAh { qcom,battery-type = "e1_coslight_3400mAh"; qcom,fastchg-current-ma = <3300>; qcom,jeita-fcc-ranges = <0 50 330000 - 51 100 990000 - 101 150 1650000 - 151 450 3300000 - 451 600 1650000>; + 51 100 990000 + 101 150 1650000 + 151 450 3300000 + 451 600 1650000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0xF35D>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - E4 1E CB FC + E4 1E CB FC AC 03 EF 06 D7 1C 10 02 79 0D EF 0A diff --git a/arch/arm64/boot/dts/qcom/batterydata-e10-atl-4000mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e10-atl-4000mAh.dtsi index 87acf4569cea..bfc1cadb850c 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e10-atl-4000mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e10-atl-4000mAh.dtsi @@ -1,5 +1,6 @@ qcom,e10_atl_4000mah { qcom, = <24>; + /* #3410356_Xiaomi_E10atl_4000mAh_averaged_MasterSlave_Apr10th2018*/ qcom,max-voltage-uv = <4400000>; qcom,fastchg-current-ma = <2800>; qcom,nom-batt-capacity-mah = <4000>; @@ -17,70 +18,65 @@ qcom,e10_atl_4000mah { 101 150 4400000 151 450 4400000 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; qcom,checksum = <0xA0E7>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - A1 1E 8B FD - 10 03 44 07 - D6 1C 18 02 - 6D 0D 05 0B - F1 17 CE 23 - 4F 44 74 5A - 67 00 00 00 - 10 00 00 00 - 00 00 27 B2 - 74 CD EC BA - 1C 00 08 00 - F4 E2 7F ED - 41 06 15 FA - 64 0D 31 0A - E2 EC 57 32 - 24 06 09 20 - 27 00 14 00 - 94 1F D2 05 - 42 0A 8B 06 - AE 1C 4F 03 - AB 15 8C 12 - 73 18 0E 2A - 95 4D F3 5B - 65 00 00 00 - 0D 00 00 00 - 00 00 EC D5 - 6C CA 47 8B - 15 00 00 00 - 8A EB 7F ED - FF FD CF EB - EF EC C0 02 - C7 F4 00 1B - A1 33 CC FF - 07 10 00 00 - 94 0F 66 46 - 15 00 40 00 - 91 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + A1 1E 8B FD + 10 03 44 07 + D6 1C 18 02 + 6D 0D 05 0B + F1 17 CE 23 + 4F 44 74 5A + 67 00 00 00 + 10 00 00 00 + 00 00 27 B2 + 74 CD EC BA + 1C 00 08 00 + F4 E2 7F ED + 41 06 15 FA + 64 0D 31 0A + E2 EC 57 32 + 24 06 09 20 + 27 00 14 00 + 94 1F D2 05 + 42 0A 8B 06 + AE 1C 4F 03 + AB 15 8C 12 + 73 18 0E 2A + 95 4D F3 5B + 65 00 00 00 + 0D 00 00 00 + 00 00 EC D5 + 6C CA 47 8B + 15 00 00 00 + 8A EB 7F ED + FF FD CF EB + EF EC C0 02 + C7 F4 00 1B + A1 33 CC FF + 07 10 00 00 + 94 0F 66 46 + 15 00 40 00 + 91 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e10-cos-4000mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e10-cos-4000mAh.dtsi index 3486d403fdb9..b900183d329e 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e10-cos-4000mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e10-cos-4000mAh.dtsi @@ -1,5 +1,6 @@ qcom,e10_cos_4000mah { qcom, = <24>; + /* #3434841_Xiaomi_E10cos_4000mAh_averaged_MasterSlave_Apr24th2018*/ qcom,max-voltage-uv = <4400000>; qcom,fastchg-current-ma = <2800>; qcom,nom-batt-capacity-mah = <4000>; @@ -8,79 +9,74 @@ qcom,e10_cos_4000mah { qcom,battery-beta = <3380>; qcom,battery-type = "e10_cos_4000mAh"; qcom,jeita-fcc-ranges = <0 50 390000 - 51 100 1170000 - 101 150 1170000 - 151 450 2800000 - 451 600 1950000>; + 51 100 1170000 + 101 150 1170000 + 151 450 2800000 + 451 600 1950000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0x0920>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - 3F 1F FC 05 - 29 0A A5 06 - E8 1C E4 01 - D0 0D 8D 0A - 98 17 0E 2A - 00 44 A9 5A - 73 00 00 00 - 10 00 00 00 - 00 00 AC C5 - 64 C4 96 C2 - 20 00 08 00 - 0C DB 6E E5 - 68 05 D2 01 - E2 14 F6 05 - 11 EC E7 23 - 31 06 09 20 - 27 00 14 00 - E0 1F 63 05 - A4 0A 24 06 - C1 1C 11 03 - E0 15 53 12 - 82 18 F8 23 - C0 4D 8B 5B - 69 00 00 00 - 0D 00 00 00 - 00 00 40 CC - 10 CA 78 BC - 17 00 00 00 - 9F E3 6E E5 - 6D 06 04 01 - D7 06 8F FB - EE F2 BC 1B - BA 33 CC FF - 07 10 00 00 - 9C 0F 66 46 - 17 00 40 00 - 6E 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + 3F 1F FC 05 + 29 0A A5 06 + E8 1C E4 01 + D0 0D 8D 0A + 98 17 0E 2A + 00 44 A9 5A + 73 00 00 00 + 10 00 00 00 + 00 00 AC C5 + 64 C4 96 C2 + 20 00 08 00 + 0C DB 6E E5 + 68 05 D2 01 + E2 14 F6 05 + 11 EC E7 23 + 31 06 09 20 + 27 00 14 00 + E0 1F 63 05 + A4 0A 24 06 + C1 1C 11 03 + E0 15 53 12 + 82 18 F8 23 + C0 4D 8B 5B + 69 00 00 00 + 0D 00 00 00 + 00 00 40 CC + 10 CA 78 BC + 17 00 00 00 + 9F E3 6E E5 + 6D 06 04 01 + D7 06 8F FB + EE F2 BC 1B + BA 33 CC FF + 07 10 00 00 + 9C 0F 66 46 + 17 00 40 00 + 6E 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e5-cos-3200mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e5-cos-3200mAh.dtsi index 3682066908fe..b177d21308fa 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e5-cos-3200mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e5-cos-3200mAh.dtsi @@ -1,5 +1,6 @@ qcom,e5_cos_3200mAh { qcom, = <24>; + /* #3543435_Xiaomi_E5cos_3200mAh_averaged_MasterSlave_Jul23rd2018*/ qcom,max-voltage-uv = <4400000>; qcom,fg-cc-cv-threshold-mv = <4390>; qcom,nom-batt-capacity-mah = <3200>; @@ -9,78 +10,73 @@ qcom,e5_cos_3200mAh { qcom,battery-type = "e5_cos_3200mAh"; qcom,fastchg-current-ma = <3100>; qcom,jeita-fcc-ranges = <0 50 310000 - 51 100 930000 - 101 150 2170000 - 151 450 3100000 - 451 600 1550000>; + 51 100 930000 + 101 150 2170000 + 151 450 3100000 + 451 600 1550000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0x6F2A>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - CB 1E 45 FD - 15 03 66 F5 - E4 1C E2 01 - D9 0D 7B 0A - 8F 17 FF 23 - 3A 44 6F 5A - 70 00 00 00 - 10 00 00 00 - 00 00 3D B5 - 4D CD 89 BB - 1D 00 08 00 - A6 DA C7 07 - 13 FC 58 01 - E7 F5 65 12 - 7D 06 D0 2A - 2E 06 09 20 - 27 00 14 00 - 5F 1F 43 FC - D8 03 ED FD - B4 1C 2C 03 - C8 15 6A 12 - 75 18 D7 23 - E8 4D 2D 5B - 65 00 00 00 - 0E 00 00 00 - 00 00 40 CC - 5F CA 78 BC - 17 00 00 00 - 5D 00 C7 07 - 7D FD C9 00 - 9A EC BD 02 - 17 02 76 23 - CB 33 CC FF - 07 10 00 00 - 76 0C 66 46 - 17 00 40 00 - 71 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + CB 1E 45 FD + 15 03 66 F5 + E4 1C E2 01 + D9 0D 7B 0A + 8F 17 FF 23 + 3A 44 6F 5A + 70 00 00 00 + 10 00 00 00 + 00 00 3D B5 + 4D CD 89 BB + 1D 00 08 00 + A6 DA C7 07 + 13 FC 58 01 + E7 F5 65 12 + 7D 06 D0 2A + 2E 06 09 20 + 27 00 14 00 + 5F 1F 43 FC + D8 03 ED FD + B4 1C 2C 03 + C8 15 6A 12 + 75 18 D7 23 + E8 4D 2D 5B + 65 00 00 00 + 0E 00 00 00 + 00 00 40 CC + 5F CA 78 BC + 17 00 00 00 + 5D 00 C7 07 + 7D FD C9 00 + 9A EC BD 02 + 17 02 76 23 + CB 33 CC FF + 07 10 00 00 + 76 0C 66 46 + 17 00 40 00 + 71 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e5-sun-3200mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e5-sun-3200mAh.dtsi index c3b5e4f81180..7c8db9118f34 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e5-sun-3200mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e5-sun-3200mAh.dtsi @@ -1,5 +1,6 @@ qcom,e5_sun_3200mAh { qcom, = <24>; + /* #3529269_Xiaomi_E5sun_3220mAh_averaged_MasterSlave_Jul18th2018*/ qcom,max-voltage-uv = <4400000>; qcom,fg-cc-cv-threshold-mv = <4390>; qcom,nom-batt-capacity-mah = <3200>; @@ -9,78 +10,73 @@ qcom,e5_sun_3200mAh { qcom,battery-type = "e5_sun_3200mAh"; qcom,fastchg-current-ma = <3100>; qcom,jeita-fcc-ranges = <0 50 310000 - 51 100 930000 - 101 150 2170000 - 151 450 3100000 - 451 600 1550000>; + 51 100 930000 + 101 150 2170000 + 151 450 3100000 + 451 600 1550000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0x2DDD>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - DB 1E 15 FD - 73 03 3B F4 - E7 1C A9 FB - 10 04 4C 0A - 5F 17 03 2A - 4F 44 50 5A - 72 00 00 00 - 11 00 00 00 - 00 00 E1 BC - 64 C4 89 C2 - 21 00 08 00 - F8 DA FE ED - DD FC CF F3 - 2B FA 5D 13 - 81 FD 6A 2A - 24 06 09 20 - 27 00 14 00 - 51 1F 53 FC - 06 0A 79 FD - CB 1C DF 02 - 2C 0C 1C 12 - 7F 18 82 23 - 8A 44 5E 5A - 67 00 00 00 - 0F 00 00 00 - 00 00 F9 07 - 96 C2 47 8B - 1B 00 00 00 - 69 00 FE ED - 03 F4 12 F2 - E1 06 09 FB - 25 00 FD 1A - AE 33 CC FF - 07 10 00 00 - 50 0C 66 46 - 1B 00 40 00 - 7D 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + DB 1E 15 FD + 73 03 3B F4 + E7 1C A9 FB + 10 04 4C 0A + 5F 17 03 2A + 4F 44 50 5A + 72 00 00 00 + 11 00 00 00 + 00 00 E1 BC + 64 C4 89 C2 + 21 00 08 00 + F8 DA FE ED + DD FC CF F3 + 2B FA 5D 13 + 81 FD 6A 2A + 24 06 09 20 + 27 00 14 00 + 51 1F 53 FC + 06 0A 79 FD + CB 1C DF 02 + 2C 0C 1C 12 + 7F 18 82 23 + 8A 44 5E 5A + 67 00 00 00 + 0F 00 00 00 + 00 00 F9 07 + 96 C2 47 8B + 1B 00 00 00 + 69 00 FE ED + 03 F4 12 F2 + E1 06 09 FB + 25 00 FD 1A + AE 33 CC FF + 07 10 00 00 + 50 0C 66 46 + 1B 00 40 00 + 7D 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e8-atl-3000mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e8-atl-3000mAh.dtsi index 0e76711884a7..f15075997a36 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e8-atl-3000mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e8-atl-3000mAh.dtsi @@ -1,6 +1,7 @@ qcom,e1_atl_3000mAh { qcom, = <24>; + /* #3378762_Xiaomi_E8atl_3000mAh_averaged_MasterSlave_Mar26th2018*/ qcom,max-voltage-uv = <4400000>; qcom,nom-batt-capacity-mah = <3000>; qcom,batt-id-kohm = <68>; @@ -9,78 +10,73 @@ qcom,e1_atl_3000mAh { qcom,battery-type = "e8_atl_3000mAh"; qcom,fastchg-current-ma = <2900>; qcom,jeita-fcc-ranges = <0 50 290000 - 51 100 870000 - 101 150 1450000 - 151 450 2900000 - 451 600 1450000>; + 51 100 870000 + 101 150 1450000 + 151 450 2900000 + 451 600 1450000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; - qcom,checksum = <0x572F>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; + qcom,checksum = <0x2D2B>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - 7F 1F D5 05 - 34 0A A9 06 - F5 1C A8 01 - B9 04 CD 03 - D6 17 B9 23 - 96 44 24 5A - 7F 00 00 00 - 11 00 00 00 - 00 00 EE C5 - 64 C4 6F BB - 25 00 08 00 - EA E2 A5 07 - 63 FD A9 00 - 84 0D C6 0B - 10 05 68 32 - 1C 06 09 20 - 27 00 14 00 - 61 1F 0B 06 - 1D 0A 57 FD - B6 1C 31 03 - BF 15 82 12 - 76 18 D8 23 - E7 4D 2E 5B - 63 00 00 00 - 0E 00 00 00 - 00 00 F9 07 - 5B C3 47 8B - 1F 00 00 00 - 1F F2 A5 07 - 9F F4 A1 EA - 13 F4 31 FA - 03 00 A6 1A - AA 33 CC FF - 07 10 00 00 - B7 0B 66 46 - 1F 00 40 00 - 4E 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + 7F 1F D5 05 + 34 0A A9 06 + F5 1C A8 01 + B9 04 CD 03 + D6 17 B9 23 + 96 44 24 5A + 7F 00 00 00 + 11 00 00 00 + 00 00 EE C5 + 64 C4 6F BB + 25 00 08 00 + EA E2 A5 07 + 63 FD A9 00 + 32 0C 59 FB + 10 05 68 32 + 1C 06 09 20 + 27 00 14 00 + 61 1F 0B 06 + 1D 0A 57 FD + B6 1C 31 03 + BF 15 82 12 + 76 18 D8 23 + E7 4D 2E 5B + 63 00 00 00 + 0E 00 00 00 + 00 00 F9 07 + 5B C3 47 8B + 1F 00 00 00 + 1F F2 A5 07 + 9F F4 A1 EA + 13 F4 31 FA + 03 00 A6 1A + AA 33 CC FF + 07 10 00 00 + B7 0B 66 46 + 1F 00 40 00 + 4E 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-e8-coslight-3000mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-e8-coslight-3000mAh.dtsi index f19460a81bfe..d363770a250e 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-e8-coslight-3000mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-e8-coslight-3000mAh.dtsi @@ -1,5 +1,6 @@ qcom,e1_coslight_3070mAh { + /* #3124728_Xiaomi_E1cos_3170mAh_averaged_MasterSlave_Sept25th2017*/ qcom,max-voltage-uv = <4400000>; qcom,nom-batt-capacity-mah = <3000>; qcom,batt-id-kohm = <100>; @@ -8,78 +9,73 @@ qcom,e1_coslight_3070mAh { qcom,battery-type = "e8_coslight_3000mAh"; qcom,fastchg-current-ma = <2900>; qcom,jeita-fcc-ranges = <0 50 290000 - 51 100 870000 - 101 150 1450000 - 151 450 2900000 - 451 600 1450000>; + 51 100 870000 + 101 150 1450000 + 151 450 2900000 + 451 600 1450000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; - qcom,dynamic-fv-ranges = <0 100 4400000 - 101 200 4380000 - 201 300 4360000 - 301 400 4340000 - 401 500 4340000>; - qcom,checksum = <0x572F>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; + qcom,checksum = <0xDF1B>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - 7F 1F D5 05 - 34 0A A9 06 - F5 1C A8 01 - B9 04 CD 03 - D6 17 B9 23 - 96 44 24 5A - 7F 00 00 00 - 11 00 00 00 - 00 00 EE C5 - 64 C4 6F BB - 25 00 08 00 - EA E2 A5 07 - 63 FD A9 00 - 84 0D C6 0B - 10 05 68 32 - 1C 06 09 20 - 27 00 14 00 - 61 1F 0B 06 - 1D 0A 57 FD - B6 1C 31 03 - BF 15 82 12 - 76 18 D8 23 - E7 4D 2E 5B - 63 00 00 00 - 0E 00 00 00 - 00 00 F9 07 - 5B C3 47 8B - 1F 00 00 00 - 1F F2 A5 07 - 9F F4 A1 EA - 13 F4 31 FA - 03 00 A6 1A - AA 33 CC FF - 07 10 00 00 - B7 0B 66 46 - 1F 00 40 00 - 4E 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + 40 1F F1 05 + 35 0A 25 FD + 6C 1D 6D F5 + 39 12 2E 14 + 80 18 26 23 + 41 45 46 53 + 55 00 00 00 + 0E 00 00 00 + 00 00 8F C3 + 2D CC 00 AC + 35 00 08 00 + F1 DA B3 E4 + 29 05 A3 FB + 89 0D EF 03 + 52 E5 BD 23 + 39 06 09 20 + 27 00 14 00 + AA 1F C3 05 + 40 0A 33 FD + 57 1D 95 EB + 73 0A 34 15 + 18 19 F0 22 + 67 45 1E 53 + 55 00 00 00 + 0D 00 00 00 + 00 00 B0 CC + 27 C3 0F BC + 23 00 00 00 + 91 EA B3 E4 + D1 FC CF 00 + 55 F5 F3 01 + 63 02 E9 23 + CB 33 CC FF + 07 10 00 00 + 71 0C 66 46 + 23 00 40 00 + 5E 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/batterydata-itech-3020mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-itech-3020mAh.dtsi index c0262df75c6b..8bae4f902a6c 100644 --- a/arch/arm64/boot/dts/qcom/batterydata-itech-3020mAh.dtsi +++ b/arch/arm64/boot/dts/qcom/batterydata-itech-3020mAh.dtsi @@ -1,5 +1,5 @@ /* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -20,73 +20,73 @@ qcom,itech-3020mah { qcom,battery-beta = <3380>; qcom,battery-type = "itech_3000mah"; qcom,jeita-fcc-ranges = <0 50 300000 - 51 100 925000 - 101 150 1550000 - 151 450 3100000 - 451 600 1550000>; + 51 100 925000 + 101 150 1550000 + 151 450 3100000 + 451 600 1550000>; qcom,jeita-fv-ranges = <0 50 4400000 - 51 100 4400000 - 101 150 4400000 - 151 450 4400000 - 451 600 4100000>; + 51 100 4400000 + 101 150 4400000 + 151 450 4400000 + 451 600 4100000>; qcom,checksum = <0x8E3D>; qcom,gui-version = "PMI8998GUI - 2.0.0.58"; qcom,fg-profile-data = [ - 0A 1F 3A 06 - 00 0A C7 06 - D4 1C 0C 02 - 98 0D C7 0A - 95 17 D6 23 - 7F 44 31 5A - 6F 00 00 00 - 11 00 00 00 - 00 00 D8 BB - 61 CD DF A2 - 26 00 08 00 - AB EA 51 EC - D1 FC BB F3 - 58 0C F3 FA - 62 06 BB 32 - 1F 06 09 20 - 27 00 14 00 - 18 20 25 05 - D4 0A F4 05 - C8 1C ED 02 - 1A 0C 19 12 - 91 18 AC 23 - 20 44 D6 5A - 6E 00 00 00 - 0E 00 00 00 - 00 00 86 D5 - 3E CA 24 CA - 1E 00 00 00 - 5B F2 51 EC - 7B F4 22 EB - 7A 07 87 FB - 69 BA BC 1B - AB 33 CC FF - 07 10 00 00 - 3E 0D 66 46 - 1E 00 40 00 - 66 01 0A FA - FF 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 - 00 00 00 00 + 0A 1F 3A 06 + 00 0A C7 06 + D4 1C 0C 02 + 98 0D C7 0A + 95 17 D6 23 + 7F 44 31 5A + 6F 00 00 00 + 11 00 00 00 + 00 00 D8 BB + 61 CD DF A2 + 26 00 08 00 + AB EA 51 EC + D1 FC BB F3 + 58 0C F3 FA + 62 06 BB 32 + 1F 06 09 20 + 27 00 14 00 + 18 20 25 05 + D4 0A F4 05 + C8 1C ED 02 + 1A 0C 19 12 + 91 18 AC 23 + 20 44 D6 5A + 6E 00 00 00 + 0E 00 00 00 + 00 00 86 D5 + 3E CA 24 CA + 1E 00 00 00 + 5B F2 51 EC + 7B F4 22 EB + 7A 07 87 FB + 69 BA BC 1B + AB 33 CC FF + 07 10 00 00 + 3E 0D 66 46 + 1E 00 40 00 + 66 01 0A FA + FF 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 + 00 00 00 00 ]; }; diff --git a/arch/arm64/boot/dts/qcom/beryllium-p0.dtsi b/arch/arm64/boot/dts/qcom/beryllium-p0.dtsi index 16133d643f13..a7f86bb0c4ab 100644 --- a/arch/arm64/boot/dts/qcom/beryllium-p0.dtsi +++ b/arch/arm64/boot/dts/qcom/beryllium-p0.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -16,6 +16,7 @@ #include "sdm845-pmic-overlay.dtsi" #include "sdm845-pinctrl-overlay.dtsi" #include "sdm845-xiaomi-common.dtsi" +//#include "beryllium-camera-sensor-mtp.dtsi" #include "beryllium-p0-camera-sensor-mtp.dtsi" &qupv3_se10_i2c { @@ -31,11 +32,11 @@ }; &reserved_memory { - ramdump_fb_mem: ramdump_fb_region@af000000 { - compatible = "removed-dma-pool"; - no-map; - reg = <0 0xaf000000 0 0x1000000>; - }; + ramdump_fb_mem: ramdump_fb_region@af000000 { + compatible = "removed-dma-pool"; + no-map; + reg = <0 0xaf000000 0 0x1000000>; + }; }; &vendor { @@ -186,20 +187,20 @@ }; &pmi8998_haptics { - qcom,vmax-mv = <2812>; - qcom,lra-auto-mode; - qcom,overdrive; - qcom,wave-play-rate-us = <4878>; - qcom,wave-shape = "sine"; - qcom,lra-high-z = "opt1"; - qcom,lra-auto-res-mode = "qwd"; - qcom,lra-res-cal-period = <4>; - qcom,effect-max = <3>; - qcom,effect-arry = [3e 3e be a0 00 00 00 00 - 3e 3e 3e be be 00 00 00 - 3e 3e 3e 3e be be a0 90]; - qcom,play-mode = "buffer"; - status = "okay"; + qcom,vmax-mv = <2812>; + qcom,lra-auto-mode; + qcom,overdrive; + qcom,wave-play-rate-us = <4878>; + qcom,wave-shape = "sine"; + qcom,lra-high-z = "opt1"; + qcom,lra-auto-res-mode = "qwd"; + qcom,lra-res-cal-period = <4>; + qcom,effect-max = <3>; + qcom,effect-arry = [3e 3e be a0 00 00 00 00 + 3e 3e 3e be be 00 00 00 + 3e 3e 3e 3e be be a0 90]; + qcom,play-mode = "buffer"; + status = "okay"; }; &mdss_mdp { @@ -267,9 +268,9 @@ }; &pmi8998_switch2 { - pinctrl-names = "led_enable", "led_disable"; - pinctrl-0 = <&flash_led3_iris_en>; - pinctrl-1 = <&flash_led3_iris_dis>; + pinctrl-names = "led_enable", "led_disable"; + pinctrl-0 = <&flash_led3_iris_en>; + pinctrl-1 = <&flash_led3_iris_dis>; }; &vendor{ @@ -291,6 +292,15 @@ &pmi8998_gpios { lm3644_pwm { lm3644_pwm_default: lm3644_pwm_default { + //pins = "gpio2"; + //function = "func1"; + //bias-disable; + //output-low; + //input-disable; + //drive-push-pull; + //qcom,drive-strength = <2>; + //power-source = <0>; + //temply disable it pins = "gpio2"; function = "normal"; bias-high-impedance; @@ -311,8 +321,7 @@ qcom,fcc-hot-temp-delta = <1400000>; qcom,fcc-cool-temp-delta = <1960000>; qcom,auto-recharge-soc; - qcom,sw-jeita-enable; - qcom,dynamic-fv-enable; + qcom,sw-jeita-enable; qcom,thermal-mitigation = <1800000 1600000 1400000 1200000 1000000 1000000 1000000>; qcom,thermal-mitigation-dcp @@ -347,8 +356,6 @@ qcom,fg-esr-clamp-mohms = <60>; qcom,fg-batt-temp-delta = <6>; qcom,battery-data = <&mtp_batterydata>; - qcom,slope-limit-temp-threshold = <100>; - qcom,slope-limit-coeffs = <10 11 12 13>; }; &pmi8998_pwm_1 { @@ -393,9 +400,9 @@ interrupts = <63 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; - pinctrl-0 = <&nfc_int_active - &nfc_enable_active - &nfc_clk_default>; + pinctrl-0 = <&nfc_int_active + &nfc_enable_active + &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; clock-names = "ref_clk"; @@ -404,26 +411,43 @@ }; &qupv3_se5_i2c { + status = "ok"; + /*smart PA*/ + tas2559@4c{ + compatible = "ti,tas2559"; + reg = <0x4c>; + ti,tas2559-reset-gpio = <&tlmm 12 0>; + ti,tas2560-reset-gpio = <&tlmm 76 0>; + ti,tas2559-irq-gpio = <&tlmm 11 0>; + ti,tas2560-irq-gpio = <&tlmm 30 0>; + ti,tas2559-addr = <0x4c>; + ti,tas2560-addr = <0x4d>; + ti,tas2559-channel = <0>; /* 0, left; 1, right */ + ti,tas2560-channel = <1>; /* 0, left; 1, right */ + ti,ycrc-enable = <1>; /* 0, disable; non-zero, enable */ + ti,echo-ref = <0>; /* 0, left channel; 1, right channel; 2, both */ + ti,bit-rate = <16>; /* 16, 20, 24, 32 */ + status = "ok"; + }; + +}; +/* +&qupv3_se10_i2c { status = "ok"; - /*smart PA*/ - tas2559@4c{ - compatible = "ti,tas2559"; - reg = <0x4c>; - ti,tas2559-reset-gpio = <&tlmm 12 0>; - ti,tas2560-reset-gpio = <&tlmm 76 0>; - ti,tas2559-irq-gpio = <&tlmm 11 0>; - ti,tas2560-irq-gpio = <&tlmm 30 0>; - ti,tas2559-addr = <0x4c>; - ti,tas2560-addr = <0x4d>; - ti,tas2559-channel = <0>; /* 0, left; 1, right */ - ti,tas2560-channel = <1>; /* 0, left; 1, right */ - ti,ycrc-enable = <1>; /* 0, disable; non-zero, enable */ - ti,echo-ref = <0>; /* 0, left channel; 1, right channel; 2, both */ - ti,bit-rate = <16>; /* 16, 20, 24, 32 */ - status = "ok"; + idtp9220@61 { + compatible = "idt,p9220"; + reg = <0x61>; + idt,irq = <&tlmm 78 0x00>; + //idt,enable = <&tlmm 36 0x00>; + interrupt-parent = <&tlmm>; + interrupts = <78 0>; + interrupt-names = "idt_irq"; + pinctrl-names = "idt_active", "idt_suspend"; + pinctrl-0 = <&idt_int_active &idt_enable_active>; + pinctrl-1 = <&idt_int_suspend &idt_enable_suspend>; }; - }; +*/ &qupv3_se10_i2c { status = "ok"; @@ -485,7 +509,7 @@ /* novatek,mp-support-dt; */ }; focaltech@38 { - compatible = "focaltech,focal"; + compatible = "focaltech,fts"; reg = <0x38>; interrupt-parent = <&tlmm>; interrupts = <31 0>; @@ -498,10 +522,6 @@ focaltech,irq-gpio = <&tlmm 31 0x02>; focaltech,max-touch-number = <10>; focaltech,display-coords = <0 0 1080 2246>; - focaltech,project-name = "e10"; - focaltech,lockdown-info-addr = <0x1FA0>; - focaltech,timeout-read-reg = <1000>; - focaltech,cutoff-power; pinctrl-names = "pmx_ts_active", "pmx_ts_suspend"; pinctrl-0 = <&ts_int_active &ts_reset_active>; pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; diff --git a/arch/arm64/boot/dts/qcom/dipper-audio-overlay.dtsi b/arch/arm64/boot/dts/qcom/dipper-audio-overlay.dtsi index 4c6f20e2b081..d59f8ce9be92 100644 --- a/arch/arm64/boot/dts/qcom/dipper-audio-overlay.dtsi +++ b/arch/arm64/boot/dts/qcom/dipper-audio-overlay.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -23,14 +23,14 @@ "AMIC2_EXT_0", "MIC BIAS2", "MIC BIAS2", "Headset Mic", "AMIC2_EXT_1", "MIC BIAS4", - "MIC BIAS4", "Headset Mic2", + "MIC BIAS4", "Headset Mic2", "AMIC3", "MIC BIAS1", "MIC BIAS1", "ANCRight Headset Mic", "AMIC1", "MIC BIAS4", "MIC BIAS4", "ANCLeft Headset Mic"; qcom,wsa-max-devs = <0>; - qcom,adc2-switch-gpio = <&adc2_switch_gpio>; + qcom,adc2-switch-gpio = <&adc2_switch_gpio>; qcom,msm-mbhc-usbc-audio-supported = <1>; qcom,usbc-analog-en2-gpio = <&tlmm 51 0>; pinctrl-names = "aud_active", "aud_sleep", @@ -48,10 +48,10 @@ }; &soc { - adc2_switch_gpio: msm_cdc_pinctrl@62 { - compatible = "qcom,msm-cdc-pinctrl"; - pinctrl-names = "aud_active", "aud_sleep"; - pinctrl-0 = <&adc2_switch_gpio_active>; - pinctrl-1 = <&adc2_switch_gpio_idle>; - }; + adc2_switch_gpio: msm_cdc_pinctrl@62 { + compatible = "qcom,msm-cdc-pinctrl"; + pinctrl-names = "aud_active", "aud_sleep"; + pinctrl-0 = <&adc2_switch_gpio_active>; + pinctrl-1 = <&adc2_switch_gpio_idle>; + }; }; diff --git a/arch/arm64/boot/dts/qcom/dipper-p0-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/dipper-p0-camera-sensor-mtp.dtsi index 7f273f3a7ed5..93b76f591382 100644 --- a/arch/arm64/boot/dts/qcom/dipper-p0-camera-sensor-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/dipper-p0-camera-sensor-mtp.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -392,7 +392,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - led-flash-src = <&led_flash_rear_aux>; + led-flash-src = <&led_flash_rear_aux>; actuator-src = <&actuator_rear_aux>; eeprom-src = <&eeprom_rear_aux>; cam_vdig-supply = <&camera_vdig_ldo>; diff --git a/arch/arm64/boot/dts/qcom/dipper-p0.dtsi b/arch/arm64/boot/dts/qcom/dipper-p0.dtsi index 7ea20ec65e5e..f117c8779ab1 100644 --- a/arch/arm64/boot/dts/qcom/dipper-p0.dtsi +++ b/arch/arm64/boot/dts/qcom/dipper-p0.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -16,6 +16,7 @@ #include "sdm845-pmic-overlay.dtsi" #include "sdm845-pinctrl-overlay.dtsi" #include "sdm845-xiaomi-common.dtsi" +//#include "dipper-camera-sensor-mtp.dtsi" #include "dipper-p0-camera-sensor-mtp.dtsi" &qupv3_se10_i2c { @@ -31,11 +32,11 @@ }; &reserved_memory { - ramdump_fb_mem: ramdump_fb_region@af000000 { - compatible = "removed-dma-pool"; - no-map; - reg = <0 0xaf000000 0 0x1000000>; - }; + ramdump_fb_mem: ramdump_fb_region@af000000 { + compatible = "removed-dma-pool"; + no-map; + reg = <0 0xaf000000 0 0x1000000>; + }; }; &vendor { @@ -153,7 +154,6 @@ thermal,batt-level-screen-on = "0 2 4 6 8 9 10 11 12 13 14 14 16"; thermal,batt-level-screen-off = "0 1 1 1 3 5 6 6 6 7 9 14 16"; }; - }; &labibb { @@ -167,71 +167,45 @@ qcom,mdss-dsi-bl-max-level = <1023>; qcom,platform-reset-gpio = <&tlmm 6 0>; qcom,platform-te-gpio = <&tlmm 10 0>; - qcom,esd-err-irq-gpio = <&tlmm 52 0x2002>; /* trig-flags: falling-0x0002 rasing-0x0001*/ - qcom,mdss-dsi-display-timings { - timing@0{ - qcom,mdss-dsi-on-command = [ - 05 01 00 00 0a 00 02 11 00 - 39 00 00 00 00 00 05 2B 00 00 08 c7 - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 08 EF F0 31 00 33 31 14 35 - 39 00 00 00 00 00 02 B0 01 - 39 00 00 00 00 00 02 BB 03 - 39 00 00 00 00 00 02 B0 4F - 39 00 00 00 00 00 02 CB 00 - 39 00 00 00 00 00 02 B0 6B - 39 00 00 00 00 00 02 CB 00 - 39 00 00 00 00 00 02 F7 03 - 39 00 00 00 00 00 02 B0 05 - 39 00 00 00 00 00 02 B1 10 - 39 00 00 00 00 00 02 B0 02 - 39 00 00 00 00 00 05 D5 02 17 54 14 - 39 01 00 00 00 00 03 F0 A5 A5 - 39 00 00 00 00 00 02 35 00 - 39 00 00 00 00 00 03 51 00 00 - 39 00 00 00 00 00 02 53 20 - 39 01 00 00 6E 00 02 55 00 - 05 01 00 00 00 00 02 29 00]; - }; - }; }; + &dsi_dual_nt35597_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; - qcom,panel-mode-gpio = <&tlmm 52 0>; - qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; + qcom,panel-mode-gpio = <&tlmm 52 0>; + qcom,platform-reset-gpio = <&tlmm 6 0>; }; &dsi_dual_nt35597_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; - qcom,panel-mode-gpio = <&tlmm 52 0>; - qcom,platform-reset-gpio = <&tlmm 6 0>; - qcom,platform-te-gpio = <&tlmm 10 0>; + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; + qcom,panel-mode-gpio = <&tlmm 52 0>; + qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,platform-te-gpio = <&tlmm 10 0>; }; &dsi_gvo_fhd_rm69299_cmd { - qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <1023>; - qcom,platform-reset-gpio = <&tlmm 6 0>; - qcom,platform-te-gpio = <&tlmm 10 0>; + qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <1023>; + qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,platform-te-gpio = <&tlmm 10 0>; }; &dsi_tianma_fhd_rm69299_cmd { - qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <1023>; - qcom,platform-reset-gpio = <&tlmm 6 0>; - qcom,platform-te-gpio = <&tlmm 10 0>; + qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <1023>; + qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,platform-te-gpio = <&tlmm 10 0>; }; &dsi_sim_vid { @@ -249,20 +223,20 @@ }; &pmi8998_haptics { - qcom,vmax-mv = <3100>; - qcom,lra-auto-mode; - qcom,overdrive; - qcom,wave-play-rate-us = <4878>; - qcom,wave-shape = "sine"; - qcom,lra-high-z = "opt1"; - qcom,lra-auto-res-mode = "qwd"; - qcom,lra-res-cal-period = <4>; - qcom,effect-max = <3>; - qcom,effect-arry = [3e 3e be 00 00 00 00 00 - 3e 3e 3e 3e be be a0 00 - 3e 3e 3e 3e 3e be be be]; - qcom,play-mode = "buffer"; - status = "okay"; + qcom,vmax-mv = <3100>; + qcom,lra-auto-mode; + qcom,overdrive; + qcom,wave-play-rate-us = <4878>; + qcom,wave-shape = "sine"; + qcom,lra-high-z = "opt1"; + qcom,lra-auto-res-mode = "qwd"; + qcom,lra-res-cal-period = <4>; + qcom,effect-max = <3>; + qcom,effect-arry = [3e 3e be 00 00 00 00 00 + 3e 3e 3e 3e be be a0 00 + 3e 3e 3e 3e 3e be be be]; + qcom,play-mode = "buffer"; + status = "okay"; }; &mdss_mdp { @@ -331,9 +305,9 @@ }; &pmi8998_switch2 { - pinctrl-names = "led_enable", "led_disable"; - pinctrl-0 = <&flash_led3_iris_en>; - pinctrl-1 = <&flash_led3_iris_dis>; + pinctrl-names = "led_enable", "led_disable"; + pinctrl-0 = <&flash_led3_iris_en>; + pinctrl-1 = <&flash_led3_iris_dis>; }; &vendor{ @@ -380,8 +354,7 @@ qcom,fcc-hot-temp-delta = <1650000>; qcom,fcc-cool-temp-delta = <2310000>; qcom,auto-recharge-soc; - qcom,sw-jeita-enable; - qcom,dynamic-fv-enable; + qcom,sw-jeita-enable; qcom,thermal-mitigation = <1800000 1600000 1400000 1200000 1000000 1000000 1000000>; qcom,thermal-mitigation-dcp @@ -416,8 +389,6 @@ qcom,fg-esr-clamp-mohms = <60>; qcom,fg-batt-temp-delta = <6>; qcom,battery-data = <&mtp_batterydata>; - qcom,slope-limit-temp-threshold = <100>; - qcom,slope-limit-coeffs = <10 11 12 13>; }; &pmi8998_pwm_1 { @@ -463,9 +434,9 @@ interrupts = <63 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; - pinctrl-0 = <&nfc_int_active - &nfc_enable_active - &nfc_clk_default>; + pinctrl-0 = <&nfc_int_active + &nfc_enable_active + &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; clock-names = "ref_clk"; @@ -534,18 +505,6 @@ // fts,y-offset = <300>; // fts,y-skip = <240>; fts,config-array-size = <1>; - fts,default-fw-name = "st_fts_e1.ftb"; - fts,touch-up-threshold-min = <20>; - fts,touch-up-threshold-max = <50>; - fts,touch-up-threshold-def = <20>; - fts,touch-tolerance-min = <5>; - fts,touch-tolerance-max = <15>; - fts,touch-tolerance-def = <5>; - fts,edgefilter-leftrigt-def = <30>; - fts,edgefilter-topbottom-def = <30>; - fts,edgefilter-area-step1 = <100>; - fts,edgefilter-area-step2 = <150>; - fts,edgefilter-area-step3 = <250>; fts,cfg_0 { fts,tp-vendor = <0x48>; fts,fw-name = "st_fts_e1.ftb"; @@ -988,10 +947,6 @@ pinctrl-names = "atest_usb13_suspend","atest_usb13_active"; pinctrl-0 = <&atest_usb13_suspend>; pinctrl-1 = <&atest_usb13_active>; - mi,efuse-pll-bias; - mi,efuse-pll-bias-seq = <1 0x23>; - mi,efuse-pll-bias-host; - mi,efuse-pll-bias-seq-host = <1 0x24 2 0x24 3 0x24 4 0x23 5 0x22 6 0x22 7 0x21>; }; &pmi8998_pdphy { diff --git a/arch/arm64/boot/dts/qcom/dsi-panel-ebbg-fhd-ft8716-video.dtsi b/arch/arm64/boot/dts/qcom/dsi-panel-ebbg-fhd-ft8716-video.dtsi index 2e69b3b8dc64..6348b9ac533a 100644 --- a/arch/arm64/boot/dts/qcom/dsi-panel-ebbg-fhd-ft8716-video.dtsi +++ b/arch/arm64/boot/dts/qcom/dsi-panel-ebbg-fhd-ft8716-video.dtsi @@ -1,5 +1,5 @@ /* Copyright (c) 2015, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -51,6 +51,9 @@ qcom,mdss-dsi-tx-eot-append; qcom,mdss-panel-on-dimming-delay = <120>; + qcom,mdss-dsi-pan-enable-dynamic-fps; + qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp"; + qcom,dsi-supported-dfps-list = <60 55>; qcom,dispccbb-enabled; qcom,dispblnotify-enabled; qcom,dispparam-enabled; diff --git a/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi b/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi index 3d94b4cd7d10..e1ade83b770d 100644 --- a/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi +++ b/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi @@ -1,5 +1,5 @@ /* Copyright (c) 2015, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -57,7 +57,7 @@ qcom,mdss-dsi-panel-blackness-level = <3230>; qcom,dispparam-enabled; - qcom,mdss-panel-on-dimming-delay = <200>; + qcom,mdss-panel-on-dimming-delay = <120>; qcom,disp-doze-backlight-threshold = <8>; /* IRQF_ONESHOT | IRQF_TRIGGER_HIGH */ /* qcom,esd-err-irq-gpio = <&tlmm 52 0x2004>; */ @@ -67,7 +67,6 @@ qcom,ulps-enabled; qcom,suspend-ulps-enabled; qcom,panel-allow-phy-poweroff; - qcom,mdss-dsi-panel-dc-threshold = <610>; qcom,mdss-dsi-display-timings { timing@0{ @@ -120,14 +119,7 @@ /* Display On */ 05 01 00 00 00 00 02 29 00]; qcom,mdss-dsi-off-command = [ - /* Display Off */ - 05 01 00 00 11 00 02 28 00 - /* LTPS Off Setting */ - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 02 B0 4F - 39 00 00 00 00 00 02 B9 58 - 39 01 00 00 11 00 03 F0 A5 A5 - /* Sleep in */ + 05 01 00 00 00 00 02 28 00 05 01 00 00 78 00 02 10 00]; qcom,mdss-dsi-on-command-state = "dsi_lp_mode"; qcom,mdss-dsi-off-command-state = "dsi_lp_mode"; @@ -177,8 +169,7 @@ qcom,mdss-dsi-dispparam-dimmingon-command = [39 01 00 00 01 00 02 53 28]; qcom,mdss-dsi-dispparam-dimmingon-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-dispparam-dimmingoff-command = [39 01 00 00 01 00 02 53 20]; - qcom,mdss-dsi-dispparam-dimmingoff-command-state = "dsi_lp_mode"; + qcom,mdss-dsi-dispparam-crc-srgb-on-command = [ /* CRC Enable + sRGB mode */ 39 01 00 00 00 00 02 81 90 diff --git a/arch/arm64/boot/dts/qcom/dsi-panel-sim-video.dtsi b/arch/arm64/boot/dts/qcom/dsi-panel-sim-video.dtsi index 20f1c4d21215..40bedd0e462c 100644 --- a/arch/arm64/boot/dts/qcom/dsi-panel-sim-video.dtsi +++ b/arch/arm64/boot/dts/qcom/dsi-panel-sim-video.dtsi @@ -1,5 +1,4 @@ /* Copyright (c) 2012-2015, 2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -41,15 +40,15 @@ qcom,mdss-dsi-display-timings { timing@0{ - qcom,mdss-dsi-panel-width = <1080>; - qcom,mdss-dsi-panel-height = <2160>; - qcom,mdss-dsi-h-front-porch = <16>; - qcom,mdss-dsi-h-back-porch = <40>; - qcom,mdss-dsi-h-pulse-width = <28>; + qcom,mdss-dsi-panel-width = <640>; + qcom,mdss-dsi-panel-height = <480>; + qcom,mdss-dsi-h-front-porch = <8>; + qcom,mdss-dsi-h-back-porch = <8>; + qcom,mdss-dsi-h-pulse-width = <8>; qcom,mdss-dsi-h-sync-skew = <0>; - qcom,mdss-dsi-v-back-porch = <24>; - qcom,mdss-dsi-v-front-porch = <7>; - qcom,mdss-dsi-v-pulse-width = <4>; + qcom,mdss-dsi-v-back-porch = <6>; + qcom,mdss-dsi-v-front-porch = <6>; + qcom,mdss-dsi-v-pulse-width = <2>; qcom,mdss-dsi-h-left-border = <0>; qcom,mdss-dsi-h-right-border = <0>; qcom,mdss-dsi-v-top-border = <0>; diff --git a/arch/arm64/boot/dts/qcom/dsi-panel-ss-fhd-ea8074-cmd.dtsi b/arch/arm64/boot/dts/qcom/dsi-panel-ss-fhd-ea8074-cmd.dtsi index a00819463d18..e05860ec977b 100644 --- a/arch/arm64/boot/dts/qcom/dsi-panel-ss-fhd-ea8074-cmd.dtsi +++ b/arch/arm64/boot/dts/qcom/dsi-panel-ss-fhd-ea8074-cmd.dtsi @@ -1,5 +1,5 @@ /* Copyright (c) 2015, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -38,7 +38,7 @@ qcom,mdss-dsi-lane-3-state; qcom,mdss-dsi-t-clk-post = <0x0e>; qcom,mdss-dsi-t-clk-pre = <0x31>; - qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <1023>; qcom,mdss-brightness-max-level = <1023>; qcom,mdss-dsi-dma-trigger = "trigger_sw"; @@ -84,31 +84,31 @@ qcom,mdss-dsi-v-bottom-border = <0>; qcom,mdss-dsi-panel-framerate = <60>; qcom,mdss-dsi-on-command = [ - 05 01 00 00 0a 00 02 11 00 - 39 00 00 00 00 00 05 2B 00 00 08 6f - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 02 B0 04 - 39 00 00 00 00 00 02 B2 00 - 39 00 00 00 00 00 02 F7 03 - 39 00 00 00 00 00 03 F0 A5 A5 - 39 00 00 00 00 00 02 35 00 - 39 00 00 00 00 00 03 51 00 00 - 39 00 00 00 00 00 02 53 25 - 39 01 00 00 6E 00 02 55 00 - 05 01 00 00 00 00 02 29 00]; + 05 01 00 00 0a 00 02 11 00 + 39 00 00 00 00 00 05 2B 00 00 08 6f + 39 00 00 00 00 00 03 F0 5A 5A + 39 00 00 00 00 00 02 B0 04 + 39 00 00 00 00 00 02 B2 00 + 39 00 00 00 00 00 02 F7 03 + 39 00 00 00 00 00 03 F0 A5 A5 + 39 00 00 00 00 00 02 35 00 + 39 00 00 00 00 00 03 51 00 00 + 39 00 00 00 00 00 02 53 25 + 39 01 00 00 6E 00 02 55 00 + 05 01 00 00 00 00 02 29 00]; qcom,mdss-dsi-off-command = [ 05 01 00 00 00 00 02 28 00 05 01 00 00 78 00 02 10 00]; qcom,mdss-dsi-on-command-state = "dsi_lp_mode"; qcom,mdss-dsi-off-command-state = "dsi_lp_mode"; qcom,mdss-dsi-doze-hbm-command = [ - 39 01 00 00 00 00 03 51 00 01 - 39 01 00 00 01 00 02 53 22]; + 39 01 00 00 00 00 03 51 00 01 + 39 01 00 00 01 00 02 53 22]; qcom,mdss-dsi-doze-lbm-command = [ - 39 01 00 00 00 00 03 51 00 01 - 39 01 00 00 01 00 02 53 23]; + 39 01 00 00 00 00 03 51 00 01 + 39 01 00 00 01 00 02 53 23]; qcom,mdss-dsi-nolp-command = [ - 39 01 00 00 00 00 02 53 25]; + 39 01 00 00 00 00 02 53 25]; qcom,mdss-dsi-doze-hbm-command-state = "dsi_lp_mode"; qcom,mdss-dsi-doze-lbm-command-state = "dsi_lp_mode"; qcom,mdss-dsi-nolp-command-state = "dsi_lp_mode"; diff --git a/arch/arm64/boot/dts/qcom/dsi-panel-ss-notch-fhd-ea8074-cmd.dtsi b/arch/arm64/boot/dts/qcom/dsi-panel-ss-notch-fhd-ea8074-cmd.dtsi index f7b7b379c9aa..c531d50308a0 100644 --- a/arch/arm64/boot/dts/qcom/dsi-panel-ss-notch-fhd-ea8074-cmd.dtsi +++ b/arch/arm64/boot/dts/qcom/dsi-panel-ss-notch-fhd-ea8074-cmd.dtsi @@ -1,5 +1,5 @@ /* Copyright (c) 2015, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -61,7 +61,7 @@ qcom,ulps-enabled; qcom,suspend-ulps-enabled; qcom,panel-allow-phy-poweroff; - qcom,mdss-dsi-panel-dc-threshold = <320>; + qcom,mdss-dsi-display-timings { timing@0{ qcom,mdss-dsi-panel-width = <1080>; @@ -95,29 +95,13 @@ 39 00 00 00 00 00 02 B0 02 39 00 00 00 00 00 05 D5 02 17 54 14 39 01 00 00 00 00 03 F0 A5 A5 - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 03 Fc 5A 5A - 39 00 00 00 00 00 03 D2 9F F0 - 39 00 00 00 00 00 02 B0 0E - 39 00 00 00 00 00 02 d2 70 - 39 00 00 00 00 00 02 b0 04 - 39 00 00 00 00 00 02 d2 20 - 39 00 00 00 00 00 03 F0 A5 A5 - 39 01 00 00 00 00 03 Fc A5 a5 39 00 00 00 00 00 02 35 00 39 00 00 00 00 00 03 51 00 00 39 00 00 00 00 00 02 53 20 39 01 00 00 6E 00 02 55 00 05 01 00 00 00 00 02 29 00]; qcom,mdss-dsi-off-command = [ - 05 01 00 00 11 00 02 28 00 - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 02 B0 49 - 39 00 00 00 00 00 02 CB FF - 39 00 00 00 00 00 02 B0 4F - 39 00 00 00 00 00 02 CB C8 - 39 00 00 00 00 00 02 F7 03 - 39 01 00 00 11 00 03 F0 A5 A5 + 05 01 00 00 00 00 02 28 00 05 01 00 00 78 00 02 10 00]; qcom,mdss-dsi-on-command-state = "dsi_lp_mode"; qcom,mdss-dsi-off-command-state = "dsi_lp_mode"; @@ -137,6 +121,7 @@ 39 01 00 00 00 00 03 F0 A5 A5]; qcom,mdss-dsi-nolp-command = [ 05 01 00 00 00 00 02 28 00 + 39 00 00 00 00 00 03 51 00 00 39 00 00 00 00 00 03 F0 5A 5A 39 00 00 00 00 00 02 b0 17 39 00 00 00 00 00 04 E3 86 80 01 @@ -185,65 +170,11 @@ qcom,mdss-dsi-dispparam-hbm-fod2norm-command-state = "dsi_lp_mode"; qcom,mdss-dsi-dispparam-dimmingon-command = [39 01 00 00 01 00 02 53 28]; qcom,mdss-dsi-dispparam-dimmingon-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-dispparam-dimmingoff-command = [39 01 00 00 01 00 02 53 20]; - qcom,mdss-dsi-dispparam-dimmingoff-command-state = "dsi_lp_mode"; qcom,mdss-dsi-panel-jitter = <0x1 0x1>; qcom,mdss-dsi-read-panel-id-command = [ 06 01 00 01 05 00 02 DB 00]; qcom,mdss-dsi-read-panel-id-command-state = "dsi_hs_mode"; - qcom,mdss-dsi-dispparam-flash-test-on-command = [ - /* AOR 100% Code */ - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 03 51 03 FF - 39 00 00 00 00 00 02 B0 0B - 39 00 00 00 00 00 02 B2 82 - 39 00 00 00 00 00 02 B0 16 - 39 00 00 00 00 00 02 B2 D8 - 39 00 00 00 00 00 02 F7 03 - 39 01 00 00 6E 00 03 F0 A5 A5 - /* Flashing Test Code */ - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 02 B0 32 - 39 00 00 00 00 00 02 CB 01 - 39 00 00 00 00 00 02 B0 40 - 39 00 00 00 00 00 02 CB 3E - 39 00 00 00 00 00 02 B0 4F - 39 00 00 00 00 00 02 CB 00 - 39 00 00 00 00 00 02 B0 0B - 39 00 00 00 00 00 02 CB C0 - 39 00 00 00 00 00 02 F7 03 - 39 01 00 00 00 00 03 F0 A5 A5]; - qcom,mdss-dsi-dispparam-flash-test-on-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-dispparam-flash-test-off-command = [ - /* Normal Condition Code */ - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 02 B0 32 - 39 00 00 00 00 00 02 CB 68 - 39 00 00 00 00 00 02 B0 40 - 39 00 00 00 00 00 02 CB 6E - 39 00 00 00 00 00 02 B0 4F - 39 00 00 00 00 00 02 CB 03 - 39 00 00 00 00 00 02 B0 0B - 39 00 00 00 00 00 02 CB CB - 39 00 00 00 00 00 02 F7 03 - 39 01 00 00 6E 00 03 F0 A5 A5 - /* AOR Normal Code */ - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 03 51 03 FF - 39 00 00 00 00 00 02 B0 0B - 39 00 00 00 00 00 02 B2 02 - 39 00 00 00 00 00 02 B0 16 - 39 00 00 00 00 00 02 B2 40 - 39 00 00 00 00 00 02 F7 03 - 39 01 00 00 00 00 03 F0 A5 A5]; - qcom,mdss-dsi-dispparam-flash-test-off-command-state = "dsi_lp_mode"; qcom,mdss-dsi-h-sync-pulse = <0>; - qcom,mdss-dsi-dispparam-crc-off-command = [ - 39 00 00 00 00 00 03 F0 5A 5A - 39 00 00 00 00 00 03 E2 00 40 - 39 01 00 00 00 00 03 F0 A5 A5 - ]; - qcom,mdss-dsi-dispparam-crc-off-command-state = "dsi_lp_mode"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/dsi-panel-visionox-fhd-r66455-cmd.dtsi b/arch/arm64/boot/dts/qcom/dsi-panel-visionox-fhd-r66455-cmd.dtsi index 542c56fbdf22..a42928d6e11e 100644 --- a/arch/arm64/boot/dts/qcom/dsi-panel-visionox-fhd-r66455-cmd.dtsi +++ b/arch/arm64/boot/dts/qcom/dsi-panel-visionox-fhd-r66455-cmd.dtsi @@ -1,5 +1,5 @@ /* Copyright (c) 2015, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -36,9 +36,9 @@ qcom,mdss-dsi-lane-1-state; qcom,mdss-dsi-lane-2-state; qcom,mdss-dsi-lane-3-state; - qcom,mdss-brightness-remap; - qcom,mdss-doze-brightness-variable; - qcom,mdss-brightness-max-level = <2047>; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <4095>; qcom,mdss-dsi-dma-trigger = "trigger_sw"; qcom,mdss-dsi-mdp-trigger = "none"; qcom,mdss-dsi-reset-sequence = <0 2>, <1 10>; @@ -58,14 +58,13 @@ qcom,mdss-dsi-bl-dcs-type-ss; /* qcom,mdss-dsi-on-command-tuning; */ - qcom,dispparam-enabled; - qcom,mdss-panel-on-dimming-delay = <120>; - qcom,disp-doze-backlight-threshold = <8>;/*2047(8), 4096(16) */ + /* qcom,dispparam-enabled; */ + /* qcom,mdss-panel-on-dimming-delay = <120>; */ + /* qcom,disp-doze-backlight-threshold = <8>; */ /* IRQF_ONESHOT | IRQF_TRIGGER_HIGH */ /* qcom,esd-err-irq-gpio = <&tlmm 52 0x2004>; */ - qcom,bl-update-flag = "delay_until_first_frame"; - qcom,bl-update-delay = <28>; + /* qcom,bl-update-flag = "delay_until_first_frame"; */ qcom,ulps-enabled; qcom,suspend-ulps-enabled; @@ -92,64 +91,23 @@ 39 01 00 00 00 00 02 B0 00 /* mode switch 00:CMD mode 01:VDO mode */ 39 01 00 00 00 00 02 B3 00 - 39 01 00 00 00 00 02 FA 9F - 39 01 00 00 00 00 0F C1 F0 61 00 00 00 00 00 20 02 00 00 00 00 81 - /* SET Column Start Adress */ - 39 01 00 00 00 00 05 2A 00 00 04 37 - /* SET Row Start Adress */ - 39 01 00 00 00 00 05 2B 00 00 09 23 /* Bank 1 */ 39 01 00 00 00 00 02 B0 80 - 39 01 00 00 00 00 02 E4 FE /* NVM load control */ 39 01 00 00 00 00 02 E6 00 /* brightness control */ - 39 01 00 00 00 00 03 51 01 00 + 39 01 00 00 00 00 03 51 04 00 /* TE Control*/ 39 01 00 00 00 00 02 35 00 - /* Bank 0 */ - 39 01 00 00 00 00 02 B0 00 /* display on */ - 05 01 00 00 00 00 02 29 00 + 05 01 00 00 78 00 02 29 00 /* sleep out */ - 05 01 00 00 64 00 02 11 00]; + 05 01 00 00 78 00 02 11 00]; qcom,mdss-dsi-off-command = [ 05 01 00 00 00 00 02 28 00 - 05 01 00 00 78 00 02 10 00]; - qcom,mdss-dsi-on-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-off-command-state = "dsi_lp_mode"; - - qcom,mdss-dsi-doze-hbm-command = [ - /* AOD ON Sequence (Normal To AOD HBM) */ - 05 01 00 00 00 00 02 39 00 - 39 01 00 00 00 00 03 51 00 FF]; - qcom,mdss-dsi-doze-lbm-command = [ - /* AOD ON Sequence (Normal To AOD LBM) */ - 05 01 00 00 00 00 02 39 00 - 39 01 00 00 00 00 03 51 00 00]; - qcom,mdss-dsi-nolp-command = [ - /* AOD OFF Sequence (AOD To Normal) */ - 05 01 00 00 00 00 02 38 00]; - qcom,mdss-dsi-doze-hbm-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-doze-lbm-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-nolp-command-state = "dsi_lp_mode"; - - qcom,mdss-dsi-dispparam-acl-off-command = [39 01 00 00 00 00 02 55 00]; - qcom,mdss-dsi-dispparam-acl-off-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-dispparam-acl-l1-command = [39 01 00 00 00 00 02 55 03];/* 40% */ - qcom,mdss-dsi-dispparam-acl-l1-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-dispparam-acl-l2-command = [39 01 00 00 00 00 02 55 02];/* 30% */ - qcom,mdss-dsi-dispparam-acl-l2-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-dispparam-acl-l3-command = [39 01 00 00 00 00 02 55 01];/* 15% */ - qcom,mdss-dsi-dispparam-acl-l3-command-state = "dsi_lp_mode"; - - qcom,mdss-dsi-dispparam-hbm-off-command = [39 01 00 00 00 00 02 53 28]; - qcom,mdss-dsi-dispparam-hbm-off-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-dispparam-hbm-on-command = [39 01 00 00 00 00 02 53 E8]; - qcom,mdss-dsi-dispparam-hbm-on-command-state = "dsi_lp_mode"; - - qcom,mdss-dsi-dispparam-dimmingon-command = [39 01 00 00 00 00 02 53 28]; - qcom,mdss-dsi-dispparam-dimmingon-command-state = "dsi_lp_mode"; + 05 01 00 00 55 00 02 10 00]; + qcom,mdss-dsi-on-command-state = "dsi_hs_mode"; + qcom,mdss-dsi-off-command-state = "dsi_hs_mode"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/equuleus-p0.dtsi b/arch/arm64/boot/dts/qcom/equuleus-p0.dtsi index 3b306141774a..511ceaf629f4 100644 --- a/arch/arm64/boot/dts/qcom/equuleus-p0.dtsi +++ b/arch/arm64/boot/dts/qcom/equuleus-p0.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -11,11 +11,12 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ - + #include #include "sdm845-pmic-overlay.dtsi" #include "sdm845-pinctrl-overlay.dtsi" #include "sdm845-xiaomi-common.dtsi" +//#include "dipper-camera-sensor-mtp.dtsi" #include "equuleus-p0-camera-sensor-mtp.dtsi" &qupv3_se10_i2c { @@ -32,7 +33,7 @@ &reserved_memory { ramdump_fb_mem: ramdump_fb_region@af000000 { - compatible = "removed-dma-pool"; + compatible = "removed-dma-pool"; no-map; reg = <0 0xaf000000 0 0x1000000>; }; @@ -369,7 +370,6 @@ qcom,fcc-cool-temp-delta = <2100000>; qcom,auto-recharge-soc; qcom,sw-jeita-enable; - qcom,dynamic-fv-enable; qcom,thermal-mitigation = <1800000 1600000 1400000 1200000 1000000 1000000 1000000>; qcom,thermal-mitigation-dcp @@ -403,13 +403,6 @@ qcom,fg-jeita-thresholds = <0 15 45 60>; qcom,fg-esr-clamp-mohms = <60>; qcom,fg-batt-temp-delta = <6>; - qcom,optimize-sram-seq = < - 0x9 0x3 0x2 - 0xA 0x0 0x1 - 0xA 0x1 0x0 - 0xA 0x2 0x6 - 0xA 0x3 0x20 - 0xC 0x1 0x12>; qcom,battery-data = <&mtp_batterydata>; qcom,slope-limit-temp-threshold = <100>; qcom,slope-limit-coeffs = <10 11 12 13>; @@ -459,8 +452,8 @@ interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; pinctrl-0 = <&nfc_int_active - &nfc_enable_active - &nfc_clk_default>; + &nfc_enable_active + &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; clock-names = "ref_clk"; diff --git a/arch/arm64/boot/dts/qcom/perseus-p0-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/perseus-p0-camera-sensor-mtp.dtsi index 632bccb71af8..d1acf9d227ae 100644 --- a/arch/arm64/boot/dts/qcom/perseus-p0-camera-sensor-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/perseus-p0-camera-sensor-mtp.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -33,25 +33,25 @@ status = "ok"; }; - led_flash_front: qcom,camera-flash@2 { - cell-index = <2>; - reg = <0x02 0x00>; - compatible = "qcom,camera-flash"; - flash-source = <&pmi8998_flash2>; - torch-source = <&pmi8998_torch2>; - switch-source = <&pmi8998_switch1>; - status = "ok"; - }; + led_flash_front: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x02 0x00>; + compatible = "qcom,camera-flash"; + flash-source = <&pmi8998_flash2>; + torch-source = <&pmi8998_torch2>; + switch-source = <&pmi8998_switch1>; + status = "ok"; + }; - led_flash_front_raw: qcom,camera-flash@3 { - cell-index = <3>; - reg = <0x03 0x00>; - compatible = "qcom,camera-flash"; - flash-source = <&pmi8998_flash2>; - torch-source = <&pmi8998_torch2>; - switch-source = <&pmi8998_switch1>; - status = "ok"; - }; + led_flash_front_raw: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x03 0x00>; + compatible = "qcom,camera-flash"; + flash-source = <&pmi8998_flash2>; + torch-source = <&pmi8998_torch2>; + switch-source = <&pmi8998_switch1>; + status = "ok"; + }; actuator_rear_regulator: gpio-regulator@0 { @@ -280,45 +280,45 @@ clock-rates = <24000000>; }; - eeprom_ir: qcom,eeprom@3 { - cell-index = <3>; - reg = <0x03>; - compatible = "qcom,eeprom"; - slave-addr = <0xA2>; - i2c-freq-mode = <1>; - cam_vio-supply = <&camera_viodd_ldo>; - cam_vana-supply = <&pmi8998_bob>; - cam_clk-supply = <&titan_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <0 3312000 0>; - rgltr-max-voltage = <0 3600000 0>; - rgltr-load-current = <0 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_ir_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_ir_suspend>; - gpios = <&tlmm 14 0>, - <&tlmm 25 0>, - <&tlmm 27 0>; - gpio-reset = <1>; - gpio-vana = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3", - "CAM_VANA3"; - sensor-mode = <0>; - cci-master = <0>; - status = "ok"; - clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + eeprom_ir: qcom,eeprom@3 { + cell-index = <3>; + reg = <0x03>; + compatible = "qcom,eeprom"; + slave-addr = <0xA2>; + i2c-freq-mode = <1>; + cam_vio-supply = <&camera_viodd_ldo>; + cam_vana-supply = <&pmi8998_bob>; + cam_clk-supply = <&titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <0 3312000 0>; + rgltr-max-voltage = <0 3600000 0>; + rgltr-load-current = <0 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_ir_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_ir_suspend>; + gpios = <&tlmm 14 0>, + <&tlmm 25 0>, + <&tlmm 27 0>; + gpio-reset = <1>; + gpio-vana = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3", + "CAM_VANA3"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; qcom,cam-sensor@0 { cell-index = <0>; @@ -473,47 +473,47 @@ clock-rates = <24000000>; }; - qcom,cam-sensor@3 { - cell-index = <3>; - compatible = "qcom,cam-sensor"; - reg = <0x03>; - csiphy-sd-index = <1>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <0>; + qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + reg = <0x03>; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; led-flash-src = <&led_flash_front_raw>; - eeprom-src = <&eeprom_ir>; - cam_vio-supply = <&camera_viodd_ldo>; - cam_vana-supply = <&pmi8998_bob>; - cam_clk-supply = <&titan_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <0 3312000 0>; - rgltr-max-voltage = <0 3600000 0>; - rgltr-load-current = <0 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_ir_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_ir_suspend>; - gpios = <&tlmm 14 0>, //mclk - <&tlmm 25 0>, //reset - <&tlmm 27 0>; //avdd - gpio-reset = <1>; - gpio-vana = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3", - "CAM_VANA3"; - sensor-mode = <0>; - cci-master = <0>; - status = "ok"; - clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + eeprom-src = <&eeprom_ir>; + cam_vio-supply = <&camera_viodd_ldo>; + cam_vana-supply = <&pmi8998_bob>; + cam_clk-supply = <&titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <0 3312000 0>; + rgltr-max-voltage = <0 3600000 0>; + rgltr-load-current = <0 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_ir_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_ir_suspend>; + gpios = <&tlmm 14 0>, //mclk + <&tlmm 25 0>, //reset + <&tlmm 27 0>; //avdd + gpio-reset = <1>; + gpio-vana = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3", + "CAM_VANA3"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; diff --git a/arch/arm64/boot/dts/qcom/perseus-p0-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/perseus-p0-pinctrl.dtsi index f0a2eeb41f77..bc7823de967d 100644 --- a/arch/arm64/boot/dts/qcom/perseus-p0-pinctrl.dtsi +++ b/arch/arm64/boot/dts/qcom/perseus-p0-pinctrl.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -646,31 +646,31 @@ }; &cam_sensor_ir_active { - /* RESET AVDD_LDO*/ - mux { - pins = "gpio25", "gpio27"; - function = "gpio"; - }; - - config { - pins = "gpio25", "gpio27"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; + /* RESET AVDD_LDO*/ + mux { + pins = "gpio25", "gpio27"; + function = "gpio"; + }; + + config { + pins = "gpio25", "gpio27"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; }; &cam_sensor_ir_suspend { - /* RESET */ - mux { - pins = "gpio25", "gpio27"; - function = "gpio"; - }; - - config { - pins = "gpio25", "gpio27"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - }; + /* RESET */ + mux { + pins = "gpio25", "gpio27"; + function = "gpio"; + }; + + config { + pins = "gpio25", "gpio27"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; }; &camera_dvdd_en_default { @@ -688,31 +688,31 @@ }; &cam_sensor_iris_active { - /* RESET AVDD_LDO*/ - mux { - pins = "gpio25", "gpio27"; - function = "gpio"; - }; - - config { - pins = "gpio25", "gpio27"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; + /* RESET AVDD_LDO*/ + mux { + pins = "gpio25", "gpio27"; + function = "gpio"; + }; + + config { + pins = "gpio25", "gpio27"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; }; &cam_sensor_iris_suspend { - /* RESET */ - mux { - pins = "gpio25", "gpio27"; - function = "gpio"; - }; - - config { - pins = "gpio25", "gpio27"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - }; + /* RESET */ + mux { + pins = "gpio25", "gpio27"; + function = "gpio"; + }; + + config { + pins = "gpio25", "gpio27"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; }; diff --git a/arch/arm64/boot/dts/qcom/perseus-p0.dtsi b/arch/arm64/boot/dts/qcom/perseus-p0.dtsi index b23370be80a5..770c8ccfc5f1 100644 --- a/arch/arm64/boot/dts/qcom/perseus-p0.dtsi +++ b/arch/arm64/boot/dts/qcom/perseus-p0.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -31,11 +31,11 @@ }; &reserved_memory { - ramdump_fb_mem: ramdump_fb_region@af000000 { - compatible = "removed-dma-pool"; - no-map; - reg = <0 0xaf000000 0 0x1000000>; - }; + ramdump_fb_mem: ramdump_fb_region@af000000 { + compatible = "removed-dma-pool"; + no-map; + reg = <0 0xaf000000 0 0x1000000>; + }; }; &vendor { @@ -105,7 +105,7 @@ enable-active-high; regulator-boot-on; gpio = <&tlmm 79 0>; - }; + }; fp_vdd_vreg: fp_vdd_vreg { compatible = "regulator-fixed"; @@ -169,8 +169,7 @@ &dsi_visionox_fhd_r66455_cmd { qcom,panel-supply-entries = <&dsi_amoled_visionox_r66455_panel_pwr_supply>; qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <256>; - qcom,mdss-dsi-bl-typical-level = <267>; + qcom,mdss-dsi-bl-min-level = <2>; qcom,mdss-dsi-bl-max-level = <4095>; qcom,platform-reset-gpio = <&tlmm 6 0>; qcom,platform-te-gpio = <&tlmm 10 0>; @@ -216,18 +215,18 @@ }; &pmi8998_haptics { - qcom,vmax-mv = <2552>; - qcom,lra-auto-mode; - qcom,wave-play-rate-us = <4878>; - qcom,wave-shape = "sine"; - qcom,lra-high-z = "opt1"; - qcom,lra-auto-res-mode = "qwd"; - qcom,lra-res-cal-period = <4>; - qcom,effect-max = <3>; - qcom,effect-arry = [3e 88 00 00 00 00 00 00 - 3e 3e be 88 00 00 00 00 - 3e 3e 3e be a0 00 00 00]; - status = "okay"; + qcom,vmax-mv = <2552>; + qcom,lra-auto-mode; + qcom,wave-play-rate-us = <4878>; + qcom,wave-shape = "sine"; + qcom,lra-high-z = "opt1"; + qcom,lra-auto-res-mode = "qwd"; + qcom,lra-res-cal-period = <4>; + qcom,effect-max = <3>; + qcom,effect-arry = [3e 88 00 00 00 00 00 00 + 3e 3e be 88 00 00 00 00 + 3e 3e 3e be a0 00 00 00]; + status = "okay"; }; &ufsphy_mem { @@ -284,9 +283,9 @@ }; &pmi8998_switch2 { - pinctrl-names = "led_enable", "led_disable"; - pinctrl-0 = <&flash_led3_iris_en>; - pinctrl-1 = <&flash_led3_iris_dis>; + pinctrl-names = "led_enable", "led_disable"; + pinctrl-0 = <&flash_led3_iris_en>; + pinctrl-1 = <&flash_led3_iris_dis>; }; &vendor{ @@ -313,8 +312,7 @@ qcom,fcc-hot-temp-delta = <1650000>; qcom,fcc-cool-temp-delta = <2310000>; qcom,auto-recharge-soc; - qcom,sw-jeita-enable; - qcom,dynamic-fv-enable; + qcom,sw-jeita-enable; qcom,use-ext-boost; qcom,wireless-support; qcom,thermal-mitigation @@ -364,8 +362,6 @@ qcom,fg-esr-clamp-mohms = <60>; qcom,fg-batt-temp-delta = <6>; qcom,battery-data = <&mtp_batterydata>; - qcom,slope-limit-temp-threshold = <100>; - qcom,slope-limit-coeffs = <10 11 12 13>; }; &smb1355_charger_0 { @@ -401,9 +397,9 @@ interrupts = <63 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; - pinctrl-0 = <&nfc_int_active - &nfc_enable_active - &nfc_clk_default>; + pinctrl-0 = <&nfc_int_active + &nfc_enable_active + &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; clock-names = "ref_clk"; @@ -411,16 +407,16 @@ }; &qupv3_se5_i2c { - status = "ok"; - /*smart PA*/ - tas2557@4c{ - compatible = "ti,tas2557"; - reg = <0x4c>; - ti,cdc-reset-gpio = <&tlmm 76 0>; - ti,irq-gpio = <&tlmm 30 0>; - ti,i2s-bits = <16>; - ti,bypass-tmax = <0>; - }; + status = "ok"; + /*smart PA*/ + tas2557@4c{ + compatible = "ti,tas2557"; + reg = <0x4c>; + ti,cdc-reset-gpio = <&tlmm 76 0>; + ti,irq-gpio = <&tlmm 30 0>; + ti,i2s-bits = <16>; + ti,bypass-tmax = <0>; + }; }; &qupv3_se10_i2c { @@ -467,48 +463,13 @@ fts,key-num = <2>; fts,key-codes = <158 139>; fts,config-array-size = <1>; - fts,check-display-name; fts,default-fw-name = "st_fts_e5.ftb"; - fts,touch-up-threshold-min = <20>; - fts,touch-up-threshold-max = <170>; - fts,touch-up-threshold-def = <20>; - fts,touch-tolerance-min = <5>; - fts,touch-tolerance-max = <35>; - fts,touch-tolerance-def = <5>; - fts,edgefilter-leftrigt-def = <40>; - fts,edgefilter-topbottom-def = <40>; - fts,edgefilter-area-step1 = <100>; - fts,edgefilter-area-step2 = <150>; - fts,edgefilter-area-step3 = <250>; fts,cfg_0 { fts,tp-vendor = <0x52>; fts,fw-name = "st_fts_e5.ftb"; fts,limit-name = "stm_fts_production_limits.csv"; }; }; - focaltech@38 { - compatible = "focaltech,focal"; - reg = <0x38>; - interrupt-parent = <&tlmm>; - interrupts = <31 0>; - vddio-supply = <&disp_vddio_vreg>; - avdd-supply = <&pm8998_l28>; - - focaltech,reset-gpio = <&tlmm 32 0x01>; - focaltech,irq-gpio = <&tlmm 31 0x02>; - focaltech,max-touch-number = <10>; - focaltech,display-coords = <0 0 1080 2340>; - focaltech,project-name = "e5"; - focaltech,lockdown-info-addr = <0x1FFD0>; - focaltech,reset-when-resume; - focaltech,open-min = <3000>; - focaltech,timeout-read-reg = <2000>; - focaltech,check-display-name; - pinctrl-names = "pmx_ts_active", "pmx_ts_suspend"; - pinctrl-0 = <&ts_active>; - pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; - /* focaltech,have-key; */ - }; atmel_mxt_ts_640u@4a { compatible = "atmel,mxt-ts"; reg = <0x4a>; @@ -942,29 +903,29 @@ }; &qupv3_se4_spi { - status = "ok"; - 4775_gps@89 { - compatible = "ssp,bcm4775"; - reg = <0>; - spi-max-frequency = <12000000>; - ssp-host-req = <&tlmm 129 0x00>; - ssp-mcu-resp = <&tlmm 132 0x00>; - ssp-mcu-req = <&tlmm 143 0x00>; - gps,nstandby = <&tlmm 133 0x00>; - interrupt-parent = <&tlmm>; - interrupts = <129 0>; - spi-cpha; - spi-cpol; - interrupt-names = "gps_irq"; - gps,power_enable = <&pm8998_gpios 19 GPIO_ACTIVE_HIGH>; - pinctrl-names = "gps_active", "gps_suspend"; - pinctrl-0 = <&gps_int_active - &gps_enable_active - &gps_clk_default - &gps_power_default - &gps_resp_active>; - pinctrl-1 = <&gps_int_suspend &gps_enable_suspend &gps_resp_suspend>; - }; + status = "ok"; + 4775_gps@89 { + compatible = "ssp,bcm4775"; + reg = <0>; + spi-max-frequency = <12000000>; + ssp-host-req = <&tlmm 129 0x00>; + ssp-mcu-resp = <&tlmm 132 0x00>; + ssp-mcu-req = <&tlmm 143 0x00>; + gps,nstandby = <&tlmm 133 0x00>; + interrupt-parent = <&tlmm>; + interrupts = <129 0>; + spi-cpha; + spi-cpol; + interrupt-names = "gps_irq"; + gps,power_enable = <&pm8998_gpios 19 GPIO_ACTIVE_HIGH>; + pinctrl-names = "gps_active", "gps_suspend"; + pinctrl-0 = <&gps_int_active + &gps_enable_active + &gps_clk_default + &gps_power_default + &gps_resp_active>; + pinctrl-1 = <&gps_int_suspend &gps_enable_suspend &gps_resp_suspend>; + }; }; &soc { diff --git a/arch/arm64/boot/dts/qcom/perseus-p1_2-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/perseus-p1_2-camera-sensor-mtp.dtsi index a04a1b862453..34ed3869e745 100644 --- a/arch/arm64/boot/dts/qcom/perseus-p1_2-camera-sensor-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/perseus-p1_2-camera-sensor-mtp.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -26,164 +26,164 @@ }; }; - &eeprom_rear { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,eeprom"; - slave-addr = <0xa0>; - i2c-freq-mode = <1>; - num-blocks = <1>; - page0 = <0 0 0 0 0 0>; - poll0 = <0 0 0 0 0 0>; - mem0 = <8192 0x00 2 0 1 0>; - qcom,cam-power-seq-type = "cam_vio"; - qcom,cam-power-seq-cfg-val = <1>; - qcom,cam-power-seq-delay = <1>; - cam_vio-supply = <&camera_vio_ldo>; - cam_clk-supply = <&titan_top_gdsc>; - regulator-names = "cam_vio", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <0 0>; - rgltr-max-voltage = <0 0>; - rgltr-load-current = <0 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active - &cam_sensor_rear_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear_suspend>; - gpios = <&tlmm 13 0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <1>; - gpio-req-tbl-label = "CAMIF_MCLK0"; - cci-master = <0>; - status = "ok"; - clocks = <&clock_camcc CAM_CC_MCLK0_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + &eeprom_rear { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + slave-addr = <0xa0>; + i2c-freq-mode = <1>; + num-blocks = <1>; + page0 = <0 0 0 0 0 0>; + poll0 = <0 0 0 0 0 0>; + mem0 = <8192 0x00 2 0 1 0>; + qcom,cam-power-seq-type = "cam_vio"; + qcom,cam-power-seq-cfg-val = <1>; + qcom,cam-power-seq-delay = <1>; + cam_vio-supply = <&camera_vio_ldo>; + cam_clk-supply = <&titan_top_gdsc>; + regulator-names = "cam_vio", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <0 0>; + rgltr-max-voltage = <0 0>; + rgltr-load-current = <0 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_rear_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_rear_suspend>; + gpios = <&tlmm 13 0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <1>; + gpio-req-tbl-label = "CAMIF_MCLK0"; + cci-master = <0>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; - &eeprom_rear_aux { - cell-index = <1>; - reg = <0x1>; - compatible = "qcom,eeprom"; - slave-addr = <0xa0>; - i2c-freq-mode = <1>; - num-blocks = <1>; - page0 = <0 0 0 0 0 0>; - poll0 = <0 0 0 0 0 0>; - mem0 = <8192 0x00 2 0 1 0>; - qcom,cam-power-seq-type = "cam_vio"; - qcom,cam-power-seq-cfg-val = <1>; - qcom,cam-power-seq-delay = <1>; - cam_vio-supply = <&camera_vio_ldo>; - cam_clk-supply = <&titan_top_gdsc>; - regulator-names = "cam_vio", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <0 0>; - rgltr-max-voltage = <0 0>; - rgltr-load-current = <0 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active - &cam_sensor_rear2_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear2_suspend>; - gpios = <&tlmm 13 0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <1>; - gpio-req-tbl-label = "CAMIF_MCLK0"; - cci-master = <0>; - status = "ok"; - clocks = <&clock_camcc CAM_CC_MCLK0_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + &eeprom_rear_aux { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + slave-addr = <0xa0>; + i2c-freq-mode = <1>; + num-blocks = <1>; + page0 = <0 0 0 0 0 0>; + poll0 = <0 0 0 0 0 0>; + mem0 = <8192 0x00 2 0 1 0>; + qcom,cam-power-seq-type = "cam_vio"; + qcom,cam-power-seq-cfg-val = <1>; + qcom,cam-power-seq-delay = <1>; + cam_vio-supply = <&camera_vio_ldo>; + cam_clk-supply = <&titan_top_gdsc>; + regulator-names = "cam_vio", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <0 0>; + rgltr-max-voltage = <0 0>; + rgltr-load-current = <0 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_rear2_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_rear2_suspend>; + gpios = <&tlmm 13 0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <1>; + gpio-req-tbl-label = "CAMIF_MCLK0"; + cci-master = <0>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; - &eeprom_front { - cell-index = <2>; - reg = <0x2>; - compatible = "qcom,eeprom"; - slave-addr = <0xa8>; - i2c-freq-mode = <1>; - cam_vio-supply = <&camera_vio_ldo>; - cam_vana-supply = <&pmi8998_bob>; + &eeprom_front { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + slave-addr = <0xa8>; + i2c-freq-mode = <1>; + cam_vio-supply = <&camera_vio_ldo>; + cam_vana-supply = <&pmi8998_bob>; cam_vdig-supply = <&camera_vdig_ldo>; - cam_clk-supply = <&titan_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <0 3312000 1050000 0>; - rgltr-max-voltage = <0 3600000 1050000 0>; - rgltr-load-current = <0 80000 105000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active - &cam_sensor_front_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front_suspend>; - gpios = <&tlmm 15 0>, - <&tlmm 104 0>, + cam_clk-supply = <&titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <0 3312000 1050000 0>; + rgltr-max-voltage = <0 3600000 1050000 0>; + rgltr-load-current = <0 80000 105000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_front_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_suspend>; + gpios = <&tlmm 15 0>, + <&tlmm 104 0>, <&pm8998_gpios 9 0>, - <&tlmm 29 0>; - gpio-reset = <1>; - gpio-vdig = <2>; - gpio-vana = <3>; - gpio-req-tbl-num = <0 1 2 3>; - gpio-req-tbl-flags = <1 0 0 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET2", - "CAM_VDIG2", - "CAM_VANA2"; - cci-master = <1>; - status = "ok"; - clocks = <&clock_camcc CAM_CC_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + <&tlmm 29 0>; + gpio-reset = <1>; + gpio-vdig = <2>; + gpio-vana = <3>; + gpio-req-tbl-num = <0 1 2 3>; + gpio-req-tbl-flags = <1 0 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2", + "CAM_VDIG2", + "CAM_VANA2"; + cci-master = <1>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; - &eeprom_ir { - cell-index = <3>; - reg = <0x03>; - compatible = "qcom,eeprom"; - slave-addr = <0xA2>; - i2c-freq-mode = <1>; - cam_vio-supply = <&camera_vio_ldo>; - cam_vana-supply = <&pmi8998_bob>; - cam_clk-supply = <&titan_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <0 3312000 0>; - rgltr-max-voltage = <0 3600000 0>; - rgltr-load-current = <0 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_ir_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_ir_suspend>; - gpios = <&tlmm 14 0>, - <&tlmm 25 0>, - <&tlmm 27 0>; - gpio-reset = <1>; - gpio-vana = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3", - "CAM_VANA3"; - sensor-mode = <0>; - cci-master = <0>; - status = "ok"; - clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + &eeprom_ir { + cell-index = <3>; + reg = <0x03>; + compatible = "qcom,eeprom"; + slave-addr = <0xA2>; + i2c-freq-mode = <1>; + cam_vio-supply = <&camera_vio_ldo>; + cam_vana-supply = <&pmi8998_bob>; + cam_clk-supply = <&titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <0 3312000 0>; + rgltr-max-voltage = <0 3600000 0>; + rgltr-load-current = <0 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_ir_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_ir_suspend>; + gpios = <&tlmm 14 0>, + <&tlmm 25 0>, + <&tlmm 27 0>; + gpio-reset = <1>; + gpio-vana = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3", + "CAM_VANA3"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; &cam_cci { qcom,cam-sensor@0 { @@ -339,47 +339,47 @@ clock-rates = <24000000>; }; - qcom,cam-sensor@3 { - cell-index = <3>; - compatible = "qcom,cam-sensor"; - reg = <0x03>; - csiphy-sd-index = <1>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <0>; + qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + reg = <0x03>; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; led-flash-src = <&led_flash_front_raw>; - eeprom-src = <&eeprom_ir>; - cam_vio-supply = <&camera_vio_ldo>; - cam_vana-supply = <&pmi8998_bob>; - cam_clk-supply = <&titan_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <0 3312000 0>; - rgltr-max-voltage = <0 3600000 0>; - rgltr-load-current = <0 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_ir_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_ir_suspend>; - gpios = <&tlmm 14 0>, //mclk - <&tlmm 25 0>, //reset - <&tlmm 27 0>; //avdd - gpio-reset = <1>; - gpio-vana = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3", - "CAM_VANA3"; - sensor-mode = <0>; - cci-master = <0>; - status = "ok"; - clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + eeprom-src = <&eeprom_ir>; + cam_vio-supply = <&camera_vio_ldo>; + cam_vana-supply = <&pmi8998_bob>; + cam_clk-supply = <&titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <0 3312000 0>; + rgltr-max-voltage = <0 3600000 0>; + rgltr-load-current = <0 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_ir_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_ir_suspend>; + gpios = <&tlmm 14 0>, //mclk + <&tlmm 25 0>, //reset + <&tlmm 27 0>; //avdd + gpio-reset = <1>; + gpio-vana = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3", + "CAM_VANA3"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; diff --git a/arch/arm64/boot/dts/qcom/perseus-p1_2.dtsi b/arch/arm64/boot/dts/qcom/perseus-p1_2.dtsi index f6555066d5e0..ed561186ceeb 100644 --- a/arch/arm64/boot/dts/qcom/perseus-p1_2.dtsi +++ b/arch/arm64/boot/dts/qcom/perseus-p1_2.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -16,10 +16,10 @@ #include "perseus-p1_2-camera-sensor-mtp.dtsi" &qupv3_se5_i2c { - status = "ok"; - tas2557@4c{ - ti,cdc-reset-gpio = <&tlmm 69 0>; - }; + status = "ok"; + tas2557@4c{ + ti,cdc-reset-gpio = <&tlmm 69 0>; + }; }; &soc { diff --git a/arch/arm64/boot/dts/qcom/polaris-audio-overlay.dtsi b/arch/arm64/boot/dts/qcom/polaris-audio-overlay.dtsi index 7001e4b32f4d..ecab0a2f1ba6 100644 --- a/arch/arm64/boot/dts/qcom/polaris-audio-overlay.dtsi +++ b/arch/arm64/boot/dts/qcom/polaris-audio-overlay.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -33,11 +33,13 @@ "MIC BIAS4", "Analog Mic5"; qcom,wsa-max-devs = <0>; - qcom,euro-us-hw-auto-switch; qcom,hw-auto-sw-en-gpio = <&sbu_mic_oe>; qcom,uart-audio-sw-gpio = <&sbu_uart_en>; qcom,adc2-switch-gpio = <&adc2_switch_gpio>; + qcom,subpcb-id-gpio = <&subpcb_id_gpio>; + qcom,subpcb-id-gpio-num = <&tlmm 44 0>; qcom,msm-mbhc-usbc-audio-supported = <1>; + qcom,usbc-analog-en2-gpio = <&tlmm 43 0>; pinctrl-names = "aud_active", "aud_sleep", "quat-mi2s-active", "quat-mi2s-sleep", "quat-tdm-active", "quat-tdm-sleep"; @@ -75,6 +77,13 @@ pinctrl-1 = <&adc2_switch_gpio_idle>; }; + subpcb_id_gpio: msm_cdc_pinctrl@44 { + compatible = "qcom,msm-cdc-pinctrl"; + pinctrl-names = "aud_active", "aud_sleep"; + pinctrl-0 = <&subpcb_id_gpio_active>; + pinctrl-1 = <&subpcb_id_gpio_idle>; + }; + vreg_pa_p_5p0: vreg_pa_p_5p0 { compatible = "regulator-fixed"; regulator-name = "vreg_pa_p_5p0"; diff --git a/arch/arm64/boot/dts/qcom/polaris-p0-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/polaris-p0-pinctrl.dtsi index 43673bc28ed4..789bad8e0f44 100644 --- a/arch/arm64/boot/dts/qcom/polaris-p0-pinctrl.dtsi +++ b/arch/arm64/boot/dts/qcom/polaris-p0-pinctrl.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -176,6 +176,35 @@ }; }; + subpcb_id_gpio_ctrl { + subpcb_id_gpio_active: subpcb_id_gpio_active { + mux { + pins = "gpio44"; + function = "gpio"; + }; + config { + pins = "gpio44"; + drive-strength = <2>; + bias-disable; + input-enable; + }; + + }; + + subpcb_id_gpio_idle: subpcb_id_gpio_idle { + mux { + pins = "gpio44"; + function = "gpio"; + }; + config { + pins = "gpio44"; + drive-strength = <2>; + bias-pull-up; + input-enable; + }; + }; + }; + adc2_switch_gpio_ctrl { adc2_switch_gpio_idle: adc2_switch_idle { mux { diff --git a/arch/arm64/boot/dts/qcom/polaris-p0.dtsi b/arch/arm64/boot/dts/qcom/polaris-p0.dtsi index 7ce243380fb4..5839fe3baee2 100644 --- a/arch/arm64/boot/dts/qcom/polaris-p0.dtsi +++ b/arch/arm64/boot/dts/qcom/polaris-p0.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -31,11 +31,11 @@ }; &reserved_memory { - ramdump_fb_mem: ramdump_fb_region@af000000 { - compatible = "removed-dma-pool"; - no-map; - reg = <0 0xaf000000 0 0x1000000>; - }; + ramdump_fb_mem: ramdump_fb_region@af000000 { + compatible = "removed-dma-pool"; + no-map; + reg = <0 0xaf000000 0 0x1000000>; + }; }; &vendor { @@ -139,12 +139,12 @@ }; tp_vddio_vreg: tp_vddio_vreg { - compatible = "regulator-fixed"; - regulator-name = "tp_vddio_vreg"; - startup-delay-us = <4000>; - enable-active-high; - regulator-boot-on; - gpio = <&tlmm 23 0>; + compatible = "regulator-fixed"; + regulator-name = "tp_vddio_vreg"; + startup-delay-us = <4000>; + enable-active-high; + regulator-boot-on; + gpio = <&tlmm 23 0>; }; thermal-message { @@ -194,18 +194,18 @@ }; &pmi8998_haptics { - qcom,vmax-mv = <2552>; - qcom,lra-auto-mode; - qcom,wave-play-rate-us = <4878>; - qcom,wave-shape = "sine"; - qcom,lra-high-z = "opt1"; - qcom,lra-auto-res-mode = "qwd"; - qcom,lra-res-cal-period = <4>; - qcom,effect-max = <3>; - qcom,effect-arry = [3e 3e be a0 00 00 00 00 - 3e 3e 3e be be 00 00 00 - 3e 3e 3e 3e be be a0 90]; - status = "okay"; + qcom,vmax-mv = <2552>; + qcom,lra-auto-mode; + qcom,wave-play-rate-us = <4878>; + qcom,wave-shape = "sine"; + qcom,lra-high-z = "opt1"; + qcom,lra-auto-res-mode = "qwd"; + qcom,lra-res-cal-period = <4>; + qcom,effect-max = <3>; + qcom,effect-arry = [3e 3e be a0 00 00 00 00 + 3e 3e 3e be be 00 00 00 + 3e 3e 3e 3e be be a0 90]; + status = "okay"; }; &mdss_mdp { @@ -273,9 +273,9 @@ }; &pmi8998_switch2 { - pinctrl-names = "led_enable", "led_disable"; - pinctrl-0 = <&flash_led3_iris_en>; - pinctrl-1 = <&flash_led3_iris_dis>; + pinctrl-names = "led_enable", "led_disable"; + pinctrl-0 = <&flash_led3_iris_en>; + pinctrl-1 = <&flash_led3_iris_dis>; }; &vendor{ @@ -302,8 +302,7 @@ qcom,fcc-hot-temp-delta = <1650000>; qcom,fcc-cool-temp-delta = <2310000>; qcom,auto-recharge-soc; - qcom,sw-jeita-enable; - qcom,dynamic-fv-enable; + qcom,sw-jeita-enable; qcom,wireless-flag; qcom,wireless-support; qcom,thermal-mitigation @@ -353,8 +352,6 @@ qcom,fg-esr-clamp-mohms = <60>; qcom,fg-batt-temp-delta = <6>; qcom,battery-data = <&mtp_batterydata>; - qcom,slope-limit-temp-threshold = <100>; - qcom,slope-limit-coeffs = <10 11 12 13>; }; &smb1355_charger_0 { @@ -388,9 +385,9 @@ interrupts = <63 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; - pinctrl-0 = <&nfc_int_active - &nfc_enable_active - &nfc_clk_default>; + pinctrl-0 = <&nfc_int_active + &nfc_enable_active + &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; clock-names = "ref_clk"; @@ -398,24 +395,24 @@ }; &qupv3_se5_i2c { - status = "ok"; - /*smart PA*/ - tas2559@4c{ - compatible = "ti,tas2559"; - reg = <0x4c>; - ti,tas2559-reset-gpio = <&tlmm 8 0>; - ti,tas2560-reset-gpio = <&tlmm 25 0>; - ti,tas2559-irq-gpio = <&tlmm 24 0>; - ti,tas2560-irq-gpio = <&tlmm 30 0>; - ti,tas2559-addr = <0x4c>; - ti,tas2560-addr = <0x4d>; - ti,tas2559-channel = <0>; /* 0, left; 1, right */ - ti,tas2560-channel = <1>; /* 0, left; 1, right */ - ti,ycrc-enable = <1>; /* 0, disable; non-zero, enable */ - ti,echo-ref = <0>; /* 0, left channel; 1, right channel; 2, both */ - ti,bit-rate = <16>; /* 16, 20, 24, 32 */ - status = "ok"; - }; + status = "ok"; + /*smart PA*/ + tas2559@4c{ + compatible = "ti,tas2559"; + reg = <0x4c>; + ti,tas2559-reset-gpio = <&tlmm 8 0>; + ti,tas2560-reset-gpio = <&tlmm 25 0>; + ti,tas2559-irq-gpio = <&tlmm 24 0>; + ti,tas2560-irq-gpio = <&tlmm 30 0>; + ti,tas2559-addr = <0x4c>; + ti,tas2560-addr = <0x4d>; + ti,tas2559-channel = <0>; /* 0, left; 1, right */ + ti,tas2560-channel = <1>; /* 0, left; 1, right */ + ti,ycrc-enable = <1>; /* 0, disable; non-zero, enable */ + ti,echo-ref = <0>; /* 0, left channel; 1, right channel; 2, both */ + ti,bit-rate = <16>; /* 16, 20, 24, 32 */ + status = "ok"; + }; }; @@ -457,9 +454,6 @@ pinctrl-names = "pmx_ts_active", "pmx_ts_suspend"; pinctrl-0 = <&ts_active>; pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; - /*synaptics,palm-rx-channel = <10>;*/ - /*synaptics,palm-rx-area = <400>;*/ - /*synaptics,palm-tx-disable = <4>;*/ synaptics,drm-dsi-reset = <&tlmm 6 0>; synaptics,reset-gpio = <&tlmm 99 0x00>; synaptics,irq-gpio = <&tlmm 125 0x2008>; diff --git a/arch/arm64/boot/dts/qcom/polaris-p2-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/polaris-p2-pinctrl.dtsi index 1cabb9e10dcf..82dd76e4b4f5 100644 --- a/arch/arm64/boot/dts/qcom/polaris-p2-pinctrl.dtsi +++ b/arch/arm64/boot/dts/qcom/polaris-p2-pinctrl.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -14,28 +14,28 @@ #include "polaris-p1-pinctrl.dtsi" &tlmm { - atest_usb13_active: atest_usb13_active { - mux { - pins = "gpio8"; - function = "gpio"; - }; - config { - pins = "gpio8"; - drive-strength = <12>; - bias-pull-up; - }; - }; + atest_usb13_active: atest_usb13_active { + mux { + pins = "gpio8"; + function = "gpio"; + }; + config { + pins = "gpio8"; + drive-strength = <12>; + bias-pull-up; + }; + }; - atest_usb13_suspend: atest_usb13_suspend { - mux { - pins = "gpio8"; - function = "gpio"; - }; - config { - pins = "gpio8"; - bias-pull-down; - drive-strength = <2>; - }; - }; + atest_usb13_suspend: atest_usb13_suspend { + mux { + pins = "gpio8"; + function = "gpio"; + }; + config { + pins = "gpio8"; + bias-pull-down; + drive-strength = <2>; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/polaris-p2.dtsi b/arch/arm64/boot/dts/qcom/polaris-p2.dtsi index 8d6807930dfb..24a45b04c7bd 100644 --- a/arch/arm64/boot/dts/qcom/polaris-p2.dtsi +++ b/arch/arm64/boot/dts/qcom/polaris-p2.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -13,15 +13,15 @@ */ #include "polaris-p1.dtsi" &qupv3_se5_i2c { - /*smart PA*/ - tas2559@4c{ - ti,tas2559-reset-gpio = <&tlmm 14 0>; - }; + /*smart PA*/ + tas2559@4c{ + ti,tas2559-reset-gpio = <&tlmm 14 0>; + }; }; &qusb_phy0 { - pinctrl-names = "atest_usb13_suspend","atest_usb13_active"; - pinctrl-0 = <&atest_usb13_suspend>; - pinctrl-1 = <&atest_usb13_active>; + pinctrl-names = "atest_usb13_suspend","atest_usb13_active"; + pinctrl-0 = <&atest_usb13_suspend>; + pinctrl-1 = <&atest_usb13_active>; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-sde-display.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sde-display.dtsi index 0a01596b7b34..aa3976d33c32 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-sde-display.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-sde-display.dtsi @@ -1,5 +1,4 @@ /* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -763,12 +762,12 @@ }; &dsi_sim_vid { - qcom,mdss-dsi-t-clk-post = <0x0e>; - qcom,mdss-dsi-t-clk-pre = <0x34>; + qcom,mdss-dsi-t-clk-post = <0x0d>; + qcom,mdss-dsi-t-clk-pre = <0x2d>; qcom,mdss-dsi-display-timings { timing@0{ - qcom,mdss-dsi-panel-phy-timings = [00 22 08 08 24 24 08 - 08 05 03 04 00]; + qcom,mdss-dsi-panel-phy-timings = [00 1c 07 07 23 21 07 + 07 05 03 04 00]; qcom,display-topology = <1 0 1>, <2 0 1>; qcom,default-topology-index = <0>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-sde-display.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-sde-display.dtsi index 180b5c8f851e..20a2aa94f84d 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-sde-display.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-sde-display.dtsi @@ -1,5 +1,5 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -84,11 +84,11 @@ qcom,panel-supply-entry@0 { reg = <0>; qcom,supply-name = "vddio"; - qcom,supply-min-voltage = <1900000>; - qcom,supply-max-voltage = <1900000>; + qcom,supply-min-voltage = <1800000>; + qcom,supply-max-voltage = <1800000>; qcom,supply-enable-load = <62000>; qcom,supply-disable-load = <80>; - qcom,supply-post-on-sleep = <1>; + //qcom,supply-post-on-sleep = <20>; }; qcom,panel-supply-entry@1 { @@ -548,15 +548,6 @@ qcom,mdss-dsi-t-clk-post = <0x0E>; qcom,mdss-dsi-t-clk-pre = <0x36>; - qcom,esd-check-enabled; - qcom,mdss-dsi-panel-status-check-mode = "reg_read"; - qcom,mdss-dsi-panel-status-command = [ - 06 01 00 00 00 00 01 0A - 06 01 00 00 00 00 01 F9]; - qcom,mdss-dsi-panel-status-command-state = "dsi_hs_mode"; - qcom,mdss-dsi-panel-status-value = <0x1C 0x00>; - qcom,mdss-dsi-panel-status-read-length = <1 1>; - qcom,mdss-dsi-display-timings { timing@0{ qcom,mdss-dsi-panel-phy-timings = [00 23 09 09 26 24 09 diff --git a/arch/arm64/boot/dts/qcom/ursa-audio-overlay.dtsi b/arch/arm64/boot/dts/qcom/ursa-audio-overlay.dtsi index 4c6f20e2b081..d59f8ce9be92 100644 --- a/arch/arm64/boot/dts/qcom/ursa-audio-overlay.dtsi +++ b/arch/arm64/boot/dts/qcom/ursa-audio-overlay.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -23,14 +23,14 @@ "AMIC2_EXT_0", "MIC BIAS2", "MIC BIAS2", "Headset Mic", "AMIC2_EXT_1", "MIC BIAS4", - "MIC BIAS4", "Headset Mic2", + "MIC BIAS4", "Headset Mic2", "AMIC3", "MIC BIAS1", "MIC BIAS1", "ANCRight Headset Mic", "AMIC1", "MIC BIAS4", "MIC BIAS4", "ANCLeft Headset Mic"; qcom,wsa-max-devs = <0>; - qcom,adc2-switch-gpio = <&adc2_switch_gpio>; + qcom,adc2-switch-gpio = <&adc2_switch_gpio>; qcom,msm-mbhc-usbc-audio-supported = <1>; qcom,usbc-analog-en2-gpio = <&tlmm 51 0>; pinctrl-names = "aud_active", "aud_sleep", @@ -48,10 +48,10 @@ }; &soc { - adc2_switch_gpio: msm_cdc_pinctrl@62 { - compatible = "qcom,msm-cdc-pinctrl"; - pinctrl-names = "aud_active", "aud_sleep"; - pinctrl-0 = <&adc2_switch_gpio_active>; - pinctrl-1 = <&adc2_switch_gpio_idle>; - }; + adc2_switch_gpio: msm_cdc_pinctrl@62 { + compatible = "qcom,msm-cdc-pinctrl"; + pinctrl-names = "aud_active", "aud_sleep"; + pinctrl-0 = <&adc2_switch_gpio_active>; + pinctrl-1 = <&adc2_switch_gpio_idle>; + }; }; diff --git a/arch/arm64/boot/dts/qcom/ursa-p0-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/ursa-p0-camera-sensor-mtp.dtsi index fb0e6e847910..6364f00cc700 100644 --- a/arch/arm64/boot/dts/qcom/ursa-p0-camera-sensor-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/ursa-p0-camera-sensor-mtp.dtsi @@ -1,6 +1,6 @@ /* * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -456,7 +456,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - led-flash-src = <&led_flash_rear_aux>; + led-flash-src = <&led_flash_rear_aux>; actuator-src = <&actuator_rear_aux>; eeprom-src = <&eeprom_rear_aux>; cam_vdig-supply = <&camera_vdig_ldo>; diff --git a/arch/arm64/boot/dts/qcom/ursa-p0.dtsi b/arch/arm64/boot/dts/qcom/ursa-p0.dtsi index b738715f3d8e..cfeb9b803d9d 100644 --- a/arch/arm64/boot/dts/qcom/ursa-p0.dtsi +++ b/arch/arm64/boot/dts/qcom/ursa-p0.dtsi @@ -1,6 +1,6 @@ /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. - * Copyright (C) 2019 XiaoMi, Inc. + * Copyright (C) 2018 XiaoMi, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -15,7 +15,8 @@ #include #include "sdm845-pmic-overlay.dtsi" #include "sdm845-pinctrl-overlay.dtsi" -#include "xiaomi-sde-display.dtsi" +#include "sdm845-xiaomi-common.dtsi" +//#include "dipper-camera-sensor-mtp.dtsi" #include "ursa-p0-camera-sensor-mtp.dtsi" &qupv3_se10_i2c { @@ -31,11 +32,11 @@ }; &reserved_memory { - ramdump_fb_mem: ramdump_fb_region@af000000 { - compatible = "removed-dma-pool"; - no-map; - reg = <0 0xaf000000 0 0x1000000>; - }; + ramdump_fb_mem: ramdump_fb_region@af000000 { + compatible = "removed-dma-pool"; + no-map; + reg = <0 0xaf000000 0 0x1000000>; + }; }; &vendor { @@ -156,53 +157,45 @@ qcom,mdss-dsi-bl-max-level = <1023>; qcom,platform-reset-gpio = <&tlmm 6 0>; qcom,platform-te-gpio = <&tlmm 10 0>; - qcom,esd-check-enabled; - qcom,mdss-dsi-panel-status-check-mode = "reg_read"; - qcom,mdss-dsi-panel-status-command = [ - 06 01 00 01 00 00 01 0A - 06 01 00 01 00 00 01 0D]; - qcom,mdss-dsi-panel-status-command-state = "dsi_hs_mode"; - qcom,mdss-dsi-panel-status-value = <0x9c 0x00>; - qcom,mdss-dsi-panel-status-read-length = <1 1>; }; &dsi_dual_nt35597_video { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; - qcom,panel-mode-gpio = <&tlmm 52 0>; - qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; + qcom,panel-mode-gpio = <&tlmm 52 0>; + qcom,platform-reset-gpio = <&tlmm 6 0>; }; &dsi_dual_nt35597_cmd { - qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; - qcom,panel-mode-gpio = <&tlmm 52 0>; - qcom,platform-reset-gpio = <&tlmm 6 0>; - qcom,platform-te-gpio = <&tlmm 10 0>; + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-dsi-mode-sel-gpio-state = "dual_port"; + qcom,panel-mode-gpio = <&tlmm 52 0>; + qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,platform-te-gpio = <&tlmm 10 0>; }; &dsi_gvo_fhd_rm69299_cmd { - qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <1023>; - qcom,platform-reset-gpio = <&tlmm 6 0>; - qcom,platform-te-gpio = <&tlmm 10 0>; + qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <1023>; + qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,platform-te-gpio = <&tlmm 10 0>; }; &dsi_tianma_fhd_rm69299_cmd { - qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <1023>; - qcom,platform-reset-gpio = <&tlmm 6 0>; - qcom,platform-te-gpio = <&tlmm 10 0>; + qcom,panel-supply-entries = <&dsi_amoled_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <1023>; + qcom,platform-reset-gpio = <&tlmm 6 0>; + qcom,platform-te-gpio = <&tlmm 10 0>; }; &dsi_sim_vid { @@ -220,18 +213,18 @@ }; &pmi8998_haptics { - qcom,vmax-mv = <2552>; - qcom,lra-auto-mode; - qcom,wave-play-rate-us = <4878>; - qcom,wave-shape = "sine"; - qcom,lra-high-z = "opt1"; - qcom,lra-auto-res-mode = "qwd"; - qcom,lra-res-cal-period = <4>; - qcom,effect-max = <3>; - qcom,effect-arry = [3e 3e be 00 00 00 00 00 - 3e 3e 3e be be 00 00 00 - 3e 3e 3e 3e be be 00 00]; - status = "okay"; + qcom,vmax-mv = <2552>; + qcom,lra-auto-mode; + qcom,wave-play-rate-us = <4878>; + qcom,wave-shape = "sine"; + qcom,lra-high-z = "opt1"; + qcom,lra-auto-res-mode = "qwd"; + qcom,lra-res-cal-period = <4>; + qcom,effect-max = <3>; + qcom,effect-arry = [3e 3e be 00 00 00 00 00 + 3e 3e 3e be be 00 00 00 + 3e 3e 3e 3e be be 00 00]; + status = "okay"; }; &mdss_mdp { @@ -300,9 +293,9 @@ }; &pmi8998_switch2 { - pinctrl-names = "led_enable", "led_disable"; - pinctrl-0 = <&flash_led3_iris_en>; - pinctrl-1 = <&flash_led3_iris_dis>; + pinctrl-names = "led_enable", "led_disable"; + pinctrl-0 = <&flash_led3_iris_en>; + pinctrl-1 = <&flash_led3_iris_dis>; }; &vendor{ @@ -324,20 +317,20 @@ &pmi8998_gpios { lm3644_pwm { lm3644_pwm_default: lm3644_pwm_default { - pins = "gpio2"; - function = "func1"; - bias-disable; - output-low; - input-disable; - drive-push-pull; - qcom,drive-strength = <2>; - power-source = <0>; + pins = "gpio2"; + function = "func1"; + bias-disable; + output-low; + input-disable; + drive-push-pull; + qcom,drive-strength = <2>; + power-source = <0>; }; lm3644_pwm_disabled: lm3644_pwm_disabled { - pins = "gpio2"; - function = "normal"; - bias-high-impedance; + pins = "gpio2"; + function = "normal"; + bias-high-impedance; }; }; @@ -369,7 +362,6 @@ qcom,fcc-cool-temp-delta = <2100000>; qcom,auto-recharge-soc; qcom,sw-jeita-enable; - qcom,dynamic-fv-enable; qcom,thermal-mitigation = <1800000 1600000 1400000 1200000 1000000 1000000 1000000>; qcom,thermal-mitigation-dcp @@ -403,18 +395,7 @@ qcom,fg-jeita-thresholds = <0 15 45 60>; qcom,fg-esr-clamp-mohms = <60>; qcom,fg-batt-temp-delta = <6>; - qcom,optimize-sram; - qcom,optimize-sram-seq = < - 0x9 0x3 0x2 - 0xA 0x0 0x1 - 0xA 0x1 0x0 - 0xA 0x2 0x6 - 0xA 0x3 0x20 - 0xC 0x1 0x12>; qcom,battery-data = <&mtp_batterydata>; - qcom,fg-rconn-mohms = <10>; - qcom,slope-limit-temp-threshold = <100>; - qcom,slope-limit-coeffs = <10 11 12 13>; }; &pmi8998_pwm_1 { @@ -428,13 +409,13 @@ }; &smb1355_charger_0 { - status = "ok"; - qcom,enable-ctm; + status = "ok"; + qcom,enable-ctm; }; &smb1355_charger_1 { - status = "ok"; - qcom,enable-ctm; + status = "ok"; + qcom,enable-ctm; }; &qupv3_se9_2uart { @@ -460,9 +441,9 @@ interrupts = <63 0>; interrupt-names = "nfc_irq"; pinctrl-names = "nfc_active", "nfc_suspend"; - pinctrl-0 = <&nfc_int_active - &nfc_enable_active - &nfc_clk_default>; + pinctrl-0 = <&nfc_int_active + &nfc_enable_active + &nfc_clk_default>; pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; clock-names = "ref_clk"; @@ -543,7 +524,6 @@ // fts,y-offset = <300>; // fts,y-skip = <240>; fts,config-array-size = <1>; - fts,default-fw-name = "st_fts_e8.ftb"; fts,cfg_0 { fts,tp-vendor = <0x48>; fts,fw-name = "st_fts_e8.ftb";