diff options
| author | Will McVicker <willmcvicker@google.com> | 2019-12-02 14:33:39 -0800 |
|---|---|---|
| committer | Joseph Jang <josephjang@google.com> | 2019-12-03 17:58:29 +0000 |
| commit | 171861bf7bbcd84162a01de9f6aaaa8e78bb82af (patch) | |
| tree | bf3c510639cb8ae61c7f0b56bf205665ba866e98 | |
| parent | 3e108d7e1778f32464560cd20db2bdb499fb6e6d (diff) | |
| parent | 14fc67c2f5396c0e7c504535d4ebd3f48b9ef9da (diff) | |
| download | camera-devicetree-171861bf7bbcd84162a01de9f6aaaa8e78bb82af.tar.gz | |
Merge remote-tracking branch 'partner/android-msm-pixel-4.19-gki-dev' into HEADandroid-s-v2-beta-3_r0.4android-s-v2-beta-2_r0.4android-s-v2-beta-1_r0.4android-s-qpr3-beta-3_r0.3android-s-qpr3-beta-2_r0.3android-s-qpr3-beta-1_r0.3android-s-preview-3_r0.5android-s-preview-2_r0.5android-s-preview-1_r0.5android-s-beta-5_r0.5android-s-beta-4_r0.5android-s-beta-3_r0.5android-s-beta-2_r0.5android-s-beta-1_r0.5android-12.1.0_r0.4android-12.1.0_r0.33android-12.1.0_r0.26android-12.1.0_r0.20android-12.1.0_r0.14android-12.0.0_r0.6android-12.0.0_r0.40android-12.0.0_r0.34android-12.0.0_r0.24android-12.0.0_r0.14android-11.0.0_r0.95android-11.0.0_r0.86android-11.0.0_r0.81android-11.0.0_r0.76android-11.0.0_r0.66android-11.0.0_r0.57android-11.0.0_r0.56android-11.0.0_r0.47android-11.0.0_r0.46android-11.0.0_r0.33android-11.0.0_r0.32android-11.0.0_r0.27android-11.0.0_r0.26android-11.0.0_r0.18android-11.0.0_r0.16android-11.0.0_r0.115android-11.0.0_r0.114android-11.0.0_r0.105android-11.0.0_r0.100android-msm-sunfish-4.14-android11-qpr3android-msm-redfin-4.19-android11-qpr1android-msm-redfin-4.19-android11-d1android-msm-redbull-4.19-s-v2-beta-3android-msm-redbull-4.19-s-qpr3-beta-3android-msm-redbull-4.19-s-qpr3-beta-2android-msm-redbull-4.19-s-preview-3android-msm-redbull-4.19-s-preview-2android-msm-redbull-4.19-s-preview-1android-msm-redbull-4.19-s-beta-5android-msm-redbull-4.19-s-beta-4android-msm-redbull-4.19-s-beta-3android-msm-redbull-4.19-s-beta-2android-msm-redbull-4.19-s-beta-1android-msm-redbull-4.19-android12Landroid-msm-redbull-4.19-android12-v2-beta-2android-msm-redbull-4.19-android12-qpr3android-msm-redbull-4.19-android12-qpr1android-msm-redbull-4.19-android12android-msm-redbull-4.19-android11-qpr3android-msm-redbull-4.19-android11-qpr2android-msm-redbull--s-v2-beta-1android-msm-redbull--s-beta-1android-msm-bramble-4.19-android11-qpr1android-msm-bramble-4.19-android11-d1
Test: build, boot bramble, verify list of probed devices
Test: sanity test wlan, BT, audio/video playback
Change-Id: Ida6861e493d64790af0d6211372176cd547ec1a1
Signed-off-by: Will McVicker <willmcvicker@google.com>
| -rw-r--r-- | kona-camera.dtsi | 1 | ||||
| -rw-r--r-- | lito-camera.dtsi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/kona-camera.dtsi b/kona-camera.dtsi index 7058993..464dfdf 100644 --- a/kona-camera.dtsi +++ b/kona-camera.dtsi @@ -1701,5 +1701,6 @@ <480000000 0 0>, <600000000 0 0>; status = "ok"; + qcom,msm-bus,name = "fd_core"; }; }; diff --git a/lito-camera.dtsi b/lito-camera.dtsi index 10751f4..ebeb596 100644 --- a/lito-camera.dtsi +++ b/lito-camera.dtsi @@ -995,6 +995,7 @@ <480000000 0 0>, <600000000 0 0>; status = "ok"; + qcom,msm-bus,name = "fd_core"; }; qcom,cam-lrme { |