diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-28 00:46:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-28 00:46:26 -0800 |
| commit | fb7f86c7e7ff7bcb5eb6dc73beffb9f2b7d3f9ef (patch) | |
| tree | f3699f4b8e6c3ca88729f6b89f8b670193088c81 | |
| parent | c54d6919bf25579e50a55222aaa9154b15f02393 (diff) | |
| parent | e45f50997b80cb0824a659da4711401a5070ded7 (diff) | |
Merge "ARM: dts: msm: Enable camera for sdm630"
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm630-cdp.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm630-mtp.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm630.dtsi | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm630-cdp.dtsi b/arch/arm/boot/dts/qcom/sdm630-cdp.dtsi index c22926510f94..534d4c0c7822 100644 --- a/arch/arm/boot/dts/qcom/sdm630-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/sdm630-cdp.dtsi @@ -11,6 +11,7 @@ */ #include "sdm660-pinctrl.dtsi" +#include "sdm660-camera-sensor-cdp.dtsi" / { }; diff --git a/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi b/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi index b4b22d31402e..c3f5d331a734 100644 --- a/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi @@ -11,6 +11,7 @@ */ #include "sdm660-pinctrl.dtsi" +#include "sdm660-camera-sensor-mtp.dtsi" / { mtp_batterydata: qcom,battery-data { qcom,batt-id-range-pct = <15>; diff --git a/arch/arm/boot/dts/qcom/sdm630.dtsi b/arch/arm/boot/dts/qcom/sdm630.dtsi index 5002a11652ae..4026838b963a 100644 --- a/arch/arm/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm/boot/dts/qcom/sdm630.dtsi @@ -1387,6 +1387,7 @@ #include "msm-gdsc-660.dtsi" #include "sdm660-common.dtsi" #include "msm-arm-smmu-630.dtsi" +#include "sdm660-camera.dtsi" &gdsc_usb30 { status = "ok"; |