This commit does the following to clean up x86 cpu dm drivers:
- Move cpu_x86 driver codes from arch/x86/cpu/cpu.c to a dedicated
file arch/x86/cpu/cpu_x86.c
- Rename x86_cpu_get_desc() to cpu_x86_get_desc() to keep consistent
naming with other dm drivers
- Add a new cpu_x86_bind() in the cpu_x86 driver which does exactly
the same as the one in the intel baytrail cpu driver
- Update intel baytrail cpu driver to use cpu_x86_get_desc() and
cpu_x86_bind()
Signed-off-by: Bin Meng bmeng...@gmail.com
---
arch/x86/cpu/Makefile | 2 +-
arch/x86/cpu/baytrail/cpu.c| 15 +++--
arch/x86/cpu/cpu.c | 28
arch/x86/cpu/cpu_x86.c | 48 ++
arch/x86/include/asm/cpu.h | 14
arch/x86/include/asm/cpu_x86.h | 34 ++
6 files changed, 86 insertions(+), 55 deletions(-)
create mode 100644 arch/x86/cpu/cpu_x86.c
create mode 100644 arch/x86/include/asm/cpu_x86.h
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 7ff05e6..48197fb 100644
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -10,7 +10,7 @@
extra-y= start.o
obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
-obj-y += interrupts.o cpu.o call64.o
+obj-y += interrupts.o cpu.o cpu_x86.o call64.o
obj-$(CONFIG_INTEL_BAYTRAIL) += baytrail/
obj-$(CONFIG_SYS_COREBOOT) += coreboot/
diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c
index 1d48206..05156a5 100644
--- a/arch/x86/cpu/baytrail/cpu.c
+++ b/arch/x86/cpu/baytrail/cpu.c
@@ -10,6 +10,7 @@
#include cpu.h
#include dm.h
#include asm/cpu.h
+#include asm/cpu_x86.h
#include asm/lapic.h
#include asm/mp.h
#include asm/msr.h
@@ -175,18 +176,8 @@ static int baytrail_get_info(struct udevice *dev, struct
cpu_info *info)
return 0;
}
-static int cpu_x86_baytrail_bind(struct udevice *dev)
-{
- struct cpu_platdata *plat = dev_get_parent_platdata(dev);
-
- plat-cpu_id = fdtdec_get_int(gd-fdt_blob, dev-of_offset,
- intel,apic-id, -1);
-
- return 0;
-}
-
static const struct cpu_ops cpu_x86_baytrail_ops = {
- .get_desc = x86_cpu_get_desc,
+ .get_desc = cpu_x86_get_desc,
.get_info = baytrail_get_info,
};
@@ -199,7 +190,7 @@ U_BOOT_DRIVER(cpu_x86_baytrail_drv) = {
.name = cpu_x86_baytrail,
.id = UCLASS_CPU,
.of_match = cpu_x86_baytrail_ids,
- .bind = cpu_x86_baytrail_bind,
+ .bind = cpu_x86_bind,
.probe = cpu_x86_baytrail_probe,
.ops= cpu_x86_baytrail_ops,
};
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index bb4a110..ffb6e43 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -21,8 +21,6 @@
#include common.h
#include command.h
-#include cpu.h
-#include dm.h
#include errno.h
#include malloc.h
#include asm/control_regs.h
@@ -520,16 +518,6 @@ char *cpu_get_name(char *name)
return ptr;
}
-int x86_cpu_get_desc(struct udevice *dev, char *buf, int size)
-{
- if (size CPU_MAX_NAME_LEN)
- return -ENOSPC;
-
- cpu_get_name(buf);
-
- return 0;
-}
-
int default_print_cpuinfo(void)
{
printf(CPU: %s, vendor %s, device %xh\n,
@@ -622,19 +610,3 @@ int cpu_init_r(void)
{
return x86_init_cpus();
}
-
-static const struct cpu_ops cpu_x86_ops = {
- .get_desc = x86_cpu_get_desc,
-};
-
-static const struct udevice_id cpu_x86_ids[] = {
- { .compatible = cpu-x86 },
- { }
-};
-
-U_BOOT_DRIVER(cpu_x86_drv) = {
- .name = cpu_x86,
- .id = UCLASS_CPU,
- .of_match = cpu_x86_ids,
- .ops= cpu_x86_ops,
-};
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
new file mode 100644
index 000..d32ba66
--- /dev/null
+++ b/arch/x86/cpu/cpu_x86.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015, Bin Meng bmeng...@gmail.com
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include common.h
+#include cpu.h
+#include dm.h
+#include errno.h
+#include asm/cpu.h
+
+int cpu_x86_bind(struct udevice *dev)
+{
+ struct cpu_platdata *plat = dev_get_parent_platdata(dev);
+
+ plat-cpu_id = fdtdec_get_int(gd-fdt_blob, dev-of_offset,
+ intel,apic-id, -1);
+
+ return 0;
+}
+
+int cpu_x86_get_desc(struct udevice *dev, char *buf, int size)
+{
+ if (size CPU_MAX_NAME_LEN)
+ return -ENOSPC;
+
+ cpu_get_name(buf);
+
+ return 0;
+}
+
+static const struct cpu_ops cpu_x86_ops = {
+ .get_desc = cpu_x86_get_desc,
+};
+
+static const struct udevice_id cpu_x86_ids[] = {
+ { .compatible = cpu-x86 },
+ { }
+};
+
+U_BOOT_DRIVER(cpu_x86_drv) = {
+ .name = cpu_x86,
+ .id = UCLASS_CPU,
+ .of_match = cpu_x86_ids,
+ .bind
