Skip to content

Commit

Permalink
Merge branch 'WOA-Project:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@gus33000
gus33000 authored Jul 31, 2024
2 parents 32553b5 + e6b8798 commit e231600
Show file tree
Hide file tree
Showing 23 changed files with 2,872 additions and 771 deletions.
Binary file modified 8150/builtin/DSDT.aml
View file
Binary file not shown.
11 changes: 3 additions & 8 deletions 8150/shared-src/8150_AND/cust_touch.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,13 @@
// SPDX-License-Identifier: MIT
//

Name(TCSS, 1)

//
// HIDSPI Touch Driver
//
Device (TSPI)
{
Method(_HID) {
if(LEqual(TCSS, 1)) {
Return("MSHW0162")
}
else {
Return("MSHW0134")
}
Return("MSHW0162")
}
Name(_CID, "PNP0C51")
Alias(\_SB.PSUB, _SUB)
Expand Down Expand Up @@ -173,6 +166,8 @@ Device (TSPI)
{
Store(DBUF, \_SB.PEP0.FLD0)
}

Store(0, FLAG)
}

Method(_PS3, 0x0, NotSerialized)
Expand Down
56 changes: 43 additions & 13 deletions 8150/shared-src/8150_AND/cust_touch_resources.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,33 +58,51 @@ Scope(\_SB_.PEP0)
{
"DSTATE", 0,

Package()
{
"PMICVREGVOTE",
Package()
{
"PPP_RESOURCE_ID_LDO9_A", // Voltage Regulator ID
1, // Voltage Regulator type = LDO
1200000, // Voltage 1.2V : microvolts ( V )
1, // Enable = Enable
0, // Power Mode = LPM
0, // Head Room
}
},

Package(){"DELAY", Package(){5}},

Package()
{
"TLMMGPIO", // Identifier: PMIC GPIO. Top Level Mode Mux (TLMM)
Package()
{
1, // Pin Number: GPIO_1
0, // Pin Number: GPIO_0
1, // State / OutVal: 0 == Low, 1 == High
0, // Function Select: 0 == Generic I/O Pin, non-zero == Alternate Function
1, // Direction: 0 == Input, 1 == Output
3, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
3, // Strength: 0 == 2 mA, 1 == 4 mA, 2 == 6 mA, 3 == 8 mA, 4 == 10 mA, 5 == 12 mA, 4 == 14 mA, 7 == 16 mA
0, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
0, // Strength: 0 == 2 mA, 1 == 4 mA, 2 == 6 mA, 3 == 8 mA, 4 == 10 mA, 5 == 12 mA, 4 == 14 mA, 7 == 16 mA
},
},

Package(){"DELAY", Package(){300}},
Package(){"DELAY", Package(){2}},

Package(){"DELAY", Package(){2}},

Package()
{
"TLMMGPIO", // Identifier: PMIC GPIO. Top Level Mode Mux (TLMM)
Package()
{
0, // Pin Number: GPIO_0
1, // Pin Number: GPIO_1
1, // State / OutVal: 0 == Low, 1 == High
0, // Function Select: 0 == Generic I/O Pin, non-zero == Alternate Function
1, // Direction: 0 == Input, 1 == Output
3, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
3, // Strength: 0 == 2 mA, 1 == 4 mA, 2 == 6 mA, 3 == 8 mA, 4 == 10 mA, 5 == 12 mA, 4 == 14 mA, 7 == 16 mA
0, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
0, // Strength: 0 == 2 mA, 1 == 4 mA, 2 == 6 mA, 3 == 8 mA, 4 == 10 mA, 5 == 12 mA, 4 == 14 mA, 7 == 16 mA
},
},
},
Expand All @@ -108,30 +126,42 @@ Scope(\_SB_.PEP0)
"TLMMGPIO", // Identifier: PMIC GPIO. Top Level Mode Mux (TLMM)
Package()
{
0, // Pin Number: GPIO_0
1, // Pin Number: GPIO_1
0, // State / OutVal: 0 == Low, 1 == High
0, // Function Select: 0 == Generic I/O Pin, non-zero == Alternate Function
1, // Direction: 0 == Input, 1 == Output
1, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
0, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
0, // Strength: 0 == 2 mA, 1 == 4 mA, 2 == 6 mA, 3 == 8 mA, 4 == 10 mA, 5 == 12 mA, 4 == 14 mA, 7 == 16 mA
},
},

Package(){"DELAY", Package(){10}},

