Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer: "Only two changes. One removes unused code, the other makes local clock code arguments consistent with generic clock code" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: remove dead code m68k: allow NULL clock for clk_get_rate
This commit is contained in:
commit
64414e5f98
|
@ -121,6 +121,9 @@ EXPORT_SYMBOL(clk_put);
|
|||
|
||||
unsigned long clk_get_rate(struct clk *clk)
|
||||
{
|
||||
if (!clk)
|
||||
return 0;
|
||||
|
||||
return clk->rate;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get_rate);
|
||||
|
|
|
@ -222,40 +222,3 @@ void __init config_BSP(char *commandp, int size)
|
|||
m5441x_uarts_init();
|
||||
m5441x_fec_init();
|
||||
}
|
||||
|
||||
|
||||
#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
|
||||
static struct resource m5441x_rtc_resources[] = {
|
||||
{
|
||||
.start = MCFRTC_BASE,
|
||||
.end = MCFRTC_BASE + MCFRTC_SIZE - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
{
|
||||
.start = MCF_IRQ_RTC,
|
||||
.end = MCF_IRQ_RTC,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device m5441x_rtc = {
|
||||
.name = "mcfrtc",
|
||||
.id = 0,
|
||||
.resource = m5441x_rtc_resources,
|
||||
.num_resources = ARRAY_SIZE(m5441x_rtc_resources),
|
||||
};
|
||||
#endif
|
||||
|
||||
static struct platform_device *m5441x_devices[] __initdata = {
|
||||
#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
|
||||
&m5441x_rtc,
|
||||
#endif
|
||||
};
|
||||
|
||||
static int __init init_BSP(void)
|
||||
{
|
||||
platform_add_devices(m5441x_devices, ARRAY_SIZE(m5441x_devices));
|
||||
return 0;
|
||||
}
|
||||
|
||||
arch_initcall(init_BSP);
|
||||
|
|
Loading…
Reference in a new issue