Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eff0beb authored by David Lechner's avatar David Lechner Committed by Michael Turquette
Browse files

clk: davinci: Fix link errors when not all SoCs are enabled 



This fixes linker errors due to undefined symbols when one or more of
the TI DaVinci SoCs is not enabled in the kernel config.

Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarMichael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/20180525181150.17873-10-david@lechnology.com
parent 043eaa70

drivers/clk/davinci/pll.c

+16 −0
Original line number Diff line number Diff line
@@ -860,25 +860,41 @@ static struct davinci_pll_platform_data *davinci_pll_get_pdata(struct device *de 
}



/* needed in early boot for clocksource/clockevent */

#ifdef CONFIG_ARCH_DAVINCI_DA850

CLK_OF_DECLARE(da850_pll0, "ti,da850-pll0", of_da850_pll0_init);

#endif



static const struct of_device_id davinci_pll_of_match[] = {

#ifdef CONFIG_ARCH_DAVINCI_DA850

	{ .compatible = "ti,da850-pll1", .data = of_da850_pll1_init },

#endif

	{ }

};



static const struct platform_device_id davinci_pll_id_table[] = {

#ifdef CONFIG_ARCH_DAVINCI_DA830

	{ .name = "da830-pll",   .driver_data = (kernel_ulong_t)da830_pll_init   },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DA850

	{ .name = "da850-pll0",  .driver_data = (kernel_ulong_t)da850_pll0_init  },

	{ .name = "da850-pll1",  .driver_data = (kernel_ulong_t)da850_pll1_init  },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM355

	{ .name = "dm355-pll1",  .driver_data = (kernel_ulong_t)dm355_pll1_init  },

	{ .name = "dm355-pll2",  .driver_data = (kernel_ulong_t)dm355_pll2_init  },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM365

	{ .name = "dm365-pll1",  .driver_data = (kernel_ulong_t)dm365_pll1_init  },

	{ .name = "dm365-pll2",  .driver_data = (kernel_ulong_t)dm365_pll2_init  },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM644x

	{ .name = "dm644x-pll1", .driver_data = (kernel_ulong_t)dm644x_pll1_init },

	{ .name = "dm644x-pll2", .driver_data = (kernel_ulong_t)dm644x_pll2_init },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM646x

	{ .name = "dm646x-pll1", .driver_data = (kernel_ulong_t)dm646x_pll1_init },

	{ .name = "dm646x-pll2", .driver_data = (kernel_ulong_t)dm646x_pll2_init },

#endif

	{ }

};

drivers/clk/davinci/pll.h

+8 −3
Original line number Diff line number Diff line
@@ -122,14 +122,19 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node, 


/* Platform-specific callbacks */



#ifdef CONFIG_ARCH_DAVINCI_DA850

int da850_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

void of_da850_pll0_init(struct device_node *node);

int of_da850_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);



#endif

#ifdef CONFIG_ARCH_DAVINCI_DM355

int dm355_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);



#endif

#ifdef CONFIG_ARCH_DAVINCI_DM644x

int dm644x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);



#endif

#ifdef CONFIG_ARCH_DAVINCI_DM646x

int dm646x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

#endif



#endif /* __CLK_DAVINCI_PLL_H___ */

drivers/clk/davinci/psc.c

+14 −0
Original line number Diff line number Diff line
@@ -513,20 +513,34 @@ int of_davinci_psc_clk_init(struct device *dev, 
}



static const struct of_device_id davinci_psc_of_match[] = {

#ifdef CONFIG_ARCH_DAVINCI_DA850

	{ .compatible = "ti,da850-psc0", .data = &of_da850_psc0_init_data },

	{ .compatible = "ti,da850-psc1", .data = &of_da850_psc1_init_data },

#endif

	{ }

};



static const struct platform_device_id davinci_psc_id_table[] = {

#ifdef CONFIG_ARCH_DAVINCI_DA830

	{ .name = "da830-psc0", .driver_data = (kernel_ulong_t)&da830_psc0_init_data },

	{ .name = "da830-psc1", .driver_data = (kernel_ulong_t)&da830_psc1_init_data },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DA850

	{ .name = "da850-psc0", .driver_data = (kernel_ulong_t)&da850_psc0_init_data },

	{ .name = "da850-psc1", .driver_data = (kernel_ulong_t)&da850_psc1_init_data },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM355

	{ .name = "dm355-psc",  .driver_data = (kernel_ulong_t)&dm355_psc_init_data  },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM365

	{ .name = "dm365-psc",  .driver_data = (kernel_ulong_t)&dm365_psc_init_data  },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM644x

	{ .name = "dm644x-psc", .driver_data = (kernel_ulong_t)&dm644x_psc_init_data },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM646x

	{ .name = "dm646x-psc", .driver_data = (kernel_ulong_t)&dm646x_psc_init_data },

#endif

	{ }

};

drivers/clk/davinci/psc.h

+12 −0
Original line number Diff line number Diff line
@@ -94,15 +94,27 @@ struct davinci_psc_init_data { 
	int (*psc_init)(struct device *dev, void __iomem *base);

};



#ifdef CONFIG_ARCH_DAVINCI_DA830

extern const struct davinci_psc_init_data da830_psc0_init_data;

extern const struct davinci_psc_init_data da830_psc1_init_data;

#endif

#ifdef CONFIG_ARCH_DAVINCI_DA850

extern const struct davinci_psc_init_data da850_psc0_init_data;

extern const struct davinci_psc_init_data da850_psc1_init_data;

extern const struct davinci_psc_init_data of_da850_psc0_init_data;

extern const struct davinci_psc_init_data of_da850_psc1_init_data;

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM355

extern const struct davinci_psc_init_data dm355_psc_init_data;

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM356

extern const struct davinci_psc_init_data dm365_psc_init_data;

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM644x

extern const struct davinci_psc_init_data dm644x_psc_init_data;

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM646x

extern const struct davinci_psc_init_data dm646x_psc_init_data;

#endif



#endif /* __CLK_DAVINCI_PSC_H__ */

include/linux/clk/davinci.h

+15 −4
Original line number Diff line number Diff line
@@ -13,17 +13,28 @@ 


/* function for registering clocks in early boot */



#ifdef CONFIG_ARCH_DAVINCI_DA830

int da830_pll_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

#endif

#ifdef CONFIG_ARCH_DAVINCI_DA850

int da850_pll0_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM355

int dm355_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

int dm355_psc_init(struct device *dev, void __iomem *base);

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM365

int dm365_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

int dm365_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

int dm644x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

int dm646x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);



int dm355_psc_init(struct device *dev, void __iomem *base);

int dm365_psc_init(struct device *dev, void __iomem *base);

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM644x

int dm644x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

int dm644x_psc_init(struct device *dev, void __iomem *base);

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM646x

int dm646x_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

int dm646x_psc_init(struct device *dev, void __iomem *base);

#endif



#endif /* __LINUX_CLK_DAVINCI_PLL_H___ */