Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #56 from AdFad666/sony-aosp-l-1.1_rb1.27
Browse files Browse the repository at this point in the history
Bug 1243648 - Sync sony-aosp-l January 2016 r=gerard-majax
  • Loading branch information
lissyx committed Jan 28, 2016
2 parents fd4e15d + 0c3a9b3 commit d42479b
Show file tree
Hide file tree
Showing 14 changed files with 47,345 additions and 14,492 deletions.
24 changes: 24 additions & 0 deletions arch/arm/boot/dts/qcom/msm8974-rhine_common.dtsi
Expand Up @@ -805,6 +805,14 @@
qcom,default-state = "off";
qcom,id = <3>;
linux,default-trigger = "none";
qcom,start-idx = <1>;
qcom,ramp-step-ms = <120>;
qcom,duty-pcts = [00 00 00 00 00
00 00 00 00 00
50 00 00 00 00
00 00 00 00 00
00];
qcom,use-blink;
};

qcom,rgb_1 {
Expand All @@ -817,6 +825,14 @@
qcom,default-state = "off";
qcom,id = <4>;
linux,default-trigger = "none";
qcom,start-idx = <1>;
qcom,ramp-step-ms = <120>;
qcom,duty-pcts = [00 00 00 00 00
00 00 00 00 00
50 00 00 00 00
00 00 00 00 00
00];
qcom,use-blink;
};

qcom,rgb_2 {
Expand All @@ -829,6 +845,14 @@
qcom,default-state = "off";
qcom,id = <5>;
linux,default-trigger = "none";
qcom,start-idx = <1>;
qcom,ramp-step-ms = <120>;
qcom,duty-pcts = [00 00 00 00 00
00 00 00 00 00
50 00 00 00 00
00 00 00 00 00
00];
qcom,use-blink;
};
};

Expand Down
24 changes: 24 additions & 0 deletions arch/arm/boot/dts/qcom/msm8974pro-ab-shinano_common.dtsi
Expand Up @@ -1247,6 +1247,14 @@
qcom,default-state = "off";
qcom,id = <3>;
linux,default-trigger = "none";
qcom,start-idx = <1>;
qcom,ramp-step-ms = <120>;
qcom,duty-pcts = [00 00 00 00 00
00 00 00 00 00
50 00 00 00 00
00 00 00 00 00
00];
qcom,use-blink;
};

qcom,rgb_1 {
Expand All @@ -1259,6 +1267,14 @@
qcom,default-state = "off";
qcom,id = <4>;
linux,default-trigger = "none";
qcom,start-idx = <1>;
qcom,ramp-step-ms = <120>;
qcom,duty-pcts = [00 00 00 00 00
00 00 00 00 00
50 00 00 00 00
00 00 00 00 00
00];
qcom,use-blink;
};

qcom,rgb_2 {
Expand All @@ -1271,6 +1287,14 @@
qcom,default-state = "off";
qcom,id = <5>;
linux,default-trigger = "none";
qcom,start-idx = <1>;
qcom,ramp-step-ms = <120>;
qcom,duty-pcts = [00 00 00 00 00
00 00 00 00 00
50 00 00 00 00
00 00 00 00 00
00];
qcom,use-blink;
};
};

Expand Down
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_rhine_amami_defconfig
Expand Up @@ -621,3 +621,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_rhine_honami_defconfig
Expand Up @@ -621,3 +621,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_rhine_togari_defconfig
Expand Up @@ -620,3 +620,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_shinano_aries_defconfig
Expand Up @@ -622,3 +622,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_shinano_castor_defconfig
Expand Up @@ -626,3 +626,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_shinano_leo_defconfig
Expand Up @@ -622,3 +622,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_shinano_sirius_defconfig
Expand Up @@ -619,3 +619,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_yukon_eagle_defconfig
Expand Up @@ -614,3 +614,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_yukon_flamingo_defconfig
Expand Up @@ -601,3 +601,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_yukon_seagull_defconfig
Expand Up @@ -609,3 +609,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y
4 changes: 4 additions & 0 deletions arch/arm/configs/aosp_yukon_tianchi_defconfig
Expand Up @@ -604,3 +604,7 @@ CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCE=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_SECCOMP_DEBUG=n
CONFIG_FANOTIFY=y

0 comments on commit d42479b

Please sign in to comment.