Package()
{
"TLMMGPIO", // Identifier: PMIC GPIO. Top Level Mode Mux (TLMM)
Package()
{
1, // Pin Number: GPIO_1
0, // Pin Number: GPIO_0
0, // State / OutVal: 0 == Low, 1 == High
0, // Function Select: 0 == Generic I/O Pin, non-zero == Alternate Function
1, // Direction: 0 == Input, 1 == Output
1, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
0, // Pull Type: 0 == No Pull, 1 == Pull Down, 2 == Keeper, 3 == Pull Up
0, // Strength: 0 == 2 mA, 1 == 4 mA, 2 == 6 mA, 3 == 8 mA, 4 == 10 mA, 5 == 12 mA, 4 == 14 mA, 7 == 16 mA
},
},

Package()
{
"PMICVREGVOTE",
Package()
{
"PPP_RESOURCE_ID_LDO9_A", // Voltage Regulator ID
1, // Voltage Regulator type = LDO
0, // Voltage 1.2V : microvolts ( V )
0, // Enable = Disable
0, // Power Mode = LPM
0, // Head Room
},
},
}
}
})
Expand Down
2 changes: 1 addition & 1 deletion 8150/shared-src/8150_AND/cust_usb_sbux_mux.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
//
Device (CFSA)
{
Name (_HID, "FSA4480")
Name (_HID, "FSA04480")
Alias(\_SB.PSUB, _SUB)

Method (_CRS, 0x0, NotSerialized)
Expand Down
6 changes: 3 additions & 3 deletions 8150/shared-src/8150_AND/panelcfg.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Name (PCFG,
<PanelName>LGSW43416</PanelName>
<PanelDescription>LG Primary DSI Command Mode AMOLED Panel with DSC DV (1350x1800 24bpp)</PanelDescription>
<Group id='EDID Configuration'>
<ManufactureID>0xAF0D</ManufactureID>
<ProductCode>0x01C2</ProductCode>
<ManufactureID>0xE430</ManufactureID>
<ProductCode>0x3416</ProductCode>
<SerialNumber>0x000000</SerialNumber>
<WeekofManufacture>0x09</WeekofManufacture>
<YearofManufacture>0x13</YearofManufacture>
Expand Down Expand Up @@ -106,7 +106,7 @@ Name (PCFG,
<DSICmdUsingTrigger>False</DSICmdUsingTrigger>
<DSIInitMasterTime>120</DSIInitMasterTime>
<DSIEnterULPSPowerDown>False</DSIEnterULPSPowerDown>
<DSIBitClockFrequency>500000000</DSIBitClockFrequency>
<DSIBitClockFrequency>412000000</DSIBitClockFrequency>
<DisplayPrimaryFlags>0x00000009</DisplayPrimaryFlags>
<DisplayPowerSavingOverride>2</DisplayPowerSavingOverride>
<DSIClockHSForceRequest>1</DSIClockHSForceRequest>
Expand Down
6 changes: 3 additions & 3 deletions 8150/shared-src/8150_AND/panelcfg2.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Name (PCF2,
<PanelName>LGSW43416</PanelName>
<PanelDescription>LG Secondary DSI Command Mode AMOLED Panel with DSC DV (1350x1800 24bpp)</PanelDescription>
<Group id='EDID Configuration'>
<ManufactureID>0xAF0D</ManufactureID>
<ProductCode>0x01C2</ProductCode>
<ManufactureID>0xE430</ManufactureID>
<ProductCode>0x2416</ProductCode>
<SerialNumber>0x000000</SerialNumber>
<WeekofManufacture>0x09</WeekofManufacture>
<YearofManufacture>0x13</YearofManufacture>
Expand Down Expand Up @@ -106,7 +106,7 @@ Name (PCF2,
<DSICmdUsingTrigger>False</DSICmdUsingTrigger>
<DSIInitMasterTime>120</DSIInitMasterTime>
<DSIEnterULPSPowerDown>False</DSIEnterULPSPowerDown>
<DSIBitClockFrequency>500000000</DSIBitClockFrequency>
<DSIBitClockFrequency>412000000</DSIBitClockFrequency>
<DisplayPrimaryFlags>0x00000009</DisplayPrimaryFlags>
<DisplayPowerSavingOverride>2</DisplayPowerSavingOverride>
<DSIClockHSForceRequest>1</DSIClockHSForceRequest>
Expand Down
102 changes: 86 additions & 16 deletions 8150/shared-src/8150_AND/surface_additional_thermal_zones.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
//
ThermalZone (AMX1)
{
Name (_HID, "QCOM0562")
Name (_HID, "QCOM0563")
Name (_UID, 20)
Name(_TZD, Package (){\_SB.PEP0})
Method(_DEP) {
Expand All @@ -50,11 +50,11 @@ ThermalZone (AMX1)
//
ThermalZone (AMX2)
{
Name (_HID, "QCOM0563")
Name (_HID, "QCOM0566")
Name (_UID, 21)
Name(_TZD, Package (){\_SB.PEP0})
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC1})
Return (Package() {\_SB.PEP0, \_SB.ADC2})
}

Name (_TC1, 2)
Expand Down Expand Up @@ -85,11 +85,11 @@ ThermalZone (AMX3)
//
ThermalZone (AMX4)
{
Name (_HID, "QCOM0565")
Name (_HID, "QCOM0568")
Name (_UID, 23)

Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC1})
Return (Package() {\_SB.PEP0, \_SB.ADC2})
}
}

Expand All @@ -98,12 +98,12 @@ ThermalZone (AMX4)
//
ThermalZone (AMX5)
{
Name (_HID, "QCOM0566")
Name (_HID, "QCOM0567")
Name (_UID, 24)
Name (_CRT, 3258)
Name(_TZD, Package (){\_SB.PEP0})
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC1})
Return (Package() {\_SB.PEP0, \_SB.ADC2})
}
Name (_TC1, 2)
Name (_TC2, 2)
Expand All @@ -120,32 +120,32 @@ ThermalZone (AMX5)
//
ThermalZone (PMOD)
{
Name (_HID, "QCOM0567")
Name (_HID, "QCOM0562")
Name (_UID, 29)

Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC1})
Return (Package() {\_SB.PEP0, \_SB.ADC2})
}
}

