Skip to content

Commit

Permalink
Merge tulip into sdm660-common
Browse files Browse the repository at this point in the history
* Full stack of tulip specific blobs are imported from V12.0.1.0.PEKMIXM

Signed-off-by: Arturo <[email protected]>
  • Loading branch information
arturo51236 committed Oct 5, 2021
1 parent 4ee2bba commit 5cf5495
Show file tree
Hide file tree
Showing 653 changed files with 4,703 additions and 540 deletions.
33 changes: 32 additions & 1 deletion Android.bp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Automatically generated file. DO NOT MODIFY
//
// This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh
// This file is generated by device/xiaomi/tulip/setup-makefiles.sh

soong_namespace {
}
Expand All @@ -25,6 +25,37 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}

cc_prebuilt_library_shared {
name: "libthermalclient",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/libthermalclient.so"],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/libthermalclient.so"],
},
},
compile_multilib: "both",
check_elf_files: false,
prefer: true,
soc_specific: true,
}

android_app_import {
name: "FingerprintExtensionService",
owner: "xiaomi",
apk: "proprietary/vendor/app/FingerprintExtensionService/FingerprintExtensionService.apk",
certificate: "platform",
dex_preopt: {
enabled: false,
},
soc_specific: true,
}

android_app_import {
name: "SoterService",
owner: "xiaomi",
Expand Down
4 changes: 2 additions & 2 deletions Android.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Automatically generated file. DO NOT MODIFY
#
# This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh
# This file is generated by device/xiaomi/tulip/setup-makefiles.sh

LOCAL_PATH := $(call my-dir)

ifneq ($(filter jasmine_sprout jason lavender platina twolip wayne whyred,$(TARGET_DEVICE)),)
ifeq ($(TARGET_DEVICE),tulip)

endif
2 changes: 1 addition & 1 deletion BoardConfigVendor.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Automatically generated file. DO NOT MODIFY
#
# This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh
# This file is generated by device/xiaomi/tulip/setup-makefiles.sh

Binary file added proprietary/etc/firmware/goodixfp.b00
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.b01
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.b02
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.b03
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.b04
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.b05
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.b06
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.b07
Binary file not shown.
Binary file added proprietary/etc/firmware/goodixfp.mdt
Binary file not shown.
Binary file not shown.
Binary file added proprietary/vendor/bin/cnss-daemon
Binary file not shown.
Binary file added proprietary/vendor/bin/hw/[email protected]
Binary file not shown.
Binary file added proprietary/vendor/bin/hw/[email protected]
Binary file not shown.
Binary file added proprietary/vendor/bin/sensors.qti
Binary file not shown.
Binary file added proprietary/vendor/bin/thermal-engine
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions proprietary/vendor/etc/acdbdata/MTP/MTP_workspaceFile.qwsp

Large diffs are not rendered by default.

Binary file added proprietary/vendor/etc/acdbdata/adsp_avs_config.acdb
Binary file not shown.
Binary file added proprietary/vendor/etc/camera/GpuKernelRepo.pb
Binary file not shown.
286 changes: 286 additions & 0 deletions proprietary/vendor/etc/camera/camera_config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,286 @@


<!--
Copyright (c) 2016-2017 Qualcomm Technologies, Inc.
All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc.
-->
<!--
CameraModuleConfig :
This node must be added for each module prosent in the device.
It contain all information about the module present.
The number of nodes of CameraModuleConfig indicate number of modules
to be probed on the device.
Maximum number of CameraModuleConfig nodes is 10
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*CameraId :
Camera Id is the Slot number in which the mode is plugged.
Valid values are 0, 1, 2 and 3.
*SensorName :
Name of the sensor present on the module.
The sensor library name should be of the form libmmcamera_<SensorName>.so
ActuatorName :
Name of the actuator on this module.
The actuator library name should be of the form libactuator_<ActuatorName>.so.
If there is no actuator remove the <ActuatorName> node.
EepromName :
Name of the eeprom on this module.
Eeprom lib name should be of the form libmmcamera_<EepromName>_eeprom.so
If there is no eeprom remove the <EepromName> node.
FlashName :
Name of the flash on this module.
The flash library name should be of the form libflash_<FlashName>.so.
If there is no flash remove the <FlashName> node.
ChromatixName :
Name of the tuning xml file.
Tuning file contains the list of chromatix library names.
If there is no tuning xml file remove the <ChromatixName> node.
Position :
Position of the sensor module. Valid values are:
BACK, FRONT and BACK_AUX
MountAngle :
Angle at which the sensor is mounted. Valid values are 0, 90, 180, 270 and 360.
To use default mountangle mentioned in kernel use 360.
CsiInfo : This node contains information about the receiver configuration.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*CSIDCore :
CSID core to receive the data. Valid values are 0, 1, 2 and 3.
*LaneMask :
Mask to mention which lane is enabled.
LaneMask[0] for DL0.
LaneMask[1] for CLK.
LaneMask[2] for DL1.
LaneMask[3] for DL2.
LaneMask[4] for DL3
*LaneAssign :
Number which describes the lane mapping between sensor and PHY.
LaneAssign[0:3] is sensor lane number connected to data lane 0 of PHY on MSM
LaneAssign[4:7] is sensor lane number connected to data lane 2 of PHY on MSM
LaneAssign[8:11] is sensor lane number connected to data lane 3 of PHY on MSM
LaneAssign[12:15] is sensor lane number connected to data lane 4 of PHY on MSM
NOTE : Lane 1 is reserved for the clock lane.
Wiring and setting it to a data lane is prohibited.
ComboMode :
Flag to enable combo mode.
This flag is enabled if multiple sensors are using same CSI-PHY receiver
LensInfo : Information of the lens present in the module.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*FocalLength :
FocalLength of the lens in micometers.
Distance between the center of curvature to the focal point.
*FNumber :
FNumber of the lens.
*TotalFocusDistance : The total distance in meters the lens could focus.
*HorizontalViewAngle : HorizontalViewAngle in degrees
*VerticalViewAngle : VerticalViewAngle in degrees
*MinFocusDistance : Minimum distance in meters the lens could focus.
*VARIABLES MARKED WITH ASTRICK (*) ARE MANDATORY.
-->

<CameraConfigurationRoot>
<CameraModuleConfig>
<CameraId>0</CameraId>
<SensorName>tulip_s5k5e8_ofilm_i</SensorName>
<EepromName>tulip_s5k5e8_ofilm_i</EepromName>
<ChromatixName_china>tulip_s5k5e8_ofilm_global_i_chromatix</ChromatixName_china>
<ChromatixName>tulip_s5k5e8_ofilm_india_i_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>BACK_AUX</Position>
<MountAngle>90</MountAngle>
<CSIInfo>
<CSIDCore>1</CSIDCore>
<LaneMask>0x07</LaneMask>
<LaneAssign>0x20</LaneAssign>
<ComboMode>0</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>1.98</FocalLength>
<FNumber>2.2</FNumber>
<TotalFocusDistance>1.9</TotalFocusDistance>
<HorizontalViewAngle>85.0</HorizontalViewAngle>
<VerticalViewAngle>63.0</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>0</CameraId>
<SensorName>tulip_s5k5e8_qtech_ii</SensorName>
<EepromName>tulip_s5k5e8_qtech_ii</EepromName>
<ChromatixName_china>tulip_s5k5e8_qtech_global_ii_chromatix</ChromatixName_china>
<ChromatixName>tulip_s5k5e8_qtech_india_ii_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>BACK_AUX</Position>
<MountAngle>90</MountAngle>
<CSIInfo>
<CSIDCore>1</CSIDCore>
<LaneMask>0x07</LaneMask>
<LaneAssign>0x20</LaneAssign>
<ComboMode>0</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>1.98</FocalLength>
<FNumber>2.2</FNumber>
<TotalFocusDistance>1.9</TotalFocusDistance>
<HorizontalViewAngle>85.0</HorizontalViewAngle>
<VerticalViewAngle>63.0</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>1</CameraId>
<SensorName>tulip_s5k2l7_ofilm_i</SensorName>
<ActuatorName>tulip_s5k2l7_ofilm_i_ak7374</ActuatorName>
<EepromName>tulip_s5k2l7_ofilm_i</EepromName>
<FlashName>pmic</FlashName>
<ChromatixName_china>tulip_s5k2l7_ofilm_global_i_chromatix</ChromatixName_china>
<ChromatixName>tulip_s5k2l7_ofilm_india_i_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>BACK</Position>
<MountAngle>90</MountAngle>
<CSIInfo>
<CSIDCore>0</CSIDCore>
<LaneMask>0x1F</LaneMask>
<LaneAssign>0x4320</LaneAssign>
<ComboMode>0</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>3.94</FocalLength>
<FNumber>1.9</FNumber>
<TotalFocusDistance>2.91</TotalFocusDistance>
<HorizontalViewAngle>70.4</HorizontalViewAngle>
<VerticalViewAngle>55.7</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>1</CameraId>
<SensorName>tulip_s5k2l7_qtech_ii</SensorName>
<ActuatorName>tulip_s5k2l7_qtech_ii_ak7374</ActuatorName>
<EepromName>tulip_s5k2l7_qtech_ii</EepromName>
<FlashName>pmic</FlashName>
<ChromatixName_china>tulip_s5k2l7_qtech_global_ii_chromatix</ChromatixName_china>
<ChromatixName>tulip_s5k2l7_qtech_india_ii_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>BACK</Position>
<MountAngle>90</MountAngle>
<CSIInfo>
<CSIDCore>0</CSIDCore>
<LaneMask>0x1F</LaneMask>
<LaneAssign>0x4320</LaneAssign>
<ComboMode>0</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>3.94</FocalLength>
<FNumber>1.9</FNumber>
<TotalFocusDistance>2.91</TotalFocusDistance>
<HorizontalViewAngle>70.4</HorizontalViewAngle>
<VerticalViewAngle>55.7</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>3</CameraId>
<SensorName>tulip_ov02a10_ofilm_ii</SensorName>
<EepromName>tulip_ov02a10_ofilm_ii</EepromName>
<ChromatixName_china>tulip_ov02a10_ofilm_global_ii_chromatix</ChromatixName_china>
<ChromatixName>tulip_ov02a10_ofilm_india_ii_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>FRONT_AUX</Position>
<MountAngle>270</MountAngle>
<CSIInfo>
<CSIDCore>1</CSIDCore>
<LaneMask>0x18</LaneMask>
<LaneAssign>0x3</LaneAssign>
<ComboMode>1</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>1.85</FocalLength>
<FNumber>2.2</FNumber>
<TotalFocusDistance>1.85</TotalFocusDistance>
<HorizontalViewAngle>85.4</HorizontalViewAngle>
<VerticalViewAngle>51.6</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>3</CameraId>
<SensorName>tulip_ov02a10_sunny_i</SensorName>
<EepromName>tulip_ov02a10_sunny_i</EepromName>
<ChromatixName_china>tulip_ov02a10_sunny_global_i_chromatix</ChromatixName_china>
<ChromatixName>tulip_ov02a10_sunny_india_i_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>FRONT_AUX</Position>
<MountAngle>270</MountAngle>
<CSIInfo>
<CSIDCore>1</CSIDCore>
<LaneMask>0x18</LaneMask>
<LaneAssign>0x3</LaneAssign>
<ComboMode>1</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>1.85</FocalLength>
<FNumber>2.2</FNumber>
<TotalFocusDistance>1.85</TotalFocusDistance>
<HorizontalViewAngle>85.4</HorizontalViewAngle>
<VerticalViewAngle>51.6</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>2</CameraId>
<SensorName>tulip_s5k3T1_sunny_i</SensorName>
<EepromName>tulip_s5k3T1_sunny_i</EepromName>
<ChromatixName_china>tulip_s5k3T1_sunny_global_i_chromatix</ChromatixName_china>
<ChromatixName>tulip_s5k3T1_sunny_india_i_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>FRONT</Position>
<MountAngle>270</MountAngle>
<CSIInfo>
<CSIDCore>2</CSIDCore>
<LaneMask>0x1F</LaneMask>
<LaneAssign>0x4320</LaneAssign>
<ComboMode>0</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>3.56</FocalLength>
<FNumber>2.0</FNumber>
<TotalFocusDistance>3.56</TotalFocusDistance>
<HorizontalViewAngle>66.0</HorizontalViewAngle>
<VerticalViewAngle>52.0</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>2</CameraId>
<SensorName>tulip_s5k3T1_ofilm_ii</SensorName>
<EepromName>tulip_s5k3T1_ofilm_ii</EepromName>
<ChromatixName_china>tulip_s5k3T1_ofilm_global_ii_chromatix</ChromatixName_china>
<ChromatixName>tulip_s5k3T1_ofilm_india_ii_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>FRONT</Position>
<MountAngle>270</MountAngle>
<CSIInfo>
<CSIDCore>2</CSIDCore>
<LaneMask>0x1F</LaneMask>
<LaneAssign>0x4320</LaneAssign>
<ComboMode>0</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>3.56</FocalLength>
<FNumber>2.0</FNumber>
<TotalFocusDistance>3.56</TotalFocusDistance>
<HorizontalViewAngle>65.0</HorizontalViewAngle>
<VerticalViewAngle>50.8</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
</CameraConfigurationRoot>
Binary file added proprietary/vendor/etc/camera/female_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added proprietary/vendor/etc/camera/female_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added proprietary/vendor/etc/camera/male_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added proprietary/vendor/etc/camera/male_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added proprietary/vendor/etc/camera/model_back.dlc
Binary file not shown.
Binary file added proprietary/vendor/etc/camera/model_front.dlc
Binary file not shown.
Binary file added proprietary/vendor/etc/camera/score_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added proprietary/vendor/etc/camera/score_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5cf5495

Please sign in to comment.