w1: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index c41706c4005c011094220c843b98f1a759a60146..eee5c357bdcce7aeb7dde87a858f06eabf186185 100644 (file)
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <env.h>
 #include <w1.h>
 #include <w1-eeprom.h>

diff --git a/cmd/w1.c b/cmd/w1.c
index 92be1f2531d1e39dce917fcc0b00ec5d618d4fe3..459094bf80944a80609eef33edaa1b5c4ef43e98 100644 (file)
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>

diff --git a/include/w1.h b/include/w1.h
index b958b1c92c2f3c3e39d6cbe913136c68d74d70ac..77f439e587f76e1e13e35311c91b7b508d5d141e 100644 (file)
--- a/include/w1.h
+++ b/include/w1.h
@@ -8,7 +8,7 @@
 #ifndef __W1_H
 #define __W1_H
 
-#include <dm.h>
+struct udevice;
 
 #define W1_FAMILY_DS24B33      0x23
 #define W1_FAMILY_DS2431       0x2d