From: Stephen Boyd Date: Wed, 15 Aug 2018 06:00:15 +0000 (-0700) Subject: Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845', 'clk... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ac7da1b787d9ea43680c487613269742c48d8747;p=openwrt%2Fstaging%2Fblogic.git Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845', 'clk-scmi-round' and 'clk-cs2000-spdx' into clk-next * clk-actions-s700: : - Actions Semi Owl series S700 SoC clk driver clk: actions: Add S700 SoC clock support dt-bindings: clock: Add S700 support for Actions Semi Soc's clk: actions: Add missing REGMAP_MMIO dependency * clk-exynos-unused: : - Remove an unused variable from Exynos4412 ISP driver clk: samsung: Remove unused mout_user_aclk400_mcuisp_p4x12 variable * clk-qcom-dispcc-845: : - Qualcomm SDM845 display clock controller clk: qcom: Add display clock controller driver for SDM845 dt-bindings: clock: Introduce QCOM Display clock bindings clk: qcom: Move frequency table macro to common file * clk-scmi-round: : - Fix a thinko bug in SCMI clk division logic clk: scmi: Fix the rounding of clock rate * clk-cs2000-spdx: clk: cs2000-cp: convert to SPDX identifiers --- ac7da1b787d9ea43680c487613269742c48d8747 diff --cc drivers/clk/qcom/Makefile index 599ab9154480,762c01137c2f,762c01137c2f,2b041b2db30a,762c01137c2f,762c01137c2f..21a45035930d --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@@@@@@ -37,8 -37,7 -37,7 -37,8 -37,7 -37,7 +37,9 @@@@@@@ obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm obj-$(CONFIG_QCOM_A53PLL) += a53-pll.o obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += apcs-msm8916.o obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o +++++obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o +++ ++obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o