Merge branch '2021-02-02-drop-asm_global_data-when-unused'

- Merge the patch to take <asm/global_data.h> out of <common.h>
2021-02-15 08:19:40 -05:00
parent 76b7936e6f 401d1c4f5d
commit 2ae80437fb
1354 changed files with 1398 additions and 23 deletions
--- a/include/dm/acpi.h
+++ b/include/dm/acpi.h
@@ -28,6 +28,7 @@
 #if !defined(__ACPI__)

 struct nhlt;
+struct udevice;

 /** enum acpi_dump_option - selects what ACPI information to dump */
 enum acpi_dump_option {
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -379,6 +379,8 @@ bool ofnode_read_bool(ofnode node, const char *propname);
 ofnode ofnode_find_subnode(ofnode node, const char *subnode_name);

 #if CONFIG_IS_ENABLED(DM_INLINE_OFNODE)
+#include <asm/global_data.h>
+
 static inline bool ofnode_is_enabled(ofnode node)
 {
 	if (ofnode_is_np(node)) {
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -695,6 +695,7 @@ int dev_decode_display_timing(const struct udevice *dev, int index,
 			      struct display_timing *config);

 #else /* CONFIG_DM_DEV_READ_INLINE is enabled */
+#include <asm/global_data.h>

 static inline int dev_read_u32(const struct udevice *dev,
 			       const char *propname, u32 *outp)