Commit c2b58149 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk fixes from Stephen Boyd:
 "The usual collection of driver fixlets:

   - build cleanup/fix for the sunxi makefile that tried to save size
     but failed and prevented dead code elimination from working

   - two Davinci clk driver fixes for a typo causing build failures in
     different configurations and an error check that checks the wrong
     variable.

   - undo the DT ABI breaking imx6ul binding header shuffle that got
     merged this cycle"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  dt-bindings: clock: imx6ul: Do not change the clock definition order
  clk: davinci: fix a typo (which leads to build failures)
  clk: davinci: cfgchip: testing the wrong variable
  clk: sunxi-ng: replace lib-y with obj-y
parents 1bb15570 9cc63791
...@@ -96,7 +96,7 @@ obj-$(CONFIG_ARCH_SPRD) += sprd/ ...@@ -96,7 +96,7 @@ obj-$(CONFIG_ARCH_SPRD) += sprd/
obj-$(CONFIG_ARCH_STI) += st/ obj-$(CONFIG_ARCH_STI) += st/
obj-$(CONFIG_ARCH_STRATIX10) += socfpga/ obj-$(CONFIG_ARCH_STRATIX10) += socfpga/
obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/
obj-$(CONFIG_ARCH_SUNXI) += sunxi-ng/ obj-$(CONFIG_SUNXI_CCU) += sunxi-ng/
obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_ARCH_TEGRA) += tegra/
obj-y += ti/ obj-y += ti/
obj-$(CONFIG_CLK_UNIPHIER) += uniphier/ obj-$(CONFIG_CLK_UNIPHIER) += uniphier/
......
...@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap) ...@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap); usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
if (IS_ERR(usb1)) { if (IS_ERR(usb1)) {
if (PTR_ERR(usb0) == -EPROBE_DEFER) if (PTR_ERR(usb1) == -EPROBE_DEFER)
return -EPROBE_DEFER; return -EPROBE_DEFER;
dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n", dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
......
...@@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data; ...@@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data;
#ifdef CONFIG_ARCH_DAVINCI_DM355 #ifdef CONFIG_ARCH_DAVINCI_DM355
extern const struct davinci_psc_init_data dm355_psc_init_data; extern const struct davinci_psc_init_data dm355_psc_init_data;
#endif #endif
#ifdef CONFIG_ARCH_DAVINCI_DM356 #ifdef CONFIG_ARCH_DAVINCI_DM365
extern const struct davinci_psc_init_data dm365_psc_init_data; extern const struct davinci_psc_init_data dm365_psc_init_data;
#endif #endif
#ifdef CONFIG_ARCH_DAVINCI_DM644x #ifdef CONFIG_ARCH_DAVINCI_DM644x
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Common objects # Common objects
lib-$(CONFIG_SUNXI_CCU) += ccu_common.o obj-y += ccu_common.o
lib-$(CONFIG_SUNXI_CCU) += ccu_mmc_timing.o obj-y += ccu_mmc_timing.o
lib-$(CONFIG_SUNXI_CCU) += ccu_reset.o obj-y += ccu_reset.o
# Base clock types # Base clock types
lib-$(CONFIG_SUNXI_CCU) += ccu_div.o obj-y += ccu_div.o
lib-$(CONFIG_SUNXI_CCU) += ccu_frac.o obj-y += ccu_frac.o
lib-$(CONFIG_SUNXI_CCU) += ccu_gate.o obj-y += ccu_gate.o
lib-$(CONFIG_SUNXI_CCU) += ccu_mux.o obj-y += ccu_mux.o
lib-$(CONFIG_SUNXI_CCU) += ccu_mult.o obj-y += ccu_mult.o
lib-$(CONFIG_SUNXI_CCU) += ccu_phase.o obj-y += ccu_phase.o
lib-$(CONFIG_SUNXI_CCU) += ccu_sdm.o obj-y += ccu_sdm.o
# Multi-factor clocks # Multi-factor clocks
lib-$(CONFIG_SUNXI_CCU) += ccu_nk.o obj-y += ccu_nk.o
lib-$(CONFIG_SUNXI_CCU) += ccu_nkm.o obj-y += ccu_nkm.o
lib-$(CONFIG_SUNXI_CCU) += ccu_nkmp.o obj-y += ccu_nkmp.o
lib-$(CONFIG_SUNXI_CCU) += ccu_nm.o obj-y += ccu_nm.o
lib-$(CONFIG_SUNXI_CCU) += ccu_mp.o obj-y += ccu_mp.o
# SoC support # SoC support
obj-$(CONFIG_SUN50I_A64_CCU) += ccu-sun50i-a64.o obj-$(CONFIG_SUN50I_A64_CCU) += ccu-sun50i-a64.o
...@@ -38,12 +38,3 @@ obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i-r40.o ...@@ -38,12 +38,3 @@ obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i-r40.o
obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o
obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o
obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o
# The lib-y file goals is supposed to work only in arch/*/lib or lib/. In our
# case, we want to use that goal, but even though lib.a will be properly
# generated, it will not be linked in, eventually resulting in a linker error
# for missing symbols.
#
# We can work around that by explicitly adding lib.a to the obj-y goal. This is
# an undocumented behaviour, but works well for now.
obj-$(CONFIG_SUNXI_CCU) += lib.a
...@@ -235,27 +235,25 @@ ...@@ -235,27 +235,25 @@
#define IMX6UL_CLK_CSI_PODF 222 #define IMX6UL_CLK_CSI_PODF 222
#define IMX6UL_CLK_PLL3_120M 223 #define IMX6UL_CLK_PLL3_120M 223
#define IMX6UL_CLK_KPP 224 #define IMX6UL_CLK_KPP 224
#define IMX6UL_CLK_CKO1_SEL 225 #define IMX6ULL_CLK_ESAI_PRED 225
#define IMX6UL_CLK_CKO1_PODF 226 #define IMX6ULL_CLK_ESAI_PODF 226
#define IMX6UL_CLK_CKO1 227 #define IMX6ULL_CLK_ESAI_EXTAL 227
#define IMX6UL_CLK_CKO2_SEL 228 #define IMX6ULL_CLK_ESAI_MEM 228
#define IMX6UL_CLK_CKO2_PODF 229 #define IMX6ULL_CLK_ESAI_IPG 229
#define IMX6UL_CLK_CKO2 230 #define IMX6ULL_CLK_DCP_CLK 230
#define IMX6UL_CLK_CKO 231 #define IMX6ULL_CLK_EPDC_PRE_SEL 231
#define IMX6ULL_CLK_EPDC_SEL 232
/* For i.MX6ULL */ #define IMX6ULL_CLK_EPDC_PODF 233
#define IMX6ULL_CLK_ESAI_PRED 232 #define IMX6ULL_CLK_EPDC_ACLK 234
#define IMX6ULL_CLK_ESAI_PODF 233 #define IMX6ULL_CLK_EPDC_PIX 235
#define IMX6ULL_CLK_ESAI_EXTAL 234 #define IMX6ULL_CLK_ESAI_SEL 236
#define IMX6ULL_CLK_ESAI_MEM 235 #define IMX6UL_CLK_CKO1_SEL 237
#define IMX6ULL_CLK_ESAI_IPG 236 #define IMX6UL_CLK_CKO1_PODF 238
#define IMX6ULL_CLK_DCP_CLK 237 #define IMX6UL_CLK_CKO1 239
#define IMX6ULL_CLK_EPDC_PRE_SEL 238 #define IMX6UL_CLK_CKO2_SEL 240
#define IMX6ULL_CLK_EPDC_SEL 239 #define IMX6UL_CLK_CKO2_PODF 241
#define IMX6ULL_CLK_EPDC_PODF 240 #define IMX6UL_CLK_CKO2 242
#define IMX6ULL_CLK_EPDC_ACLK 241 #define IMX6UL_CLK_CKO 243
#define IMX6ULL_CLK_EPDC_PIX 242
#define IMX6ULL_CLK_ESAI_SEL 243
#define IMX6UL_CLK_END 244 #define IMX6UL_CLK_END 244
#endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */ #endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment