mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
This is a collection of a few late fixes and other misc. stuff that had dependencies on things being merged from other trees. The bulk of the changes are for samsung/exynos SoCs for some changes that needed a few minor reworks so ended up a bit late. The others are mainly for qcom SoCs: a couple fixes and some DTS updates. There's one conflict with drivers/cpufreq/exynos-cpufreq.c because it's now been completely removed, but there were some fixes that hit mainline in the meantime. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIbBAABAgAGBQJV8fkAAAoJEFk3GJrT+8Zllf8P9jj3+TnvbJS/8bWoQoB7BRUZ LZPgi2+sBXylrBV60uQdyodiTHQUMZhbL7GvgEVG0z6yyin7nyijqNkulTbQbWmg WhumLNCNcs8vlZegA/corbwgcVC7FkjOP97HveTe2mgwZ+GaXj9qMRQzBsMqSXEo 4890ZeP1nWBTP42oXOQHkNyKWFBjuERK0dTw2MXj7WE0/Ag8i7ERp76uJQdQ7V5O BpNRwxp3vSCky8rxbpD/avWdlspv1yZGBQyLeIreVq2YQFojvT36K8wHcf6iWBT/ pzGGV/uZM7MnrGZdqSfVEMDHl7Z2s7Ls+sv5F6Md7ErnVDerHGRjw/6lJDjbeH7u trucpsuhz5yhTjpZssGHH2NT8pWxxh8M+AaNOiiH8PuYESAbPAmWLpWkn+648bIn P++Z90DIyfNEqnNSMHkcQYpVt8zc4g75gZfTIIsXLB+DLgzgSK8ergrfyRN/O0zj oFY35g3wHdgisnGve+BAW30zTZtP19TMT36OltWjIkjuRZC29PS2vkH8eTETdVXx 01f/qcpbB1L1rXfIBjNkjx81j89XPd68JIBfctTF5QBOAGm/Dix6tj2mU/N7TNu5 TrBmD3CXdOQbCPaoK/qWX7/b11IN/XOlGL06hhYwbSdvCVy7rNccApXvfnrDWziK Ly923FP1OB7h0Kk1cmo= =85Ck -----END PGP SIGNATURE----- Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull late ARM SoC updates from Kevin Hilman: "This is a collection of a few late fixes and other misc stuff that had dependencies on things being merged from other trees. The bulk of the changes are for samsung/exynos SoCs for some changes that needed a few minor reworks so ended up a bit late. The others are mainly for qcom SoCs: a couple fixes and some DTS updates" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits) ARM: multi_v7_defconfig: Enable PBIAS regulator soc: qcom: smd: Correct fBLOCKREADINTR handling soc: qcom: smd: Use correct remote processor ID soc: qcom: smem: Fix errant private access ARM: dts: qcom: msm8974-sony-xperia-honami: Use stdout-path ARM: dts: qcom: msm8960-cdp: Use stdout-path ARM: dts: qcom: msm8660-surf: Use stdout-path ARM: dts: qcom: ipq8064-ap148: Use stdout-path ARM: dts: qcom: apq8084-mtp: Use stdout-path ARM: dts: qcom: apq8084-ifc6540: Use stdout-path ARM: dts: qcom: apq8074-dragonboard: Use stdout-path ARM: dts: qcom: apq8064-ifc6410: Use stdout-path ARM: dts: qcom: apq8064-cm-qs600: Use stdout-path ARM: dts: qcom: Label serial nodes for aliasing and stdout-path reset: ath79: Fix missing spin_lock_init reset: Add (devm_)reset_control_get stub functions ARM: EXYNOS: switch to using generic cpufreq driver for exynos4x12 cpufreq: exynos: Remove unselectable rule for arm-exynos-cpufreq.o ARM: dts: add iommu property to JPEG device for exynos4 ARM: dts: enable SPI1 for exynos4412-odroidu3 ...
104 lines
4.9 KiB
Makefile
104 lines
4.9 KiB
Makefile
# CPUfreq core
|
|
obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o
|
|
obj-$(CONFIG_PM_OPP) += cpufreq_opp.o
|
|
|
|
# CPUfreq stats
|
|
obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o
|
|
|
|
# CPUfreq governors
|
|
obj-$(CONFIG_CPU_FREQ_GOV_PERFORMANCE) += cpufreq_performance.o
|
|
obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o
|
|
obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o
|
|
obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o
|
|
obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o
|
|
obj-$(CONFIG_CPU_FREQ_GOV_COMMON) += cpufreq_governor.o
|
|
|
|
obj-$(CONFIG_CPUFREQ_DT) += cpufreq-dt.o
|
|
|
|
##################################################################################
|
|
# x86 drivers.
|
|
# Link order matters. K8 is preferred to ACPI because of firmware bugs in early
|
|
# K8 systems. This is still the case but acpi-cpufreq errors out so that
|
|
# powernow-k8 can load then. ACPI is preferred to all other hardware-specific drivers.
|
|
# speedstep-* is preferred over p4-clockmod.
|
|
|
|
obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o
|
|
obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o
|
|
obj-$(CONFIG_X86_PCC_CPUFREQ) += pcc-cpufreq.o
|
|
obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o
|
|
obj-$(CONFIG_X86_POWERNOW_K7) += powernow-k7.o
|
|
obj-$(CONFIG_X86_LONGHAUL) += longhaul.o
|
|
obj-$(CONFIG_X86_E_POWERSAVER) += e_powersaver.o
|
|
obj-$(CONFIG_ELAN_CPUFREQ) += elanfreq.o
|
|
obj-$(CONFIG_SC520_CPUFREQ) += sc520_freq.o
|
|
obj-$(CONFIG_X86_LONGRUN) += longrun.o
|
|
obj-$(CONFIG_X86_GX_SUSPMOD) += gx-suspmod.o
|
|
obj-$(CONFIG_X86_SPEEDSTEP_ICH) += speedstep-ich.o
|
|
obj-$(CONFIG_X86_SPEEDSTEP_LIB) += speedstep-lib.o
|
|
obj-$(CONFIG_X86_SPEEDSTEP_SMI) += speedstep-smi.o
|
|
obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO) += speedstep-centrino.o
|
|
obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o
|
|
obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o
|
|
obj-$(CONFIG_X86_INTEL_PSTATE) += intel_pstate.o
|
|
obj-$(CONFIG_X86_AMD_FREQ_SENSITIVITY) += amd_freq_sensitivity.o
|
|
obj-$(CONFIG_X86_SFI_CPUFREQ) += sfi-cpufreq.o
|
|
|
|
##################################################################################
|
|
# ARM SoC drivers
|
|
obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ) += arm_big_little.o
|
|
# big LITTLE per platform glues. Keep DT_BL_CPUFREQ as the last entry in all big
|
|
# LITTLE drivers, so that it is probed last.
|
|
obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o
|
|
|
|
obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o
|
|
obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o
|
|
obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ) += exynos5440-cpufreq.o
|
|
obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o
|
|
obj-$(CONFIG_ARM_HISI_ACPU_CPUFREQ) += hisi-acpu-cpufreq.o
|
|
obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o
|
|
obj-$(CONFIG_ARM_INTEGRATOR) += integrator-cpufreq.o
|
|
obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o
|
|
obj-$(CONFIG_ARM_MT8173_CPUFREQ) += mt8173-cpufreq.o
|
|
obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o
|
|
obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o
|
|
obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o
|
|
obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o
|
|
obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o
|
|
obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o
|
|
obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o
|
|
obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o
|
|
obj-$(CONFIG_ARM_S3C2440_CPUFREQ) += s3c2440-cpufreq.o
|
|
obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o
|
|
obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
|
|
obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o
|
|
obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o
|
|
obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o
|
|
obj-$(CONFIG_ARM_TEGRA20_CPUFREQ) += tegra20-cpufreq.o
|
|
obj-$(CONFIG_ARM_TEGRA124_CPUFREQ) += tegra124-cpufreq.o
|
|
obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o
|
|
|
|
##################################################################################
|
|
# PowerPC platform drivers
|
|
obj-$(CONFIG_CPU_FREQ_CBE) += ppc-cbe-cpufreq.o
|
|
ppc-cbe-cpufreq-y += ppc_cbe_cpufreq_pervasive.o ppc_cbe_cpufreq.o
|
|
obj-$(CONFIG_CPU_FREQ_CBE_PMI) += ppc_cbe_cpufreq_pmi.o
|
|
obj-$(CONFIG_CPU_FREQ_MAPLE) += maple-cpufreq.o
|
|
obj-$(CONFIG_QORIQ_CPUFREQ) += qoriq-cpufreq.o
|
|
obj-$(CONFIG_CPU_FREQ_PMAC) += pmac32-cpufreq.o
|
|
obj-$(CONFIG_CPU_FREQ_PMAC64) += pmac64-cpufreq.o
|
|
obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += pasemi-cpufreq.o
|
|
obj-$(CONFIG_POWERNV_CPUFREQ) += powernv-cpufreq.o
|
|
|
|
##################################################################################
|
|
# Other platform drivers
|
|
obj-$(CONFIG_AVR32_AT32AP_CPUFREQ) += at32ap-cpufreq.o
|
|
obj-$(CONFIG_BFIN_CPU_FREQ) += blackfin-cpufreq.o
|
|
obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
|
|
obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
|
|
obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o
|
|
obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
|
|
obj-$(CONFIG_LOONGSON1_CPUFREQ) += ls1x-cpufreq.o
|
|
obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o
|
|
obj-$(CONFIG_SPARC_US2E_CPUFREQ) += sparc-us2e-cpufreq.o
|
|
obj-$(CONFIG_SPARC_US3_CPUFREQ) += sparc-us3-cpufreq.o
|
|
obj-$(CONFIG_UNICORE32) += unicore2-cpufreq.o
|