summaryrefslogtreecommitdiff
path: root/drivers/timer
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/timer')
-rw-r--r--drivers/timer/ag101p_timer.c14
-rw-r--r--drivers/timer/altera_timer.c14
-rw-r--r--drivers/timer/arc_timer.c2
-rw-r--r--drivers/timer/ast_timer.c6
-rw-r--r--drivers/timer/atcpit100_timer.c14
-rw-r--r--drivers/timer/atmel_pit_timer.c14
-rw-r--r--drivers/timer/cadence-ttc.c6
-rw-r--r--drivers/timer/dw-apb-timer.c6
-rw-r--r--drivers/timer/mchp-pit64b-timer.c2
-rw-r--r--drivers/timer/mpc83xx_timer.c2
-rw-r--r--drivers/timer/mtk_timer.c2
-rw-r--r--drivers/timer/nomadik-mtu-timer.c2
-rw-r--r--drivers/timer/omap-timer.c6
-rw-r--r--drivers/timer/ostm_timer.c6
-rw-r--r--drivers/timer/rockchip_timer.c10
-rw-r--r--drivers/timer/sti-timer.c2
-rw-r--r--drivers/timer/stm32_timer.c2
-rw-r--r--drivers/timer/timer-uclass.c6
18 files changed, 58 insertions, 58 deletions
diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c
index 23ad5b2b67..17174345e3 100644
--- a/drivers/timer/ag101p_timer.c
+++ b/drivers/timer/ag101p_timer.c
@@ -58,13 +58,13 @@ struct atftmr_timer_regs {
u32 int_mask; /* 0x38 */
};
-struct atftmr_timer_platdata {
+struct atftmr_timer_plat {
struct atftmr_timer_regs *regs;
};
static u64 atftmr_timer_get_count(struct udevice *dev)
{
- struct atftmr_timer_platdata *plat = dev->platdata;
+ struct atftmr_timer_plat *plat = dev->plat;
struct atftmr_timer_regs *const regs = plat->regs;
u32 val;
val = readl(&regs->t3_counter);
@@ -73,7 +73,7 @@ static u64 atftmr_timer_get_count(struct udevice *dev)
static int atftmr_timer_probe(struct udevice *dev)
{
- struct atftmr_timer_platdata *plat = dev->platdata;
+ struct atftmr_timer_plat *plat = dev->plat;
struct atftmr_timer_regs *const regs = plat->regs;
u32 cr;
writel(0, &regs->t3_load);
@@ -88,9 +88,9 @@ static int atftmr_timer_probe(struct udevice *dev)
return 0;
}
-static int atftme_timer_ofdata_to_platdata(struct udevice *dev)
+static int atftme_timer_of_to_plat(struct udevice *dev)
{
- struct atftmr_timer_platdata *plat = dev_get_platdata(dev);
+ struct atftmr_timer_plat *plat = dev_get_plat(dev);
plat->regs = map_physmem(dev_read_addr(dev),
sizeof(struct atftmr_timer_regs),
MAP_NOCACHE);
@@ -110,8 +110,8 @@ U_BOOT_DRIVER(altera_timer) = {
.name = "ag101p_timer",
.id = UCLASS_TIMER,
.of_match = ag101p_timer_ids,
- .ofdata_to_platdata = atftme_timer_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct atftmr_timer_platdata),
+ .of_to_plat = atftme_timer_of_to_plat,
+ .plat_auto = sizeof(struct atftmr_timer_plat),
.probe = atftmr_timer_probe,
.ops = &ag101p_timer_ops,
};
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index ccc164ee17..7e9abee0ef 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -28,13 +28,13 @@ struct altera_timer_regs {
u32 snaph; /* Snapshot high */
};
-struct altera_timer_platdata {
+struct altera_timer_plat {
struct altera_timer_regs *regs;
};
static u64 altera_timer_get_count(struct udevice *dev)
{
- struct altera_timer_platdata *plat = dev->platdata;
+ struct altera_timer_plat *plat = dev->plat;
struct altera_timer_regs *const regs = plat->regs;
u32 val;
@@ -49,7 +49,7 @@ static u64 altera_timer_get_count(struct udevice *dev)
static int altera_timer_probe(struct udevice *dev)
{
- struct altera_timer_platdata *plat = dev->platdata;
+ struct altera_timer_plat *plat = dev->plat;
struct altera_timer_regs *const regs = plat->regs;
writel(0, &regs->status);
@@ -63,9 +63,9 @@ static int altera_timer_probe(struct udevice *dev)
return 0;
}
-static int altera_timer_ofdata_to_platdata(struct udevice *dev)
+static int altera_timer_of_to_plat(struct udevice *dev)
{
- struct altera_timer_platdata *plat = dev_get_platdata(dev);
+ struct altera_timer_plat *plat = dev_get_plat(dev);
plat->regs = map_physmem(dev_read_addr(dev),
sizeof(struct altera_timer_regs),
@@ -87,8 +87,8 @@ U_BOOT_DRIVER(altera_timer) = {
.name = "altera_timer",
.id = UCLASS_TIMER,
.of_match = altera_timer_ids,
- .ofdata_to_platdata = altera_timer_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct altera_timer_platdata),
+ .of_to_plat = altera_timer_of_to_plat,
+ .plat_auto = sizeof(struct altera_timer_plat),
.probe = altera_timer_probe,
.ops = &altera_timer_ops,
};
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index 2dea9f40cb..904950457c 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -105,5 +105,5 @@ U_BOOT_DRIVER(arc_timer) = {
.of_match = arc_timer_ids,
.probe = arc_timer_probe,
.ops = &arc_timer_ops,
- .priv_auto_alloc_size = sizeof(struct arc_timer_priv),
+ .priv_auto = sizeof(struct arc_timer_priv),
};
diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c
index 35369a4087..78adc96cc5 100644
--- a/drivers/timer/ast_timer.c
+++ b/drivers/timer/ast_timer.c
@@ -58,7 +58,7 @@ static u64 ast_timer_get_count(struct udevice *dev)
return AST_TMC_RELOAD_VAL - readl(&priv->tmc->status);
}
-static int ast_timer_ofdata_to_platdata(struct udevice *dev)
+static int ast_timer_of_to_plat(struct udevice *dev)
{
struct ast_timer_priv *priv = dev_get_priv(dev);
@@ -86,7 +86,7 @@ U_BOOT_DRIVER(ast_timer) = {
.id = UCLASS_TIMER,
.of_match = ast_timer_ids,
.probe = ast_timer_probe,
- .priv_auto_alloc_size = sizeof(struct ast_timer_priv),
- .ofdata_to_platdata = ast_timer_ofdata_to_platdata,
+ .priv_auto = sizeof(struct ast_timer_priv),
+ .of_to_plat = ast_timer_of_to_plat,
.ops = &ast_timer_ops,
};
diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c
index fcb8a45358..fbc7fac1bb 100644
--- a/drivers/timer/atcpit100_timer.c
+++ b/drivers/timer/atcpit100_timer.c
@@ -64,13 +64,13 @@ struct atctmr_timer_regs {
u32 int_mask; /* 0x38 */
};
-struct atcpit_timer_platdata {
+struct atcpit_timer_plat {
u32 *regs;
};
static u64 atcpit_timer_get_count(struct udevice *dev)
{
- struct atcpit_timer_platdata *plat = dev_get_platdata(dev);
+ struct atcpit_timer_plat *plat = dev_get_plat(dev);
u32 val;
val = ~(REG32_TMR(CH_CNT(1))+0xffffffff);
return timer_conv_64(val);
@@ -78,16 +78,16 @@ static u64 atcpit_timer_get_count(struct udevice *dev)
static int atcpit_timer_probe(struct udevice *dev)
{
- struct atcpit_timer_platdata *plat = dev_get_platdata(dev);
+ struct atcpit_timer_plat *plat = dev_get_plat(dev);
REG32_TMR(CH_REL(1)) = 0xffffffff;
REG32_TMR(CH_CTL(1)) = APB_CLK|TMR_32;
REG32_TMR(CH_EN) |= CH_TMR_EN(1 , 0);
return 0;
}
-static int atcpit_timer_ofdata_to_platdata(struct udevice *dev)
+static int atcpit_timer_of_to_plat(struct udevice *dev)
{
- struct atcpit_timer_platdata *plat = dev_get_platdata(dev);
+ struct atcpit_timer_plat *plat = dev_get_plat(dev);
plat->regs = map_physmem(dev_read_addr(dev), 0x100 , MAP_NOCACHE);
return 0;
}
@@ -105,8 +105,8 @@ U_BOOT_DRIVER(atcpit100_timer) = {
.name = "atcpit100_timer",
.id = UCLASS_TIMER,
.of_match = atcpit_timer_ids,
- .ofdata_to_platdata = atcpit_timer_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct atcpit_timer_platdata),
+ .of_to_plat = atcpit_timer_of_to_plat,
+ .plat_auto = sizeof(struct atcpit_timer_plat),
.probe = atcpit_timer_probe,
.ops = &atcpit_timer_ops,
};
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 9f0ad1d703..3178e58884 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -21,13 +21,13 @@ struct atmel_pit_regs {
u32 value_image;
};
-struct atmel_pit_platdata {
+struct atmel_pit_plat {
struct atmel_pit_regs *regs;
};
static u64 atmel_pit_get_count(struct udevice *dev)
{
- struct atmel_pit_platdata *plat = dev_get_platdata(dev);
+ struct atmel_pit_plat *plat = dev_get_plat(dev);
struct atmel_pit_regs *const regs = plat->regs;
u32 val = readl(&regs->value_image);
@@ -36,7 +36,7 @@ static u64 atmel_pit_get_count(struct udevice *dev)
static int atmel_pit_probe(struct udevice *dev)
{
- struct atmel_pit_platdata *plat = dev_get_platdata(dev);
+ struct atmel_pit_plat *plat = dev_get_plat(dev);
struct atmel_pit_regs *const regs = plat->regs;
struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
struct clk clk;
@@ -58,9 +58,9 @@ static int atmel_pit_probe(struct udevice *dev)
return 0;
}
-static int atmel_pit_ofdata_to_platdata(struct udevice *dev)
+static int atmel_pit_of_to_plat(struct udevice *dev)
{
- struct atmel_pit_platdata *plat = dev_get_platdata(dev);
+ struct atmel_pit_plat *plat = dev_get_plat(dev);
plat->regs = dev_read_addr_ptr(dev);
@@ -80,8 +80,8 @@ U_BOOT_DRIVER(atmel_pit) = {
.name = "atmel_pit",
.id = UCLASS_TIMER,
.of_match = atmel_pit_ids,
- .ofdata_to_platdata = atmel_pit_ofdata_to_platdata,
- .platdata_auto_alloc_size = sizeof(struct atmel_pit_platdata),
+ .of_to_plat = atmel_pit_of_to_plat,
+ .plat_auto = sizeof(struct atmel_pit_plat),
.probe = atmel_pit_probe,
.ops = &atmel_pit_ops,
};
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index bebb2c2e90..3cac2ec422 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -84,7 +84,7 @@ static int cadence_ttc_probe(struct udevice *dev)
return 0;
}
-static int cadence_ttc_ofdata_to_platdata(struct udevice *dev)
+static int cadence_ttc_of_to_plat(struct udevice *dev)
{
struct cadence_ttc_priv *priv = dev_get_priv(dev);
@@ -109,8 +109,8 @@ U_BOOT_DRIVER(cadence_ttc) = {
.name = "cadence_ttc",
.id = UCLASS_TIMER,
.of_match = cadence_ttc_ids,
- .ofdata_to_platdata = cadence_ttc_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct cadence_ttc_priv),
+ .of_to_plat = cadence_ttc_of_to_plat,
+ .priv_auto = sizeof(struct cadence_ttc_priv),
.probe = cadence_ttc_probe,
.ops = &cadence_ttc_ops,
};
diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c
index 68bc258131..9aed5dd217 100644
--- a/drivers/timer/dw-apb-timer.c
+++ b/drivers/timer/dw-apb-timer.c
@@ -66,7 +66,7 @@ static int dw_apb_timer_probe(struct udevice *dev)
return 0;
}
-static int dw_apb_timer_ofdata_to_platdata(struct udevice *dev)
+static int dw_apb_timer_of_to_plat(struct udevice *dev)
{
struct dw_apb_timer_priv *priv = dev_get_priv(dev);
@@ -97,7 +97,7 @@ U_BOOT_DRIVER(dw_apb_timer) = {
.ops = &dw_apb_timer_ops,
.probe = dw_apb_timer_probe,
.of_match = dw_apb_timer_ids,
- .ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata,
+ .of_to_plat = dw_apb_timer_of_to_plat,
.remove = dw_apb_timer_remove,
- .priv_auto_alloc_size = sizeof(struct dw_apb_timer_priv),
+ .priv_auto = sizeof(struct dw_apb_timer_priv),
};
diff --git a/drivers/timer/mchp-pit64b-timer.c b/drivers/timer/mchp-pit64b-timer.c
index ad962098b3..c9806d7eee 100644
--- a/drivers/timer/mchp-pit64b-timer.c
+++ b/drivers/timer/mchp-pit64b-timer.c
@@ -100,7 +100,7 @@ U_BOOT_DRIVER(mchp_pit64b) = {
.name = "mchp-pit64b",
.id = UCLASS_TIMER,
.of_match = mchp_pit64b_ids,
- .priv_auto_alloc_size = sizeof(struct mchp_pit64b_priv),
+ .priv_auto = sizeof(struct mchp_pit64b_priv),
.probe = mchp_pit64b_probe,
.ops = &mchp_pit64b_ops,
.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 6139252a73..9b1daaadeb 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -244,5 +244,5 @@ U_BOOT_DRIVER(mpc83xx_timer) = {
.of_match = mpc83xx_timer_ids,
.probe = mpc83xx_timer_probe,
.ops = &mpc83xx_timer_ops,
- .priv_auto_alloc_size = sizeof(struct mpc83xx_timer_priv),
+ .priv_auto = sizeof(struct mpc83xx_timer_priv),
};
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 74e9ea34ff..448a76a7e1 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -78,7 +78,7 @@ U_BOOT_DRIVER(mtk_timer) = {
.name = "mtk_timer",
.id = UCLASS_TIMER,
.of_match = mtk_timer_ids,
- .priv_auto_alloc_size = sizeof(struct mtk_timer_priv),
+ .priv_auto = sizeof(struct mtk_timer_priv),
.probe = mtk_timer_probe,
.ops = &mtk_timer_ops,
.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c
index d7f7ca4eff..417b419d46 100644
--- a/drivers/timer/nomadik-mtu-timer.c
+++ b/drivers/timer/nomadik-mtu-timer.c
@@ -107,7 +107,7 @@ U_BOOT_DRIVER(nomadik_mtu) = {
.name = "nomadik_mtu",
.id = UCLASS_TIMER,
.of_match = nomadik_mtu_ids,
- .priv_auto_alloc_size = sizeof(struct nomadik_mtu_priv),
+ .priv_auto = sizeof(struct nomadik_mtu_priv),
.probe = nomadik_mtu_probe,
.ops = &nomadik_mtu_ops,
};
diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c
index 4eecb3e64d..7ac20d78dd 100644
--- a/drivers/timer/omap-timer.c
+++ b/drivers/timer/omap-timer.c
@@ -73,7 +73,7 @@ static int omap_timer_probe(struct udevice *dev)
return 0;
}
-static int omap_timer_ofdata_to_platdata(struct udevice *dev)
+static int omap_timer_of_to_plat(struct udevice *dev)
{
struct omap_timer_priv *priv = dev_get_priv(dev);
@@ -99,8 +99,8 @@ U_BOOT_DRIVER(omap_timer) = {
.name = "omap_timer",
.id = UCLASS_TIMER,
.of_match = omap_timer_ids,
- .ofdata_to_platdata = omap_timer_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct omap_timer_priv),
+ .of_to_plat = omap_timer_of_to_plat,
+ .priv_auto = sizeof(struct omap_timer_priv),
.probe = omap_timer_probe,
.ops = &omap_timer_ops,
};
diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c
index bb0636a071..99bd36f9f2 100644
--- a/drivers/timer/ostm_timer.c
+++ b/drivers/timer/ostm_timer.c
@@ -63,7 +63,7 @@ static int ostm_probe(struct udevice *dev)
return 0;
}
-static int ostm_ofdata_to_platdata(struct udevice *dev)
+static int ostm_of_to_plat(struct udevice *dev)
{
struct ostm_priv *priv = dev_get_priv(dev);
@@ -87,6 +87,6 @@ U_BOOT_DRIVER(ostm_timer) = {
.ops = &ostm_ops,
.probe = ostm_probe,
.of_match = ostm_ids,
- .ofdata_to_platdata = ostm_ofdata_to_platdata,
- .priv_auto_alloc_size = sizeof(struct ostm_priv),
+ .of_to_plat = ostm_of_to_plat,
+ .priv_auto = sizeof(struct ostm_priv),
};
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 53cdf09810..8d3eceb8d8 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -97,7 +97,7 @@ static u64 rockchip_timer_get_count(struct udevice *dev)
return ~0ull - cntr;
}
-static int rockchip_clk_ofdata_to_platdata(struct udevice *dev)
+static int rockchip_clk_of_to_plat(struct udevice *dev)
{
#if !CONFIG_IS_ENABLED(OF_PLATDATA)
struct rockchip_timer_priv *priv = dev_get_priv(dev);
@@ -139,7 +139,7 @@ static int rockchip_timer_probe(struct udevice *dev)
#if CONFIG_IS_ENABLED(OF_PLATDATA)
struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
struct rockchip_timer_priv *priv = dev_get_priv(dev);
- struct rockchip_timer_plat *plat = dev_get_platdata(dev);
+ struct rockchip_timer_plat *plat = dev_get_plat(dev);
priv->timer = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]);
uc_priv->clock_rate = plat->dtd.clock_frequency;
@@ -165,9 +165,9 @@ U_BOOT_DRIVER(rockchip_rk3368_timer) = {
.of_match = rockchip_timer_ids,
.probe = rockchip_timer_probe,
.ops = &rockchip_timer_ops,
- .priv_auto_alloc_size = sizeof(struct rockchip_timer_priv),
+ .priv_auto = sizeof(struct rockchip_timer_priv),
#if CONFIG_IS_ENABLED(OF_PLATDATA)
- .platdata_auto_alloc_size = sizeof(struct rockchip_timer_plat),
+ .plat_auto = sizeof(struct rockchip_timer_plat),
#endif
- .ofdata_to_platdata = rockchip_clk_ofdata_to_platdata,
+ .of_to_plat = rockchip_clk_of_to_plat,
};
diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
index 9d95f562fa..87444a0650 100644
--- a/drivers/timer/sti-timer.c
+++ b/drivers/timer/sti-timer.c
@@ -79,7 +79,7 @@ U_BOOT_DRIVER(sti_timer) = {
.name = "sti_timer",
.id = UCLASS_TIMER,
.of_match = sti_timer_ids,
- .priv_auto_alloc_size = sizeof(struct sti_timer_priv),
+ .priv_auto = sizeof(struct sti_timer_priv),
.probe = sti_timer_probe,
.ops = &sti_timer_ops,
};
diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c
index 2f5f8f43b9..215334f1b8 100644
--- a/drivers/timer/stm32_timer.c
+++ b/drivers/timer/stm32_timer.c
@@ -129,7 +129,7 @@ U_BOOT_DRIVER(stm32_timer) = {
.name = "stm32_timer",
.id = UCLASS_TIMER,
.of_match = stm32_timer_ids,
- .priv_auto_alloc_size = sizeof(struct stm32_timer_priv),
+ .priv_auto = sizeof(struct stm32_timer_priv),
.probe = stm32_timer_probe,
.ops = &stm32_timer_ops,
};
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 62d0e860e8..ab53555327 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -90,7 +90,7 @@ static int timer_post_probe(struct udevice *dev)
int timer_timebase_fallback(struct udevice *dev)
{
struct udevice *cpu;
- struct cpu_platdata *cpu_plat;
+ struct cpu_plat *cpu_plat;
struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
/* Did we get our clock rate from the device tree? */
@@ -103,7 +103,7 @@ int timer_timebase_fallback(struct udevice *dev)
if (!cpu)
return -ENODEV;
- cpu_plat = dev_get_parent_platdata(cpu);
+ cpu_plat = dev_get_parent_plat(cpu);
if (!cpu_plat)
return -ENODEV;
@@ -176,5 +176,5 @@ UCLASS_DRIVER(timer) = {
.pre_probe = timer_pre_probe,
.flags = DM_UC_FLAG_SEQ_ALIAS,
.post_probe = timer_post_probe,
- .per_device_auto_alloc_size = sizeof(struct timer_dev_priv),
+ .per_device_auto = sizeof(struct timer_dev_priv),
};
generated by cgit v1.2.3 (git 2.39.0) at 2024-07-15 11:54:59 +0300