rhine: merge of Sony 4.4.2 release

Change-Id: I606fd6fd5fffb541628679f2b13b4b4425ab34f8

amami/BoardConfigVendor.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The CyanogenMod Project
+# Copyright (C) 2014 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

amami/amami-vendor-blobs.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013 The CyanogenMod Project
+# Copyright (C) 2011-2014 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 PRODUCT_COPY_FILES += \
     vendor/sony/amami/proprietary/bin/chargemon:system/bin/chargemon \
     vendor/sony/amami/proprietary/bin/illumination_service:system/bin/illumination_service \
-    vendor/sony/amami/proprietary/bin/prox_cal_data_manager:system/bin/prox_cal_data_manager \
     vendor/sony/amami/proprietary/bin/sensors.qcom:system/bin/sensors.qcom \
     vendor/sony/amami/proprietary/bin/updatemiscta:system/bin/updatemiscta \
-    vendor/sony/amami/proprietary/etc/Handset_cal.acdb:system/etc/Handset_cal.acdb \
-    vendor/sony/amami/proprietary/etc/Speaker_cal.acdb:system/etc/Speaker_cal.acdb \
+    vendor/sony/amami/proprietary/etc/acdbdata/Liquid/Liquid_Handset_cal.acdb:system/etc/acdbdata/Liquid/Liquid_Handset_cal.acdb \
+    vendor/sony/amami/proprietary/etc/acdbdata/Liquid/Liquid_Speaker_cal.acdb:system/etc/acdbdata/Liquid/Liquid_Speaker_cal.acdb \
+    vendor/sony/amami/proprietary/etc/acdbdata/MTP/MTP_Handset_cal.acdb:system/etc/acdbdata/MTP/MTP_Handset_cal.acdb \
+    vendor/sony/amami/proprietary/etc/acdbdata/MTP/MTP_Speaker_cal.acdb:system/etc/acdbdata/MTP/MTP_Speaker_cal.acdb \
     vendor/sony/amami/proprietary/etc/firmware/touch_module_id_0x45.img:system/etc/firmware/touch_module_id_0x45.img \
     vendor/sony/amami/proprietary/etc/firmware/touch_module_id_0x48.img:system/etc/firmware/touch_module_id_0x48.img \
     vendor/sony/amami/proprietary/etc/firmware/touch_module_id_0x4d.img:system/etc/firmware/touch_module_id_0x4d.img \
@@ -30,10 +31,13 @@ PRODUCT_COPY_FILES += \
     vendor/sony/amami/proprietary/etc/firmware/touch_module_id_0x54.img:system/etc/firmware/touch_module_id_0x54.img \
     vendor/sony/amami/proprietary/etc/firmware/touch_module_id_0x5d.img:system/etc/firmware/touch_module_id_0x5d.img \
     vendor/sony/amami/proprietary/etc/flashled_calc_parameters.cfg:system/etc/flashled_calc_parameters.cfg \
+    vendor/sony/amami/proprietary/etc/mixer_paths.xml:system/etc/mixer_paths.xml \
+    vendor/sony/amami/proprietary/etc/sensor_def_qcomdev.conf:system/etc/sensor_def_qcomdev.conf \
     vendor/sony/amami/proprietary/etc/sensors_calib.conf:system/etc/sensors_calib.conf \
     vendor/sony/amami/proprietary/etc/sysmon.cfg:system/etc/sysmon.cfg \
     vendor/sony/amami/proprietary/lib/libcald_hal.so:system/lib/libcald_hal.so \
     vendor/sony/amami/proprietary/lib/libcameralight.so:system/lib/libcameralight.so \
+    vendor/sony/amami/proprietary/lib/libcammw.so:system/lib/libcammw.so \
     vendor/sony/amami/proprietary/lib/libsysmon_jni.so:system/lib/libsysmon_jni.so \
     vendor/sony/amami/proprietary/usr/idc/clearpad.idc:system/usr/idc/clearpad.idc \
     vendor/sony/amami/proprietary/vendor/camera/LGI02BN1.dat:system/vendor/camera/LGI02BN1.dat \
