diff options
Diffstat (limited to 'drivers/clocksource')
24 files changed, 96 insertions, 69 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index e1bff23320..5ee83d2b38 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -42,11 +42,11 @@ config CLOCKSOURCE_DUMMY_RATE config CLOCKSOURCE_EFI bool "Generic EFI Driver" - depends on EFI_BOOTUP + depends on EFI_PAYLOAD config CLOCKSOURCE_EFI_X86 bool "EFI X86 HW driver" - depends on EFI_BOOTUP && X86 + depends on EFI_PAYLOAD && X86 config CLOCKSOURCE_KVX bool "KVX core timer clocksource" diff --git a/drivers/clocksource/arm_architected_timer.c b/drivers/clocksource/arm_architected_timer.c index d5948fe948..9a1f2d2b79 100644 --- a/drivers/clocksource/arm_architected_timer.c +++ b/drivers/clocksource/arm_architected_timer.c @@ -22,7 +22,7 @@ static struct clocksource cs = { .priority = 70, }; -static int arm_arch_timer_probe(struct device_d *dev) +static int arm_arch_timer_probe(struct device *dev) { cs.mult = clocksource_hz2mult(get_cntfrq(), cs.shift); @@ -34,8 +34,9 @@ static struct of_device_id arm_arch_timer_dt_ids[] = { { .compatible = "arm,armv8-timer", }, { } }; +MODULE_DEVICE_TABLE(of, arm_arch_timer_dt_ids); -static struct driver_d arm_arch_timer_driver = { +static struct driver arm_arch_timer_driver = { .name = "arm-architected-timer", .probe = arm_arch_timer_probe, .of_compatible = DRV_OF_COMPAT(arm_arch_timer_dt_ids), diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c index 65bfca3558..969985f24e 100644 --- a/drivers/clocksource/arm_global_timer.c +++ b/drivers/clocksource/arm_global_timer.c @@ -63,7 +63,7 @@ static struct clocksource cs = { .priority = 70, }; -static int arm_global_timer_probe(struct device_d *dev) +static int arm_global_timer_probe(struct device *dev) { struct resource *iores; struct clk *clk; @@ -103,8 +103,9 @@ static struct of_device_id arm_global_timer_dt_ids[] = { { .compatible = "arm,cortex-a9-global-timer", }, { } }; +MODULE_DEVICE_TABLE(of, arm_global_timer_dt_ids); -static struct driver_d arm_global_timer_driver = { +static struct driver arm_global_timer_driver = { .name = "arm-global-timer", .probe = arm_global_timer_probe, .of_compatible = DRV_OF_COMPAT(arm_global_timer_dt_ids), diff --git a/drivers/clocksource/arm_smp_twd.c b/drivers/clocksource/arm_smp_twd.c index 1ad754bb2b..e677acf136 100644 --- a/drivers/clocksource/arm_smp_twd.c +++ b/drivers/clocksource/arm_smp_twd.c @@ -40,7 +40,7 @@ static struct clocksource smp_twd_clksrc = { #define SMP_TWD_MAX_FREQ (25 *1000 * 1000) -static int smp_twd_probe(struct device_d *dev) +static int smp_twd_probe(struct device *dev) { struct resource *iores; u32 tick_rate; @@ -98,8 +98,9 @@ static __maybe_unused struct of_device_id smp_twd_compatible[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, smp_twd_compatible); -static struct driver_d smp_twd_driver = { +static struct driver smp_twd_driver = { .name = "smp_twd", .probe = smp_twd_probe, .of_compatible = DRV_OF_COMPAT(smp_twd_compatible), diff --git a/drivers/clocksource/armv7m_systick.c b/drivers/clocksource/armv7m_systick.c index 16d89c23bd..eee028d12a 100644 --- a/drivers/clocksource/armv7m_systick.c +++ b/drivers/clocksource/armv7m_systick.c @@ -37,7 +37,7 @@ static struct clocksource cs = { .priority = 70, }; -static int armv7m_systick_probe(struct device_d *dev) +static int armv7m_systick_probe(struct device *dev) { struct clk *clk = NULL; u32 rate, cal; @@ -47,7 +47,7 @@ static int armv7m_systick_probe(struct device_d *dev) if (!systick_base) return -ENOENT; - ret = of_property_read_u32(dev->device_node, "clock-frequency", &rate); + ret = of_property_read_u32(dev->of_node, "clock-frequency", &rate); if (ret) { clk = clk_get(dev, NULL); if (IS_ERR(clk)) @@ -64,7 +64,7 @@ static int armv7m_systick_probe(struct device_d *dev) writel_relaxed(SYSTICK_LOAD_RELOAD_MASK, systick_base + SYST_RVR); - cal = readl(&systick_base + SYST_CALIB); + cal = readl(systick_base + SYST_CALIB); if (cal & SYSTICK_CAL_NOREF) writel(SYSTICK_CTRL_EN | SYSTICK_CTRL_CPU_CLK, systick_base + SYST_CSR); else @@ -79,8 +79,9 @@ static struct of_device_id armv7m_systick_dt_ids[] = { { .compatible = "arm,armv7m-systick", }, { } }; +MODULE_DEVICE_TABLE(of, armv7m_systick_dt_ids); -static struct driver_d armv7m_systick_driver = { +static struct driver armv7m_systick_driver = { .name = "armv7m-systick-timer", .probe = armv7m_systick_probe, .of_compatible = DRV_OF_COMPAT(armv7m_systick_dt_ids), diff --git a/drivers/clocksource/bcm2835.c b/drivers/clocksource/bcm2835.c index d5d3e3477d..73f4e8f411 100644 --- a/drivers/clocksource/bcm2835.c +++ b/drivers/clocksource/bcm2835.c @@ -32,7 +32,7 @@ static struct clocksource bcm2835_stc = { .priority = IS_ENABLED(CONFIG_CPU_V8) ? 60 : 80, }; -static int bcm2835_cs_probe(struct device_d *dev) +static int bcm2835_cs_probe(struct device *dev) { struct resource *iores; static struct clk *stc_clk; @@ -41,7 +41,7 @@ static int bcm2835_cs_probe(struct device_d *dev) /* try to read rate from DT property first */ if (IS_ENABLED(CONFIG_OFTREE)) - of_property_read_u32(dev->device_node, "clock-frequency", + of_property_read_u32(dev->of_node, "clock-frequency", &rate); /* if rate is still empty, try to get rate from clk */ @@ -80,8 +80,9 @@ static __maybe_unused struct of_device_id bcm2835_cs_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, bcm2835_cs_dt_ids); -static struct driver_d bcm2835_cs_driver = { +static struct driver bcm2835_cs_driver = { .name = "bcm2835-cs", .probe = bcm2835_cs_probe, .of_compatible = DRV_OF_COMPAT(bcm2835_cs_dt_ids), diff --git a/drivers/clocksource/clps711x.c b/drivers/clocksource/clps711x.c index d6ab695afa..f8bdc06ea8 100644 --- a/drivers/clocksource/clps711x.c +++ b/drivers/clocksource/clps711x.c @@ -22,14 +22,14 @@ static struct clocksource clps711x_cs = { .priority = 60, }; -static int clps711x_cs_probe(struct device_d *dev) +static int clps711x_cs_probe(struct device *dev) { struct resource *iores; u32 rate; struct clk *timer_clk; int id; - id = of_alias_get_id(dev->device_node, "timer"); + id = of_alias_get_id(dev->of_node, "timer"); if (id != 1) return 0; @@ -55,8 +55,9 @@ static const struct of_device_id __maybe_unused clps711x_timer_dt_ids[] = { { .compatible = "cirrus,ep7209-timer", }, { } }; +MODULE_DEVICE_TABLE(of, clps711x_timer_dt_ids); -static struct driver_d clps711x_cs_driver = { +static struct driver clps711x_cs_driver = { .name = "clps711x-cs", .probe = clps711x_cs_probe, .of_compatible = DRV_OF_COMPAT(clps711x_timer_dt_ids), diff --git a/drivers/clocksource/digic.c b/drivers/clocksource/digic.c index 234985aece..38c4bd7dd2 100644 --- a/drivers/clocksource/digic.c +++ b/drivers/clocksource/digic.c @@ -29,7 +29,7 @@ static struct clocksource digic_cs = { .priority = 60, }; -static int digic_timer_probe(struct device_d *dev) +static int digic_timer_probe(struct device *dev) { struct resource *iores; /* use only one timer */ @@ -73,8 +73,9 @@ static __maybe_unused struct of_device_id digic_timer_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, digic_timer_dt_ids); -static struct driver_d digic_timer_driver = { +static struct driver digic_timer_driver = { .probe = digic_timer_probe, .name = "digic-timer", .of_compatible = DRV_OF_COMPAT(digic_timer_dt_ids), diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c index 251089cf7e..3826c7490d 100644 --- a/drivers/clocksource/dw_apb_timer.c +++ b/drivers/clocksource/dw_apb_timer.c @@ -97,9 +97,9 @@ static struct clocksource dw_apb_clksrc = { .priority = 50, }; -static int dw_apb_timer_probe(struct device_d *dev) +static int dw_apb_timer_probe(struct device *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct resource *iores; struct clk *clk; uint32_t clk_freq; @@ -135,8 +135,9 @@ static struct of_device_id dw_apb_timer_dt_ids[] = { { .compatible = "snps,dw-apb-timer", }, { } }; +MODULE_DEVICE_TABLE(of, dw_apb_timer_dt_ids); -static struct driver_d dw_apb_timer_driver = { +static struct driver dw_apb_timer_driver = { .name = "dw-apb-timer", .probe = dw_apb_timer_probe, .of_compatible = DRV_OF_COMPAT(dw_apb_timer_dt_ids), diff --git a/drivers/clocksource/efi.c b/drivers/clocksource/efi.c index 9df5226573..1ac587a715 100644 --- a/drivers/clocksource/efi.c +++ b/drivers/clocksource/efi.c @@ -12,14 +12,14 @@ #include <linux/err.h> static uint64_t ticks = 1; -static void *efi_cs_evt; +static struct efi_event *efi_cs_evt; static uint64_t efi_cs_read(void) { return ticks; } -static void efi_cs_inc(void *event, void *ctx) +static void efi_cs_inc(struct efi_event *event, void *ctx) { ticks++; } @@ -96,12 +96,12 @@ static struct clocksource efi_cs = { .priority = 80, }; -static int efi_cs_probe(struct device_d *dev) +static int efi_cs_probe(struct device *dev) { return init_clock(&efi_cs); } -static struct driver_d efi_cs_driver = { +static struct driver efi_cs_driver = { .name = "efi-cs", .probe = efi_cs_probe, }; diff --git a/drivers/clocksource/efi_x86.c b/drivers/clocksource/efi_x86.c index c9b6c44a1e..f5a822eef7 100644 --- a/drivers/clocksource/efi_x86.c +++ b/drivers/clocksource/efi_x86.c @@ -62,12 +62,12 @@ static struct clocksource efi_x86_cs = { .init = efi_x86_cs_init, }; -static int efi_x86_cs_probe(struct device_d *dev) +static int efi_x86_cs_probe(struct device *dev) { return init_clock(&efi_x86_cs); } -static struct driver_d efi_x86_cs_driver = { +static struct driver efi_x86_cs_driver = { .name = "efi-cs-x86", .probe = efi_x86_cs_probe, }; diff --git a/drivers/clocksource/kvx_timer.c b/drivers/clocksource/kvx_timer.c index 259755eacd..eaa8f63b1e 100644 --- a/drivers/clocksource/kvx_timer.c +++ b/drivers/clocksource/kvx_timer.c @@ -24,7 +24,7 @@ static struct clocksource kvx_clksrc = { .priority = 70, }; -static int kvx_timer_probe(struct device_d *dev) +static int kvx_timer_probe(struct device *dev) { struct clk *clk; uint32_t clk_freq; @@ -49,8 +49,9 @@ static struct of_device_id kvx_timer_dt_ids[] = { { .compatible = "kalray,kvx-core-timer", }, { } }; +MODULE_DEVICE_TABLE(of, kvx_timer_dt_ids); -static struct driver_d kvx_timer_driver = { +static struct driver kvx_timer_driver = { .name = "kvx-timer", .probe = kvx_timer_probe, .of_compatible = DRV_OF_COMPAT(kvx_timer_dt_ids), diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c index d3214955dc..6a1c3d58de 100644 --- a/drivers/clocksource/mvebu.c +++ b/drivers/clocksource/mvebu.c @@ -45,7 +45,7 @@ static struct clocksource cs = { .priority = 70, }; -static int mvebu_timer_probe(struct device_d *dev) +static int mvebu_timer_probe(struct device *dev) { struct resource *iores; struct clk *clk; @@ -58,7 +58,7 @@ static int mvebu_timer_probe(struct device_d *dev) val = __raw_readl(timer_base + TIMER_CTRL_OFF); val &= ~(TIMER0_25MHZ | TIMER0_DIV_MASK); - if (of_device_is_compatible(dev->device_node, + if (of_device_is_compatible(dev->of_node, "marvell,armada-370-timer")) { clk = clk_get(dev, NULL); div = TIMER_DIVIDER; @@ -89,8 +89,9 @@ static struct of_device_id mvebu_timer_dt_ids[] = { { .compatible = "marvell,armada-xp-timer", }, { } }; +MODULE_DEVICE_TABLE(of, mvebu_timer_dt_ids); -static struct driver_d mvebu_timer_driver = { +static struct driver mvebu_timer_driver = { .name = "mvebu-timer", .probe = mvebu_timer_probe, .of_compatible = DRV_OF_COMPAT(mvebu_timer_dt_ids), diff --git a/drivers/clocksource/nomadik.c b/drivers/clocksource/nomadik.c index 7cf10352ea..cffe9cdd03 100644 --- a/drivers/clocksource/nomadik.c +++ b/drivers/clocksource/nomadik.c @@ -90,7 +90,7 @@ static void nmdk_timer_reset(void) writel(cr | MTU_CRn_ENA, mtu_base + MTU_CR(0)); } -static int nmdk_mtu_probe(struct device_d *dev) +static int nmdk_mtu_probe(struct device *dev) { struct resource *iores; static struct clk *mtu_clk; @@ -135,7 +135,7 @@ static int nmdk_mtu_probe(struct device_d *dev) return init_clock(&nmdk_clksrc); } -static struct driver_d nmdk_mtu_driver = { +static struct driver nmdk_mtu_driver = { .name = "nomadik_mtu", .probe = nmdk_mtu_probe, }; diff --git a/drivers/clocksource/orion.c b/drivers/clocksource/orion.c index 4a56849800..caa314e884 100644 --- a/drivers/clocksource/orion.c +++ b/drivers/clocksource/orion.c @@ -34,7 +34,7 @@ static struct clocksource clksrc = { .priority = 70, }; -static int orion_timer_probe(struct device_d *dev) +static int orion_timer_probe(struct device *dev) { struct resource *iores; struct clk *tclk; @@ -63,8 +63,9 @@ static struct of_device_id orion_timer_dt_ids[] = { { .compatible = "marvell,orion-timer", }, { } }; +MODULE_DEVICE_TABLE(of, orion_timer_dt_ids); -static struct driver_d orion_timer_driver = { +static struct driver orion_timer_driver = { .name = "orion-timer", .probe = orion_timer_probe, .of_compatible = DRV_OF_COMPAT(orion_timer_dt_ids), diff --git a/drivers/clocksource/rk_timer.c b/drivers/clocksource/rk_timer.c index e941030771..eb6c886af0 100644 --- a/drivers/clocksource/rk_timer.c +++ b/drivers/clocksource/rk_timer.c @@ -10,12 +10,20 @@ #include <clock.h> #include <init.h> #include <io.h> -#include <mach/timer.h> #include <stdio.h> -#include <mach/hardware.h> -#include <mach/cru_rk3288.h> +#include <mach/rockchip/hardware.h> +#include <mach/rockchip/cru_rk3288.h> #include <common.h> +struct rk_timer { + unsigned int timer_load_count0; + unsigned int timer_load_count1; + unsigned int timer_curr_value0; + unsigned int timer_curr_value1; + unsigned int timer_ctrl_reg; + unsigned int timer_int_status; +}; + struct rk_timer *timer_ptr; static uint64_t rockchip_get_ticks(void) @@ -35,7 +43,7 @@ static struct clocksource rkcs = { .priority = 80, }; -static int rockchip_timer_probe(struct device_d *dev) +static int rockchip_timer_probe(struct device *dev) { struct resource *iores; @@ -60,8 +68,9 @@ static __maybe_unused struct of_device_id rktimer_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, rktimer_dt_ids); -static struct driver_d rktimer_driver = { +static struct driver rktimer_driver = { .name = "rockchip-timer", .probe = rockchip_timer_probe, .of_compatible = DRV_OF_COMPAT(rktimer_dt_ids), diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index a133e384d7..9d2ff32c48 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c @@ -15,8 +15,8 @@ #include <common.h> #include <init.h> #include <clock.h> -#include <mach/hardware.h> -#include <mach/at91_pit.h> +#include <mach/at91/hardware.h> +#include <mach/at91/at91_pit.h> #include <io.h> #include <linux/clk.h> #include <linux/err.h> @@ -56,7 +56,7 @@ static void at91sam926x_pit_reset(void) pit_write(AT91_PIT_MR, 0xfffff | AT91_PIT_PITEN); } -static int at91_pit_probe(struct device_d *dev) +static int at91_pit_probe(struct device *dev) { struct clk *clk; u32 pit_rate; @@ -96,8 +96,9 @@ const static __maybe_unused struct of_device_id at91_pit_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, at91_pit_dt_ids); -static struct driver_d at91_pit_driver = { +static struct driver at91_pit_driver = { .name = "at91-pit", .probe = at91_pit_probe, .of_compatible = DRV_OF_COMPAT(at91_pit_dt_ids), diff --git a/drivers/clocksource/timer-clint.c b/drivers/clocksource/timer-clint.c index d48b5bcba0..f264eb4cee 100644 --- a/drivers/clocksource/timer-clint.c +++ b/drivers/clocksource/timer-clint.c @@ -60,7 +60,7 @@ static struct clocksource clint_clocksource = { .priority = 200, }; -static int clint_timer_init_dt(struct device_d* dev) +static int clint_timer_init_dt(struct device * dev) { struct resource *iores; @@ -85,8 +85,9 @@ static struct of_device_id timer_clint_dt_ids[] = { { .compatible = "sifive,clint0" }, { /* sentinel */ }, }; +MODULE_DEVICE_TABLE(of, timer_clint_dt_ids); -static struct driver_d clint_timer_driver = { +static struct driver clint_timer_driver = { .name = "clint-timer", .probe = clint_timer_init_dt, .of_compatible = timer_clint_dt_ids, diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 7ca879f4f0..6cf60ed3fc 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -77,7 +77,7 @@ static struct notifier_block imx_clock_notifier = { .notifier_call = imx_clocksource_clock_change, }; -static int imx_gpt_probe(struct device_d *dev) +static int imx_gpt_probe(struct device *dev) { struct resource *iores; int i; @@ -153,6 +153,7 @@ static __maybe_unused struct of_device_id imx_gpt_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_gpt_dt_ids); static struct platform_device_id imx_gpt_ids[] = { { @@ -166,7 +167,7 @@ static struct platform_device_id imx_gpt_ids[] = { }, }; -static struct driver_d imx_gpt_driver = { +static struct driver imx_gpt_driver = { .name = "imx-gpt", .probe = imx_gpt_probe, .of_compatible = DRV_OF_COMPAT(imx_gpt_dt_ids), diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c index c7af54fc8f..93f88711dc 100644 --- a/drivers/clocksource/timer-riscv.c +++ b/drivers/clocksource/timer-riscv.c @@ -48,7 +48,7 @@ static struct clocksource riscv_clocksource = { .priority = 100, }; -static int riscv_timer_init(struct device_d* dev) +static int riscv_timer_init(struct device * dev) { struct device_node *cpu; @@ -67,7 +67,7 @@ static int riscv_timer_init(struct device_d* dev) return init_clock(&riscv_clocksource); } -static struct driver_d riscv_timer_driver = { +static struct driver riscv_timer_driver = { .name = "riscv-timer", .probe = riscv_timer_init, }; diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index dec48fccf5..d653beb0eb 100644 --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -61,7 +61,7 @@ static struct clocksource cs = { .priority = 100, }; -static int stm32_timer_probe(struct device_d *dev) +static int stm32_timer_probe(struct device *dev) { struct resource *iores; struct clk *clk; @@ -113,8 +113,9 @@ static struct of_device_id stm32_timer_dt_ids[] = { { .compatible = "st,stm32-timer" }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, stm32_timer_dt_ids); -static struct driver_d stm32_timer_driver = { +static struct driver stm32_timer_driver = { .name = "stm32-timer", .probe = stm32_timer_probe, .of_compatible = stm32_timer_dt_ids, diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c index 21cb686369..1880082066 100644 --- a/drivers/clocksource/timer-ti-32k.c +++ b/drivers/clocksource/timer-ti-32k.c @@ -16,12 +16,12 @@ #include <clock.h> #include <init.h> #include <io.h> -#include <mach/omap3-silicon.h> -#include <mach/omap4-silicon.h> -#include <mach/clocks.h> -#include <mach/timers.h> -#include <mach/sys_info.h> -#include <mach/syslib.h> +#include <mach/omap/omap3-silicon.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/clocks.h> +#include <mach/omap/timers.h> +#include <mach/omap/sys_info.h> +#include <mach/omap/syslib.h> /** Sync 32Khz Timer registers */ #define S32K_CR 0x10 @@ -59,7 +59,7 @@ static struct clocksource s32k_cs = { * * @return result of @ref init_clock */ -static int omap_32ktimer_probe(struct device_d *dev) +static int omap_32ktimer_probe(struct device *dev) { struct resource *iores; @@ -84,8 +84,9 @@ static __maybe_unused struct of_device_id omap_32ktimer_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, omap_32ktimer_dt_ids); -static struct driver_d omap_32ktimer_driver = { +static struct driver omap_32ktimer_driver = { .name = "omap-32ktimer", .probe = omap_32ktimer_probe, .of_compatible = DRV_OF_COMPAT(omap_32ktimer_dt_ids), diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index cdd297f10c..8473cf733d 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -21,8 +21,8 @@ #include <clock.h> #include <init.h> #include <io.h> -#include <mach/am33xx-silicon.h> -#include <mach/am33xx-clock.h> +#include <mach/omap/am33xx-silicon.h> +#include <mach/omap/am33xx-clock.h> #include <stdio.h> @@ -65,7 +65,7 @@ static struct clocksource dmtimer_cs = { .priority = 70, }; -static int omap_dmtimer_probe(struct device_d *dev) +static int omap_dmtimer_probe(struct device *dev) { struct resource *iores; u64 clk_speed; @@ -96,8 +96,9 @@ static __maybe_unused struct of_device_id omap_dmtimer_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, omap_dmtimer_dt_ids); -static struct driver_d omap_dmtimer_driver = { +static struct driver omap_dmtimer_driver = { .name = "omap-dmtimer", .probe = omap_dmtimer_probe, .of_compatible = DRV_OF_COMPAT(omap_dmtimer_dt_ids), diff --git a/drivers/clocksource/uemd.c b/drivers/clocksource/uemd.c index a763eadc0c..283fb6d4aa 100644 --- a/drivers/clocksource/uemd.c +++ b/drivers/clocksource/uemd.c @@ -55,7 +55,7 @@ static struct clocksource uemd_cs = { .priority = 60, }; -static int uemd_timer_probe(struct device_d *dev) +static int uemd_timer_probe(struct device *dev) { struct resource *iores; int mode; @@ -108,8 +108,9 @@ static __maybe_unused struct of_device_id uemd_timer_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, uemd_timer_dt_ids); -static struct driver_d uemd_timer_driver = { +static struct driver uemd_timer_driver = { .probe = uemd_timer_probe, .name = "uemd-timer", .of_compatible = DRV_OF_COMPAT(uemd_timer_dt_ids), |