Snap for 7634234 from d299fd2539969ab1417f5ec9c8eeebcbd3ef2f8a to tm-release

Change-Id: Ieb44ec0ebf454b26c6baa83fb7ae4406b8920bb6
This commit is contained in:
Android Build Coastguard Worker 2021-08-12 03:01:44 +00:00
commit 07e0c7ba09
4 changed files with 79 additions and 20 deletions

View file

@ -14,8 +14,8 @@
# limitations under the License. # limitations under the License.
# #
ifdef PHONE_CAR_BOARD_CONFIG ifdef PHONE_CAR_BOARD_PRODUCT
include $(PHONE_CAR_BOARD_CONFIG) include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := raven TARGET_BOOTLOADER_BOARD_NAME := raven

View file

@ -399,6 +399,10 @@
"CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
"ReleaseLogic": "RELEASE_TO_FLOOR", "ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true "ThrottlingWithPowerLink":true
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 1, 2, 3, 4, 4, 4]
} }
] ]
}, },
@ -878,7 +882,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
10500, 8500,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -893,7 +897,13 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
@ -903,7 +913,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
12000, 9000,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -978,7 +988,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
8500, 7500,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -993,7 +1003,13 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",
@ -1003,7 +1019,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
9000, 8000,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -1076,6 +1092,11 @@
{ {
"Name":"usbc-port", "Name":"usbc-port",
"Type":"BATTERY" "Type":"BATTERY"
},
{
"Name":"tpu_cooling",
"Type":"NPU",
"WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
} }
], ],
"PowerRails":[ "PowerRails":[

View file

@ -555,7 +555,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
10500, 8500,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -570,7 +570,13 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
@ -580,7 +586,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
12000, 9000,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -655,7 +661,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
8500, 7500,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -670,7 +676,13 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",
@ -680,7 +692,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
9000, 8000,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -737,6 +749,11 @@
"Type":"GPU", "Type":"GPU",
"WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
"State2Power":["2580", "2033", "1427", "826", "358"] "State2Power":["2580", "2033", "1427", "826", "358"]
},
{
"Name":"tpu_cooling",
"Type":"NPU",
"WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
} }
], ],
"PowerRails":[ "PowerRails":[

View file

@ -399,6 +399,10 @@
"CdevFloorWithPowerLink": [0, 1, 1, 2, 3, 4, 4], "CdevFloorWithPowerLink": [0, 1, 1, 2, 3, 4, 4],
"ReleaseLogic": "RELEASE_TO_FLOOR", "ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true "ThrottlingWithPowerLink":true
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 1, 2, 3, 4, 4, 4]
} }
] ]
}, },
@ -878,7 +882,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
10500, 8500,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -893,7 +897,13 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
@ -903,7 +913,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
12000, 9000,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -978,7 +988,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
8500, 7500,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -993,7 +1003,13 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",
@ -1003,7 +1019,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
9000, 8000,
"NAN", "NAN",
"NAN" "NAN"
], ],
@ -1080,6 +1096,11 @@
{ {
"Name":"usbc-port", "Name":"usbc-port",
"Type":"BATTERY" "Type":"BATTERY"
},
{
"Name":"tpu_cooling",
"Type":"NPU",
"WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
} }
], ],
"PowerRails":[ "PowerRails":[