@@ -43,9 +47,7 @@ PRODUCT_COPY_FILES += \
     vendor/sony/amami/proprietary/vendor/camera/SEM02BN1_CACAO.dat:system/vendor/camera/SEM02BN1_CACAO.dat \
     vendor/sony/amami/proprietary/vendor/camera/SEM02BN1_IMX132.dat:system/vendor/camera/SEM02BN1_IMX132.dat \
     vendor/sony/amami/proprietary/vendor/camera/SOI13BS9.dat:system/vendor/camera/SOI13BS9.dat \
-    vendor/sony/amami/proprietary/vendor/camera/SOI13BS9_BU64296.dat:system/vendor/camera/SOI13BS9_BU64296.dat \
     vendor/sony/amami/proprietary/vendor/camera/SOI13BS9_CACAO.dat:system/vendor/camera/SOI13BS9_CACAO.dat \
-    vendor/sony/amami/proprietary/vendor/camera/SOI13BS9_IMX135.dat:system/vendor/camera/SOI13BS9_IMX135.dat \
     vendor/sony/amami/proprietary/vendor/camera/SOI20BS0.dat:system/vendor/camera/SOI20BS0.dat \
     vendor/sony/amami/proprietary/vendor/camera/SOI20BS0_BU64296GWX.dat:system/vendor/camera/SOI20BS0_BU64296GWX.dat \
     vendor/sony/amami/proprietary/vendor/camera/SOI20BS0_CACAO.dat:system/vendor/camera/SOI20BS0_CACAO.dat \
@@ -57,6 +59,7 @@ PRODUCT_COPY_FILES += \
     vendor/sony/amami/proprietary/vendor/lib/libmmcamera2_imglib_modules.so:system/vendor/lib/libmmcamera2_imglib_modules.so \
     vendor/sony/amami/proprietary/vendor/lib/libmmcamera2_isp_modules.so:system/vendor/lib/libmmcamera2_isp_modules.so \
     vendor/sony/amami/proprietary/vendor/lib/libmmcamera2_sensor_modules.so:system/vendor/lib/libmmcamera2_sensor_modules.so \
+    vendor/sony/amami/proprietary/vendor/lib/libmmcamera2_stats_algorithm.so:system/vendor/lib/libmmcamera2_stats_algorithm.so \
     vendor/sony/amami/proprietary/vendor/lib/libmmcamera2_stats_modules.so:system/vendor/lib/libmmcamera2_stats_modules.so \
     vendor/sony/amami/proprietary/vendor/lib/liboemcamera.so:system/vendor/lib/liboemcamera.so \
     vendor/sony/amami/proprietary/vendor/lib/libsensor1.so:system/vendor/lib/libsensor1.so

amami/amami-vendor.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The CyanogenMod Project
+# Copyright (C) 2014 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

amami/proprietary/etc/sensor_def_qcomdev.conf

