Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / arch / riscv / include / asm / soc.h

diff --git a/arch/riscv/include/asm/soc.h b/arch/riscv/include/asm/soc.h
index 6c8363b1f3272ea669ce9761783dc30436e6656f..f494066051a2c10a122c17ecf855f230571c6f98 100644 (file)
--- a/arch/riscv/include/asm/soc.h
+++ b/arch/riscv/include/asm/soc.h
@@ -21,42 +21,4 @@ void soc_early_init(void);
 extern unsigned long __soc_early_init_table_start;
 extern unsigned long __soc_early_init_table_end;
 
-/*
- * Allows Linux to provide a device tree, which is necessary for SOCs that
- * don't provide a useful one on their own.
- */
-struct soc_builtin_dtb {
-       unsigned long vendor_id;
-       unsigned long arch_id;
-       unsigned long imp_id;
-       void *(*dtb_func)(void);
-};
-
-/*
- * The argument name must specify a valid DTS file name without the dts
- * extension.
- */
-#define SOC_BUILTIN_DTB_DECLARE(name, vendor, arch, impl)              \
-       extern void *__dtb_##name##_begin;                              \
-                                                                       \
-       static __init __used                                            \
-       void *__soc_builtin_dtb_f__##name(void)                         \
-       {                                                               \
-               return (void *)&__dtb_##name##_begin;                   \
-       }                                                               \
-                                                                       \
-       static const struct soc_builtin_dtb __soc_builtin_dtb__##name   \
-               __used __section("__soc_builtin_dtb_table") =           \
-       {                                                               \
-               .vendor_id = vendor,                                    \
-               .arch_id   = arch,                                      \
-               .imp_id    = impl,                                      \
-               .dtb_func  = __soc_builtin_dtb_f__##name,               \
-       }
-
-extern unsigned long __soc_builtin_dtb_table_start;
-extern unsigned long __soc_builtin_dtb_table_end;
-
-void *soc_lookup_builtin_dtb(void);
-
 #endif