//
// Qualcomm ADC Temperature Monitor Device 8 (PMIC_TEMP2)
//
ThermalZone (PMI1)
ThermalZone (PMB1)
{
Name (_HID, "QCOM0569")
Name (_HID, "QCOM0565")
Name (_UID, 12)
Name (_TZP, 300)

Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC1})
Return (Package() {\_SB.PEP0, \_SB.ADC2})
}
}

//
/*//
// Qualcomm ADC Temperature Monitor Device 9 (CHG_TEMP)
//
ThermalZone (PMI2)
ThermalZone (PMB2)
{
Name (_HID, "QCOM056A")
Name (_UID, 13)
Expand All @@ -154,9 +154,9 @@ ThermalZone (PMI2)
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC1})
}
}
}*/

//
/*//
// Qualcomm ADC Temperature Monitor Device 7 (SKIN_THERM)
//
ThermalZone (AUX)
Expand All @@ -168,4 +168,74 @@ ThermalZone (AUX)
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC1})
}
}*/

//
// Qualcomm ADC Temperature Monitor Device 10 (SYS_THERM4)
//
ThermalZone (PML1)
{
Name (_HID, "QCOM056A")
Name (_UID, 30)
Name (_TZP, 300)

Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC3})
}
}

/*//
// Qualcomm ADC Temperature Monitor Device 11 (SYS_THERM5)
//
ThermalZone (PML2)
{
Name (_HID, "QCOM056B")
Name (_UID, 30)
Name (_TZP, 300)
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC3})
}
}
//
// Qualcomm ADC Temperature Monitor Device 12 (SYS_THERM6)
//
ThermalZone (PMB3)
{
Name (_HID, "QCOM05D9")
Name (_UID, 31)
Name (_TZP, 300)
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC2})
}
}
//
// Qualcomm ADC Temperature Monitor Device 12 (SYS_THERM7)
//
ThermalZone (PMB4)
{
Name (_HID, "QCOM05DA")
Name (_UID, 32)
Name (_TZP, 300)
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC2})
}
}
//
// Qualcomm ADC Temperature Monitor Device 13 (SYS_THERM8)
//
ThermalZone (PML3)
{
Name (_HID, "QCOM05DB")
Name (_UID, 32)
Name (_TZP, 300)
Method(_DEP) {
Return (Package() {\_SB.PEP0, \_SB.ADC3})
}
}*/
2 changes: 1 addition & 1 deletion 8150/shared-src/8150_AND/surface_cabinets.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,4 +498,4 @@ Name(_PLD,
0x00, 0x00, 0x00, 0x00
}
}
})
})
Loading

0 comments on commit e231600

Please sign in to comment.