@@ -0,0 +1,228 @@
+#
+# File: sensor_def_qcomdev.conf
+#
+# Tihs file contains sensor registry values for SOMC development platforms.
+#
+#  Copyright (c) 2013 Qualcomm Technologies, Inc.  All Rights Reserved.
+#      Qualcomm Technologies Proprietary and Confidential
+#  Copyright (C) 2013 Sony Mobile Communications AB.
+
+
+# File format:
+#
+# Lines starting with "#" are comments and ignored.
+#
+# File metadata uses this format:
+# :key value1 value2
+#
+# The following keys are defined:
+# - "version" : value1 is non-zero positive version number of the file. This
+#   number will be stored in the sensors registry. It should be equal to the
+#   largest version of any item. It will be saved in the sensors registry for
+#   later use when initializing values. See the item format below.
+#   This value should only be specified once in the file.
+#
+# - "hardware" : The value1 will be compared to the "Hardware" string from
+#   /proc/cpuinfo.
+#   Items will only be used as default values in the registry if the hardware
+#   string value is a substring of the /proc/cpuinfo string.
+#   This metadata key can be used more than once, so that one file can support
+#   more than one type of hardware.
+#   The value may be NULL, indicating common item values for all hardware.
+#
+# - "platform" : Similar to the "hardware" key, but this string will need to
+#   match the text of either /sys/devices/soc0/hw_platform or
+#   /sys/devices/soc0/platform_subtype.
+#
+# - "property" : value1 is the Android system property key, and value2 is
+#   the desired property value. If the system property value matches the
+#   desired property value, then the following items will be applied.
+#   This metadata key can be used more than once, in which case the new
+#   property value overrides the old.
+#   value1 and 2 may be NULL, indicating common item values for all properties.
+#
+# Registry items are in lines with the following format:
+# <itemID>  <value>  <version>
+#  Where:
+#   itemID is the numeric item ID defined in sns_reg_api_v02.h
+#
+#   "value" is the numeric value of the item.
+#
+#   "version" is a non-zero version of the item value.
+#             The version field will be compared against the previous saved
+#             value in the sensors registry. If this value is greater than the
+#             saved value, the default will be applied. Otherwise, the default
+#             will be skipped.
+#
+# Registry item values will only be applied if the hardware, platform, and
+# property values match for the current hardware configuration.
+#
+# The numeric fields are parsed with the strtoull function, base 0.
+#
+
+:version 0x00010001
+
+
+########################################################################
+###        8974 Chipsets
+########################################################################
+:hardware 8974
+:platform
+:property
+# Orientation of sensors
+# accel x/y/z
+700 -1 0x00010001
+701 2 0x00010001
+702 -3 0x00010001
+# gyro x/y/z
+800 -1 0x00010001
+801 2 0x00010001
+802 -3 0x00010001
+# mag x/y/z
+900 -1 0x00010001
+901 2 0x00010001
+902 -3 0x00010001
+# SSI SMGR Version
+1900 1 0x00010001
+1901 1 0x00010001
+
+# SSI SMGR Cfg 0 (Acc)
+1902 0xe2114f8070922524 0x00010001
+1903 0x669a0c200008969e 0x00010001
+1904 2000 0x00010001
+1905 1000 0x00010001
+1906 12 0x00010001
+1907 1000 0x00010001
+1908 0 0x00010001
+1909 73 0x00010001
+1910 65 0x00010001
+1911 0 0x00010001
+1912 0x18 0x00010001
+1913 1 0x00010001
+1914 0 0x00010001
+1915 0xFF 0x00010001
+1916 1 0x00010001
+1917 0xD0 0x00010001
+1982 0 0x00010001
+
+# SSI SMGR Cfg 1 (Gyro)
+1918 0xc347c5575be90345 0x00010001
+1919 0xc0b3f9bee990498d 0x00010001
+1920 2000 0x00010001
+1921 1000 0x00010001
+1922 12 0x00010001
+1923 1010 0x00010001
+1924 10 0x00010001
+1925 0xFFFF 0x00010001
+1926 0xFFFF 0x00010001
+1927 10 0x00010001
+1928 0x68 0x00010001
+1929 3 0x00010001
+1930 0 0x00010001
+1931 0xFF 0x00010001
+1932 4 0x00010001
+1933 0x40 0x00010001
+1983 0 0x00010001
+
+# SSI SMGR Cfg 2 (Mag)
+1934 0x9e4e43dd9919b2d4 0x00010001
+1935 0x355c5a01689ed8b6 0x00010001
+1936 1000 0x00010001
+1937 0 0x00010001
+1938 12 0x00010001
+1939 1020 0x00010001
+1940 0 0x00010001
+1941 0xFFFF 0x00010001
+1942 0xFFFF 0x00010001
+1943 20 0x00010001
+1944 0x0C 0x00010001
+1945 2 0x00010001
+1946 0 0x00010001
+1947 0xFF 0x00010001
+1948 0 0x00010001
+1949 0 0x00010001
+1984 0 0x00010001
+
+# SSI SMGR Cfg 3 (BMP085)
+1950 0xf2494d45c55e4f96 0x00010001
+1951 0x8624930f2c38a784 0x00010001
+1952 10000 0x00010001
+1953 0 0x00010001
+1954 3 0x00010001
+1955 0xFFFF 0x00010001
+1956 0xFFFF 0x00010001
+1957 0xFFFF 0x00010001
+1958 0xFFFF 0x00010001
+1959 30 0x00010001
+1960 0x77 0x00010001
+1961 7 0x00010001
+1962 4 0x00010001
+1963 0xFF 0x00010001
+1964 0 0x00010001
+1965 0 0x00010001
+1985 0 0x00010001
+
+# SSI SMGR Cfg 4 (Prox/ALS)
+1966 0x4c4bfbc3d8a879e6 0x00010001
+1967 0x0ce6069d4d31faaf 0x00010001
+1968 5000 0x00010001
+1969 0 0x00010001
+1970 12 0x00010001
+1971 1040 0x00010001
+1972 0xFFFF 0x00010001
+1973 0x4A 0x00010001
+1974 0xFFFF 0x00010001
+1975 40 0x00010001
+1976 0x39 0x00010001
+1977 5 0x00010001
+1978 6 0x00010001
+1979 0xFF 0x00010001
+1980 0 0x00010001
+1981 0x80 0x00010001
+1986 0 0x00010001
+
+# SSI GPIO config
+2700 1 0x00010001
+2701 0 0x00010001
+2702 10 0x00010001
+2703 11 0x00010001
+2704 87 0x00010001
+2705 88 0x00010001
+2706 64 0x00010001
+
+# Other Item for Cfg4 (Prox/ALS)
+100 20 0x00010001
+101 80 0x00010001
+102 0 0x00010001
+105 0 0x00010001
+106 100 0x00010001
+107 1 0x00010001
+108 0x18 0x00010001
+109 7 0x00010001
+111 0x40 0x00010001
+112 0 0x00010001
+113 1815 0x00010001
+114 623 0x00010001
+115 1094 0x00010001
+116 113 0x00010001
+124 15667 0x00010001
+125 8310 0x00010001
+
+203  65536   0x10001 # AMD
+225  983040  0x10001 # RMD
+504  65536   0x10001 # Gyro Cal
+1703 65536   0x10001 # Ped
+2800 983040  0x10001 # basic ges
+2900 983040  0x10001 # Facing
+609  983040  0x10001 # FMV
+1005 983040  0x10001 # Grav
+1103 983040  0x10001 # orientation
+3000 983040  0x10001 # gyro quat
+3100 983040  0x10001 # rot vec
+3500 1966080 0x10001 # game rv
+4112 65536   0x10001 # SMD
+
+4109 3 0x10001 # Sony SMD threshold
+4110 30 0x10001 # Sony SMD dyn threshold
+4113 1048576 0x10001 # Sony SMD sampling rate (16 Hz, Q16)
+3801 1 0x00010001 # QMAG_CAL Configuration

