From: Olof Johansson Date: Thu, 22 Oct 2015 16:44:41 +0000 (-0700) Subject: Merge tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7c83d2f79ec61590907f466787d8199ad0669beb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm into next/defconfig Qualcomm ARM Based defconfig Updates for v4.4 * Enable QCOM SMD/RPM in multi_v7_defconfig * Enable QCOM SMD/RPM in qcom_defconfig * tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm: ARM: multi_v7_defconfig: Enable QCOM SMD/RPM ARM: qcom_defconfig: Enable SMD-RPM regulators Signed-off-by: Olof Johansson --- 7c83d2f79ec61590907f466787d8199ad0669beb diff --cc arch/arm/configs/multi_v7_defconfig index 73f7d762704e,41aecd75e2aa..a992c510723c --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -427,7 -415,7 +427,8 @@@ CONFIG_REGULATOR_MAX77802= CONFIG_REGULATOR_PALMAS=y CONFIG_REGULATOR_PBIAS=y CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_RPM=y + CONFIG_REGULATOR_QCOM_SMD_RPM=y CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_S5M8767=y CONFIG_REGULATOR_TPS51632=y @@@ -647,7 -631,7 +651,8 @@@ CONFIG_APQ_MMCC_8084= CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y + CONFIG_HWSPINLOCK_QCOM=y +CONFIG_ROCKCHIP_IOMMU=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_PM_DEVFREQ=y