diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-08-24 14:30:33 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-08-24 14:30:33 +0000 |
| commit | c19d62aa431eab8bd834dfbb83fb747b1791c667 (patch) | |
| tree | bdfd7a99aec31e6bff6e229cf11584c0e6ed1cef | |
| parent | ca0a94e91d747b8af9ab4df28492b848b918ca11 (diff) | |
| parent | 9ac621627ba40ebc36cdbb254fdb80a2d6c64c4c (diff) | |
Merge remote-tracking branch 'interconnect/tracking-qcomlt-interconnect' into integration-linux-qcomlt
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index e50063eae856..0e281d572d2e 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -6,6 +6,7 @@ #include <dt-bindings/arm/coresight-cti-dt.h> #include <dt-bindings/interconnect/qcom,msm8916.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/interconnect/qcom,msm8916.h> #include <dt-bindings/clock/qcom,gcc-msm8916.h> #include <dt-bindings/reset/qcom,gcc-msm8916.h> #include <dt-bindings/clock/qcom,rpmcc.h> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7570739d8116..a5c4233347fa 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1020,6 +1020,13 @@ CONFIG_SLIMBUS=m CONFIG_SLIM_QCOM_CTRL=m CONFIG_SLIM_QCOM_NGD_CTRL=m CONFIG_MUX_MMIO=y +CONFIG_INTERCONNECT=y +CONFIG_INTERCONNECT_QCOM=y +CONFIG_INTERCONNECT_QCOM_MSM8916=m +CONFIG_INTERCONNECT_QCOM_SMD_RPM=m +CONFIG_INTERCONNECT_QCOM_QCS404=m +CONFIG_INTERCONNECT_QCOM_BCM_VOTER=m +CONFIG_INTERCONNECT_QCOM_SDM845=m CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y |