honami/BoardConfigVendor.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The CyanogenMod Project
+# Copyright (C) 2014 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

honami/honami-vendor-blobs.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013 The CyanogenMod Project
+# Copyright (C) 2011-2014 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 PRODUCT_COPY_FILES += \
     vendor/sony/honami/proprietary/bin/chargemon:system/bin/chargemon \
     vendor/sony/honami/proprietary/bin/illumination_service:system/bin/illumination_service \
-    vendor/sony/honami/proprietary/bin/prox_cal_data_manager:system/bin/prox_cal_data_manager \
     vendor/sony/honami/proprietary/bin/sensors.qcom:system/bin/sensors.qcom \
     vendor/sony/honami/proprietary/bin/updatemiscta:system/bin/updatemiscta \
-    vendor/sony/honami/proprietary/etc/Handset_cal.acdb:system/etc/Handset_cal.acdb \
-    vendor/sony/honami/proprietary/etc/Speaker_cal.acdb:system/etc/Speaker_cal.acdb \
+    vendor/sony/honami/proprietary/etc/acdbdata/Liquid/Liquid_Handset_cal.acdb:system/etc/acdbdata/Liquid/Liquid_Handset_cal.acdb \
+    vendor/sony/honami/proprietary/etc/acdbdata/Liquid/Liquid_Speaker_cal.acdb:system/etc/acdbdata/Liquid/Liquid_Speaker_cal.acdb \
+    vendor/sony/honami/proprietary/etc/acdbdata/MTP/MTP_Handset_cal.acdb:system/etc/acdbdata/MTP/MTP_Handset_cal.acdb \
+    vendor/sony/honami/proprietary/etc/acdbdata/MTP/MTP_Speaker_cal.acdb:system/etc/acdbdata/MTP/MTP_Speaker_cal.acdb \
     vendor/sony/honami/proprietary/etc/firmware/touch_module_id_0x45.img:system/etc/firmware/touch_module_id_0x45.img \
     vendor/sony/honami/proprietary/etc/firmware/touch_module_id_0x48.img:system/etc/firmware/touch_module_id_0x48.img \
     vendor/sony/honami/proprietary/etc/firmware/touch_module_id_0x49.img:system/etc/firmware/touch_module_id_0x49.img \
