diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
| commit | d71be1990218957b9f05dbf13a72859a2abe06d7 (patch) | |
| tree | 99858dc9988f7f7b4c0ab1d8d45738e3abdf38c8 /drivers/cpu/imx8_cpu.c | |
| parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
| parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/cpu/imx8_cpu.c')
| -rw-r--r-- | drivers/cpu/imx8_cpu.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 502c8ebb43..1d1e49efea 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -16,7 +16,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct cpu_imx_platdata { +struct cpu_imx_plat { const char *name; const char *rev; const char *type; @@ -55,7 +55,7 @@ const char *get_imx8_rev(u32 rev) static void set_core_data(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); if (device_is_compatible(dev, "arm,cortex-a35")) { plat->cpu_rsrc = SC_R_A35; @@ -73,7 +73,7 @@ static void set_core_data(struct udevice *dev) } #if IS_ENABLED(CONFIG_IMX_SCU_THERMAL) -static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) +static int cpu_imx_get_temp(struct cpu_imx_plat *plat) { struct udevice *thermal_dev; int cpu_tmp, ret; @@ -94,7 +94,7 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) return cpu_tmp; } #else -static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) +static int cpu_imx_get_temp(struct cpu_imx_plat *plat) { return 0; } @@ -102,7 +102,7 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); int ret, temp; if (size < 100) @@ -128,7 +128,7 @@ int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) static int cpu_imx_get_info(const struct udevice *dev, struct cpu_info *info) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); info->cpu_freq = plat->freq_mhz * 1000; info->features = BIT(CPU_FEAT_L1_CACHE) | BIT(CPU_FEAT_MMU); @@ -165,7 +165,7 @@ static int cpu_imx_get_vendor(const struct udevice *dev, char *buf, int size) static int cpu_imx_is_current(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); if (plat->mpidr == (read_mpidr() & 0xffff)) return 1; @@ -190,7 +190,7 @@ static const struct udevice_id cpu_imx8_ids[] = { static ulong imx8_get_cpu_rate(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); ulong rate; int ret; @@ -206,7 +206,7 @@ static ulong imx8_get_cpu_rate(struct udevice *dev) static int imx8_cpu_probe(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); u32 cpurev; set_core_data(dev); @@ -230,6 +230,6 @@ U_BOOT_DRIVER(cpu_imx8_drv) = { .of_match = cpu_imx8_ids, .ops = &cpu_imx8_ops, .probe = imx8_cpu_probe, - .platdata_auto_alloc_size = sizeof(struct cpu_imx_platdata), + .plat_auto = sizeof(struct cpu_imx_plat), .flags = DM_FLAG_PRE_RELOC, }; |