@@ -38,6 +39,8 @@ PRODUCT_COPY_FILES += \
     vendor/sony/honami/proprietary/etc/firmware/touch_module_id_0x5e.img:system/etc/firmware/touch_module_id_0x5e.img \
     vendor/sony/honami/proprietary/etc/firmware/touch_module_id_0x5f.img:system/etc/firmware/touch_module_id_0x5f.img \
     vendor/sony/honami/proprietary/etc/flashled_calc_parameters.cfg:system/etc/flashled_calc_parameters.cfg \
+    vendor/sony/honami/proprietary/etc/mixer_paths.xml:system/etc/mixer_paths.xml \
+    vendor/sony/honami/proprietary/etc/sensor_def_qcomdev.conf:system/etc/sensor_def_qcomdev.conf \
     vendor/sony/honami/proprietary/etc/sensors_calib.conf:system/etc/sensors_calib.conf \
     vendor/sony/honami/proprietary/etc/sysmon.cfg:system/etc/sysmon.cfg \
     vendor/sony/honami/proprietary/lib/libcald_hal.so:system/lib/libcald_hal.so \
@@ -52,9 +55,7 @@ PRODUCT_COPY_FILES += \
     vendor/sony/honami/proprietary/vendor/camera/SEM02BN1_CACAO.dat:system/vendor/camera/SEM02BN1_CACAO.dat \
     vendor/sony/honami/proprietary/vendor/camera/SEM02BN1_IMX132.dat:system/vendor/camera/SEM02BN1_IMX132.dat \
     vendor/sony/honami/proprietary/vendor/camera/SOI13BS9.dat:system/vendor/camera/SOI13BS9.dat \
-    vendor/sony/honami/proprietary/vendor/camera/SOI13BS9_BU64296.dat:system/vendor/camera/SOI13BS9_BU64296.dat \
     vendor/sony/honami/proprietary/vendor/camera/SOI13BS9_CACAO.dat:system/vendor/camera/SOI13BS9_CACAO.dat \
-    vendor/sony/honami/proprietary/vendor/camera/SOI13BS9_IMX135.dat:system/vendor/camera/SOI13BS9_IMX135.dat \
     vendor/sony/honami/proprietary/vendor/camera/SOI20BS0.dat:system/vendor/camera/SOI20BS0.dat \
     vendor/sony/honami/proprietary/vendor/camera/SOI20BS0_BU64296GWX.dat:system/vendor/camera/SOI20BS0_BU64296GWX.dat \
     vendor/sony/honami/proprietary/vendor/camera/SOI20BS0_CACAO.dat:system/vendor/camera/SOI20BS0_CACAO.dat \
@@ -66,6 +67,7 @@ PRODUCT_COPY_FILES += \
     vendor/sony/honami/proprietary/vendor/lib/libmmcamera2_imglib_modules.so:system/vendor/lib/libmmcamera2_imglib_modules.so \
     vendor/sony/honami/proprietary/vendor/lib/libmmcamera2_isp_modules.so:system/vendor/lib/libmmcamera2_isp_modules.so \
     vendor/sony/honami/proprietary/vendor/lib/libmmcamera2_sensor_modules.so:system/vendor/lib/libmmcamera2_sensor_modules.so \
+    vendor/sony/honami/proprietary/vendor/lib/libmmcamera2_stats_algorithm.so:system/vendor/lib/libmmcamera2_stats_algorithm.so \
     vendor/sony/honami/proprietary/vendor/lib/libmmcamera2_stats_modules.so:system/vendor/lib/libmmcamera2_stats_modules.so \
     vendor/sony/honami/proprietary/vendor/lib/liboemcamera.so:system/vendor/lib/liboemcamera.so \
     vendor/sony/honami/proprietary/vendor/lib/libsensor1.so:system/vendor/lib/libsensor1.so

honami/honami-vendor.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The CyanogenMod Project
+# Copyright (C) 2014 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

honami/proprietary/etc/sensor_def_qcomdev.conf

@@ -0,0 +1,228 @@
+#
+# File: sensor_def_qcomdev.conf
+#
+# Tihs file contains sensor registry values for SOMC development platforms.
+#
+#  Copyright (c) 2013 Qualcomm Technologies, Inc.  All Rights Reserved.
+#      Qualcomm Technologies Proprietary and Confidential
+#  Copyright (C) 2013 Sony Mobile Communications AB.
+
+
+# File format:
+#
+# Lines starting with "#" are comments and ignored.
+#
+# File metadata uses this format:
+# :key value1 value2
+#
+# The following keys are defined:
+# - "version" : value1 is non-zero positive version number of the file. This
+#   number will be stored in the sensors registry. It should be equal to the
+#   largest version of any item. It will be saved in the sensors registry for
+#   later use when initializing values. See the item format below.
+#   This value should only be specified once in the file.
+#
+# - "hardware" : The value1 will be compared to the "Hardware" string from
+#   /proc/cpuinfo.
+#   Items will only be used as default values in the registry if the hardware
+#   string value is a substring of the /proc/cpuinfo string.
+#   This metadata key can be used more than once, so that one file can support
+#   more than one type of hardware.
+#   The value may be NULL, indicating common item values for all hardware.
+#
+# - "platform" : Similar to the "hardware" key, but this string will need to
+#   match the text of either /sys/devices/soc0/hw_platform or
+#   /sys/devices/soc0/platform_subtype.
+#
+# - "property" : value1 is the Android system property key, and value2 is
+#   the desired property value. If the system property value matches the
+#   desired property value, then the following items will be applied.
+#   This metadata key can be used more than once, in which case the new
+#   property value overrides the old.
+#   value1 and 2 may be NULL, indicating common item values for all properties.
+#
+# Registry items are in lines with the following format:
+# <itemID>  <value>  <version>
+#  Where:
+#   itemID is the numeric item ID defined in sns_reg_api_v02.h
+#
+#   "value" is the numeric value of the item.
+#
+#   "version" is a non-zero version of the item value.
+#             The version field will be compared against the previous saved
+#             value in the sensors registry. If this value is greater than the
+#             saved value, the default will be applied. Otherwise, the default
+#             will be skipped.
+#
+# Registry item values will only be applied if the hardware, platform, and
+# property values match for the current hardware configuration.
+#
+# The numeric fields are parsed with the strtoull function, base 0.
+#
+
+:version 0x00010001
+
+
+########################################################################
+###        8974 Chipsets
+########################################################################
+:hardware 8974
+:platform
+:property
+# Orientation of sensors
+# accel x/y/z
+700 -1 0x00010001
+701 2 0x00010001
+702 -3 0x00010001
+# gyro x/y/z
+800 -1 0x00010001
+801 2 0x00010001
+802 -3 0x00010001
+# mag x/y/z
+900 -2 0x00010001
+901 -3 0x00010001
+902 1 0x00010001
+# SSI SMGR Version
+1900 1 0x00010001
+1901 1 0x00010001
+
+# SSI SMGR Cfg 0 (Acc)
+1902 0xe2114f8070922524 0x00010001
+1903 0x669a0c200008969e 0x00010001
+1904 2000 0x00010001
+1905 1000 0x00010001
+1906 12 0x00010001
+1907 1000 0x00010001
+1908 0 0x00010001
+1909 73 0x00010001
+1910 65 0x00010001
+1911 0 0x00010001
+1912 0x18 0x00010001
+1913 1 0x00010001
+1914 0 0x00010001
+1915 0xFF 0x00010001
+1916 1 0x00010001
+1917 0xD0 0x00010001
+1982 0 0x00010001
+
+# SSI SMGR Cfg 1 (Gyro)
+1918 0xc347c5575be90345 0x00010001
+1919 0xc0b3f9bee990498d 0x00010001
+1920 2000 0x00010001
+1921 1000 0x00010001
+1922 12 0x00010001
+1923 1010 0x00010001
+1924 10 0x00010001
+1925 0xFFFF 0x00010001
+1926 0xFFFF 0x00010001
+1927 10 0x00010001
+1928 0x68 0x00010001
+1929 3 0x00010001
+1930 0 0x00010001
+1931 0xFF 0x00010001
+1932 4 0x00010001
+1933 0x40 0x00010001
+1983 0 0x00010001
+
+# SSI SMGR Cfg 2 (Mag)
+1934 0x9e4e43dd9919b2d4 0x00010001
+1935 0x355c5a01689ed8b6 0x00010001
+1936 1000 0x00010001
+1937 0 0x00010001
+1938 12 0x00010001
+1939 1020 0x00010001
+1940 0 0x00010001
+1941 0xFFFF 0x00010001
+1942 0xFFFF 0x00010001
+1943 20 0x00010001
+1944 0x0C 0x00010001
+1945 2 0x00010001
+1946 0 0x00010001
+1947 0xFF 0x00010001
+1948 0 0x00010001
+1949 0 0x00010001
+1984 0 0x00010001
+
+# SSI SMGR Cfg 3 (BMP085)
+1950 0xf2494d45c55e4f96 0x00010001
+1951 0x8624930f2c38a784 0x00010001
+1952 10000 0x00010001
+1953 0 0x00010001
+1954 3 0x00010001
+1955 0xFFFF 0x00010001
+1956 0xFFFF 0x00010001
+1957 0xFFFF 0x00010001
+1958 0xFFFF 0x00010001
+1959 30 0x00010001
+1960 0x77 0x00010001
+1961 7 0x00010001
+1962 4 0x00010001
+1963 0xFF 0x00010001
+1964 0 0x00010001
+1965 0 0x00010001
+1985 0 0x00010001
+
+# SSI SMGR Cfg 4 (Prox/ALS)
+1966 0x4c4bfbc3d8a879e6 0x00010001
+1967 0x0ce6069d4d31faaf 0x00010001
+1968 5000 0x00010001
+1969 0 0x00010001
+1970 12 0x00010001
+1971 1040 0x00010001
+1972 0xFFFF 0x00010001
+1973 0x4A 0x00010001
+1974 0xFFFF 0x00010001
+1975 40 0x00010001
+1976 0x39 0x00010001
+1977 5 0x00010001
+1978 6 0x00010001
+1979 0xFF 0x00010001
+1980 0 0x00010001
+1981 0x80 0x00010001
+1986 0 0x00010001
+
+# SSI GPIO config
+2700 1 0x00010001
+2701 0 0x00010001
+2702 10 0x00010001
+2703 11 0x00010001
+2704 87 0x00010001
+2705 88 0x00010001
+2706 64 0x00010001
+
+# Other Item for Cfg4 (Prox/ALS)
+100 20 0x00010001
+101 80 0x00010001
+102 0 0x00010001
+105 0 0x00010001
+106 100 0x00010001
+107 1 0x00010001
+108 0x18 0x00010001
+109 7 0x00010001
+111 0x40 0x00010001
+112 0 0x00010001
+113 1657 0x00010001
+114 579 0x00010001
+115 918 0x00010001
+116 119 0x00010001
+124 15723 0x00010001
+125 9201 0x00010001
+
+203  65536   0x10001 # AMD
+225  983040  0x10001 # RMD
+504  65536   0x10001 # Gyro Cal
+1703 65536   0x10001 # Ped
+2800 983040  0x10001 # basic ges
+2900 983040  0x10001 # Facing
+609  983040  0x10001 # FMV
+1005 983040  0x10001 # Grav
+1103 983040  0x10001 # orientation
+3000 983040  0x10001 # gyro quat
+3100 983040  0x10001 # rot vec
+3500 1966080 0x10001 # game rv
+4112 65536   0x10001 # SMD
+
+4109 3 0x10001 # Sony SMD threshold
+4110 30 0x10001 # Sony SMD dyn threshold
+4113 1048576 0x10001 # Sony SMD sampling rate (16 Hz, Q16)
+3801 1 0x00010001 # QMAG_CAL Configuration

honami/proprietary/etc/sensors_calib.conf

@@ -7,7 +7,7 @@ accel_axis_z = 1
 
 # Setup gyroscope calibration threshold
 gyro_threshold_first = 52360
-gyro_threshold_second = 8727
+gyro_threshold_second = 17453
 
 # Setup proximity calibration settings
 prox_near_threshold = 900

qcom-common/qcom-common-vendor-blobs-330.mk

@@ -15,25 +15,31 @@
 # This file is generated by device/sony/qcom-common/setup-makefiles.sh
 
 PRODUCT_COPY_FILES += \
-    vendor/sony/qcom-common/proprietary-330/vendor/firmware/a330_pfp.fw:system/vendor/firmware/a330_pfp.fw \
-    vendor/sony/qcom-common/proprietary-330/vendor/firmware/a330_pm4.fw:system/vendor/firmware/a330_pm4.fw \
+    vendor/sony/qcom-common/proprietary-330/etc/firmware/a225p5_pm4.fw:system/etc/firmware/a225p5_pm4.fw \
+    vendor/sony/qcom-common/proprietary-330/etc/firmware/a225_pfp.fw:system/etc/firmware/a225_pfp.fw \
+    vendor/sony/qcom-common/proprietary-330/etc/firmware/a225_pm4.fw:system/etc/firmware/a225_pm4.fw \
+    vendor/sony/qcom-common/proprietary-330/etc/firmware/a300_pfp.fw:system/etc/firmware/a300_pfp.fw \
+    vendor/sony/qcom-common/proprietary-330/etc/firmware/a300_pm4.fw:system/etc/firmware/a300_pm4.fw \
+    vendor/sony/qcom-common/proprietary-330/etc/firmware/a330_pfp.fw:system/etc/firmware/a330_pfp.fw \
+    vendor/sony/qcom-common/proprietary-330/etc/firmware/a330_pm4.fw:system/etc/firmware/a330_pm4.fw \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/egl/eglsubAndroid.so:system/vendor/lib/egl/eglsubAndroid.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/egl/libEGL_adreno.so:system/vendor/lib/egl/libEGL_adreno.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/egl/libGLESv1_CM_adreno.so:system/vendor/lib/egl/libGLESv1_CM_adreno.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/egl/libGLESv2_adreno.so:system/vendor/lib/egl/libGLESv2_adreno.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/egl/libplayback_adreno.so:system/vendor/lib/egl/libplayback_adreno.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/egl/libq3dtools_adreno.so:system/vendor/lib/egl/libq3dtools_adreno.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libadreno_utils.so:system/vendor/lib/libadreno_utils.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/libC2D2.so:system/vendor/lib/libC2D2.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libc2d2_z180.so:system/vendor/lib/libc2d2_z180.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libc2d30-a3xx.so:system/vendor/lib/libc2d30-a3xx.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libc2d30-a4xx.so:system/vendor/lib/libc2d30-a4xx.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libc2d30.so:system/vendor/lib/libc2d30.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/libCB.so:system/vendor/lib/libCB.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libgsl.so:system/vendor/lib/libgsl.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libllvm-qcom.so:system/vendor/lib/libllvm-qcom.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/libOpenCL.so:system/vendor/lib/libOpenCL.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/libOpenVG.so:system/vendor/lib/libOpenVG.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/libadreno_utils.so:system/vendor/lib/libadreno_utils.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/libc2d30-a3xx.so:system/vendor/lib/libc2d30-a3xx.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/libc2d30.so:system/vendor/lib/libc2d30.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/libgsl.so:system/vendor/lib/libgsl.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/libllvm-a3xx.so:system/vendor/lib/libllvm-a3xx.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/libllvm-qcom.so:system/vendor/lib/libllvm-qcom.so \
-    vendor/sony/qcom-common/proprietary-330/vendor/lib/librs_adreno.so:system/vendor/lib/librs_adreno.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/librs_adreno_sha1.so:system/vendor/lib/librs_adreno_sha1.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/librs_adreno.so:system/vendor/lib/librs_adreno.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so \
+    vendor/sony/qcom-common/proprietary-330/vendor/lib/libsc-a2xx.so:system/vendor/lib/libsc-a2xx.so \
     vendor/sony/qcom-common/proprietary-330/vendor/lib/libsc-a3xx.so:system/vendor/lib/libsc-a3xx.so