Browse Source

dm: Use dm.h header when driver mode is used

This header includes things that are needed to make driver build. Adjust
existing users to include that always, even if other dm/ includes are
present

Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass 7 years ago
parent
commit
9d922450aa
77 changed files with 77 additions and 74 deletions
  1. 1 1
      arch/arm/lib/bootm.c
  2. 1 2
      arch/arm/mach-uniphier/pinctrl-glue.c
  3. 1 0
      arch/sandbox/cpu/cpu.c
  4. 1 1
      board/amlogic/odroid-c2/odroid-c2.c
  5. 1 1
      board/armltd/integrator/integrator.c
  6. 1 1
      board/armltd/vexpress64/vexpress64.c
  7. 1 1
      board/beckhoff/mx53cx9020/mx53cx9020.c
  8. 1 1
      board/cadence/xtfpga/xtfpga.c
  9. 1 1
      board/cavium/thunderx/thunderx.c
  10. 1 0
      board/freescale/common/fsl_chain_of_trust.c
  11. 1 1
      board/freescale/common/fsl_validate.c
  12. 1 1
      board/st/stm32f429-discovery/stm32f429-discovery.c
  13. 1 1
      board/st/stm32f746-disco/stm32f746-disco.c
  14. 1 1
      board/st/stv0991/stv0991.c
  15. 1 0
      board/toradex/apalis_imx6/apalis_imx6.c
  16. 1 0
      board/toradex/colibri_imx6/colibri_imx6.c
  17. 1 0
      board/toradex/colibri_pxa270/colibri_pxa270.c
  18. 1 1
      cmd/bootefi.c
  19. 1 0
      common/env_sf.c
  20. 1 1
      drivers/clk/at91/clk-generated.c
  21. 1 1
      drivers/clk/at91/clk-h32mx.c
  22. 1 1
      drivers/clk/at91/clk-main.c
  23. 1 1
      drivers/clk/at91/clk-master.c
  24. 1 1
      drivers/clk/at91/clk-peripheral.c
  25. 1 1
      drivers/clk/at91/clk-plla.c
  26. 1 1
      drivers/clk/at91/clk-slow.c
  27. 1 1
      drivers/clk/at91/clk-system.c
  28. 1 1
      drivers/clk/at91/clk-utmi.c
  29. 1 2
      drivers/clk/at91/pmc.c
  30. 1 2
      drivers/clk/at91/sckc.c
  31. 1 1
      drivers/clk/clk_fixed_rate.c
  32. 1 1
      drivers/clk/clk_zynqmp.c
  33. 1 1
      drivers/clk/uniphier/clk-uniphier-core.c
  34. 1 1
      drivers/dma/ti-edma3.c
  35. 1 1
      drivers/firmware/firmware-uclass.c
  36. 1 1
      drivers/firmware/psci.c
  37. 1 1
      drivers/gpio/bcm6345_gpio.c
  38. 1 1
      drivers/gpio/gpio-uniphier.c
  39. 1 1
      drivers/i2c/i2c-cdns.c
  40. 1 1
      drivers/i2c/i2c-uniphier-f.c
  41. 1 1
      drivers/i2c/i2c-uniphier.c
  42. 1 1
      drivers/mmc/gen_atmel_mci.c
  43. 1 1
      drivers/mmc/meson_gx_mmc.c
  44. 1 1
      drivers/mmc/sdhci-cadence.c
  45. 1 1
      drivers/mmc/tegra_mmc.c
  46. 1 1
      drivers/mmc/uniphier-sd.c
  47. 1 1
      drivers/net/ethoc.c
  48. 1 1
      drivers/pinctrl/meson/pinctrl-meson-gxbb.c
  49. 1 1
      drivers/pinctrl/meson/pinctrl-meson.c
  50. 1 1
      drivers/pinctrl/nxp/pinctrl-imx.c
  51. 1 1
      drivers/pinctrl/nxp/pinctrl-imx5.c
  52. 1 1
      drivers/pinctrl/nxp/pinctrl-imx6.c
  53. 1 1
      drivers/pinctrl/nxp/pinctrl-imx7.c
  54. 1 1
      drivers/pinctrl/nxp/pinctrl-imx7ulp.c
  55. 1 1
      drivers/pinctrl/pinctrl-at91-pio4.c
  56. 1 1
      drivers/pinctrl/pinctrl-at91.c
  57. 1 1
      drivers/pinctrl/pinctrl-generic.c
  58. 1 1
      drivers/pinctrl/pinctrl-sandbox.c
  59. 1 1
      drivers/pinctrl/pinctrl-single.c
  60. 1 2
      drivers/pinctrl/pinctrl-uclass.c
  61. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
  62. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
  63. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
  64. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
  65. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
  66. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
  67. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
  68. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
  69. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
  70. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c
  71. 1 1
      drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
  72. 1 1
      drivers/ram/bmips_ram.c
  73. 1 1
      drivers/reset/reset-uniphier.c
  74. 1 1
      drivers/serial/serial_bcm6345.c
  75. 1 1
      drivers/serial/serial_uniphier.c
  76. 1 1
      drivers/sysreset/sysreset_psci.c
  77. 1 0
      drivers/usb/musb-new/sunxi.c

+ 1 - 1
arch/arm/lib/bootm.c

@@ -14,7 +14,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/root.h>
 #include <image.h>
 #include <u-boot/zlib.h>

+ 1 - 2
arch/arm/mach-uniphier/pinctrl-glue.c

@@ -6,9 +6,8 @@
  */
 
 #include <linux/errno.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
-#include <dm/uclass.h>
 
 #include "init.h"
 

+ 1 - 0
arch/sandbox/cpu/cpu.c

@@ -4,6 +4,7 @@
  */
 #define DEBUG
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <libfdt.h>
 #include <os.h>

+ 1 - 1
board/amlogic/odroid-c2/odroid-c2.c

@@ -5,10 +5,10 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/io.h>
 #include <asm/arch/gxbb.h>
 #include <asm/arch/sm.h>
-#include <dm/platdata.h>
 #include <phy.h>
 
 #define EFUSE_SN_OFFSET		20

+ 1 - 1
board/armltd/integrator/integrator.c

@@ -18,9 +18,9 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <netdev.h>
 #include <asm/io.h>
-#include <dm/platdata.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
 #include "integrator-sc.h"

+ 1 - 1
board/armltd/vexpress64/vexpress64.c

@@ -6,12 +6,12 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
+#include <dm.h>
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
-#include <dm/platdata.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "pcie.h"
 #include <asm/armv8/mmu.h>

+ 1 - 1
board/beckhoff/mx53cx9020/mx53cx9020.c

@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
@@ -26,7 +27,6 @@
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
 #include <fs.h>
-#include <dm/platdata.h>
 #include <dm/platform_data/serial_mxc.h>
 
 enum LED_GPIOS {

+ 1 - 1
board/cadence/xtfpga/xtfpga.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <dm/platdata.h>
+#include <dm.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <linux/ctype.h>
 #include <linux/string.h>

+ 1 - 1
board/cavium/thunderx/thunderx.c

@@ -5,6 +5,7 @@
 **/
 
 #include <common.h>
+#include <dm.h>
 #include <malloc.h>
 #include <errno.h>
 #include <linux/compiler.h>
@@ -13,7 +14,6 @@
 #include <asm/armv8/mmu.h>
 
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
-#include <dm/platdata.h>
 #include <dm/platform_data/serial_pl01x.h>
 
 static const struct pl01x_serial_platdata serial0 = {

+ 1 - 0
board/freescale/common/fsl_chain_of_trust.c

@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <fsl_validate.h>
 #include <fsl_secboot_err.h>
 #include <fsl_sfp.h>

+ 1 - 1
board/freescale/common/fsl_validate.c

@@ -5,13 +5,13 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <fsl_validate.h>
 #include <fsl_secboot_err.h>
 #include <fsl_sfp.h>
 #include <fsl_sec.h>
 #include <command.h>
 #include <malloc.h>
-#include <dm/uclass.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
 #include <fsl_secboot_err.h>

+ 1 - 1
board/st/stm32f429-discovery/stm32f429-discovery.c

@@ -12,12 +12,12 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/fmc.h>
-#include <dm/platdata.h>
 #include <dm/platform_data/serial_stm32.h>
 #include <asm/arch/stm32_periph.h>
 #include <asm/arch/stm32_defs.h>

+ 1 - 1
board/st/stm32f746-disco/stm32f746-disco.c

@@ -12,7 +12,7 @@
 #include <asm/armv7m.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/gpio.h>
-#include <dm/platdata.h>
+#include <asm/arch/fmc.h>
 #include <dm/platform_data/serial_stm32x7.h>
 #include <asm/arch/stm32_periph.h>
 #include <asm/arch/stm32_defs.h>

+ 1 - 1
board/st/stv0991/stv0991.c

@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <miiphy.h>
 #include <asm/arch/stv0991_periph.h>
 #include <asm/arch/stv0991_defs.h>
@@ -13,7 +14,6 @@
 #include <asm/arch/gpio.h>
 #include <netdev.h>
 #include <asm/io.h>
-#include <dm/platdata.h>
 #include <dm/platform_data/serial_pl01x.h>
 
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 0
board/toradex/apalis_imx6/apalis_imx6.c

@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mxc_hdmi.h>

+ 1 - 0
board/toradex/colibri_imx6/colibri_imx6.c

@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>

+ 1 - 0
board/toradex/colibri_pxa270/colibri_pxa270.c

@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pxa.h>
 #include <asm/arch/regs-mmc.h>

+ 1 - 1
cmd/bootefi.c

@@ -8,7 +8,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <efi_loader.h>
 #include <errno.h>
 #include <libfdt.h>

+ 1 - 0
common/env_sf.c

@@ -10,6 +10,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
+#include <dm.h>
 #include <environment.h>
 #include <malloc.h>
 #include <spi.h>

+ 1 - 1
drivers/clk/at91/clk-generated.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"

+ 1 - 1
drivers/clk/at91/clk-h32mx.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/util.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>

+ 1 - 1
drivers/clk/at91/clk-main.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"

+ 1 - 1
drivers/clk/at91/clk-master.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

+ 1 - 1
drivers/clk/at91/clk-peripheral.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"

+ 1 - 1
drivers/clk/at91/clk-plla.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"

+ 1 - 1
drivers/clk/at91/clk-slow.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 
 static int at91_slow_clk_enable(struct clk *clk)
 {

+ 1 - 1
drivers/clk/at91/clk-system.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"

+ 1 - 1
drivers/clk/at91/clk-utmi.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"

+ 1 - 2
drivers/clk/at91/pmc.c

@@ -7,9 +7,8 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/lists.h>
-#include <dm/root.h>
 #include <dm/util.h>
 #include "pmc.h"
 

+ 1 - 2
drivers/clk/at91/sckc.c

@@ -6,8 +6,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
-#include <dm/root.h>
+#include <dm.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

+ 1 - 1
drivers/clk/clk_fixed_rate.c

@@ -6,7 +6,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

+ 1 - 1
drivers/clk/clk_zynqmp.c

@@ -9,8 +9,8 @@
 #include <common.h>
 #include <linux/bitops.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
 #include <clk.h>
+#include <dm.h>
 
 #define ZYNQMP_GEM0_REF_CTRL		0xFF5E0050
 #define ZYNQMP_IOPLL_CTRL		0xFF5E0020

+ 1 - 1
drivers/clk/uniphier/clk-uniphier-core.c

@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

+ 1 - 1
drivers/dma/ti-edma3.c

@@ -11,8 +11,8 @@
 
 #include <asm/io.h>
 #include <common.h>
+#include <dm.h>
 #include <dma.h>
-#include <dm/device.h>
 #include <asm/omap_common.h>
 #include <asm/ti-common/ti-edma3.h>
 

+ 1 - 1
drivers/firmware/firmware-uclass.c

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/uclass.h>
+#include <dm.h>
 
 /* Firmware access is platform-dependent.  No generic code in uclass */
 UCLASS_DRIVER(firmware) = {

+ 1 - 1
drivers/firmware/psci.c

@@ -8,7 +8,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/lists.h>
 #include <libfdt.h>
 #include <linux/arm-smccc.h>

+ 1 - 1
drivers/gpio/bcm6345_gpio.c

@@ -9,10 +9,10 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
-#include <dm/device.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

+ 1 - 1
drivers/gpio/gpio-uniphier.c

@@ -6,7 +6,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

+ 1 - 1
drivers/i2c/i2c-cdns.c

@@ -9,10 +9,10 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/types.h>
 #include <linux/io.h>
 #include <linux/errno.h>
-#include <dm/device.h>
 #include <dm/root.h>
 #include <i2c.h>
 #include <fdtdec.h>

+ 1 - 1
drivers/i2c/i2c-uniphier-f.c

@@ -7,12 +7,12 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/types.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
-#include <dm/device.h>
 #include <i2c.h>
 #include <fdtdec.h>
 

+ 1 - 1
drivers/i2c/i2c-uniphier.c

@@ -7,11 +7,11 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/types.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
-#include <dm/device.h>
 #include <i2c.h>
 #include <fdtdec.h>
 

+ 1 - 1
drivers/mmc/gen_atmel_mci.c

@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <dm.h>
 #include <mmc.h>
 #include <part.h>
 #include <malloc.h>
@@ -19,7 +20,6 @@
 #include <asm/byteorder.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
-#include <dm/device.h>
 #include "atmel_mci.h"
 
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 1
drivers/mmc/meson_gx_mmc.c

@@ -5,12 +5,12 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
 #include <mmc.h>
 #include <asm/io.h>
 #include <asm/arch/sd_emmc.h>
-#include <dm/device.h>
 #include <linux/log2.h>
 
 static inline void *get_regbase(const struct mmc *mmc)

+ 1 - 1
drivers/mmc/sdhci-cadence.c

@@ -6,10 +6,10 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
-#include <dm/device.h>
 #include <libfdt.h>
 #include <mmc.h>
 #include <sdhci.h>

+ 1 - 1
drivers/mmc/tegra_mmc.c

@@ -9,7 +9,7 @@
 
 #include <bouncebuf.h>
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>

+ 1 - 1
drivers/mmc/uniphier-sd.c

@@ -9,7 +9,7 @@
 #include <clk.h>
 #include <fdtdec.h>
 #include <mmc.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/compat.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

+ 1 - 1
drivers/net/ethoc.c

@@ -11,7 +11,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <linux/io.h>
 #include <malloc.h>

+ 1 - 1
drivers/pinctrl/meson/pinctrl-meson-gxbb.c

@@ -7,7 +7,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
 

+ 1 - 1
drivers/pinctrl/meson/pinctrl-meson.c

@@ -5,7 +5,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 #include <fdt_support.h>
 #include <linux/err.h>

+ 1 - 1
drivers/pinctrl/nxp/pinctrl-imx.c

@@ -8,7 +8,7 @@
 #include <mapmem.h>
 #include <linux/io.h>
 #include <linux/err.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-imx.h"

+ 1 - 1
drivers/pinctrl/nxp/pinctrl-imx5.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-imx.h"

+ 1 - 1
drivers/pinctrl/nxp/pinctrl-imx6.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-imx.h"

+ 1 - 1
drivers/pinctrl/nxp/pinctrl-imx7.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-imx.h"

+ 1 - 1
drivers/pinctrl/nxp/pinctrl-imx7ulp.c

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-imx.h"

+ 1 - 1
drivers/pinctrl/pinctrl-at91-pio4.c

@@ -8,7 +8,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 #include <linux/io.h>
 #include <linux/err.h>

+ 1 - 1
drivers/pinctrl/pinctrl-at91.c

@@ -8,7 +8,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 #include <linux/io.h>
 #include <linux/err.h>

+ 1 - 1
drivers/pinctrl/pinctrl-generic.c

@@ -5,8 +5,8 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/compat.h>
-#include <dm/device.h>
 #include <dm/pinctrl.h>
 
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 1
drivers/pinctrl/pinctrl-sandbox.c

@@ -7,7 +7,7 @@
 /* #define DEBUG */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 static const char * const sandbox_pins[] = {

+ 1 - 1
drivers/pinctrl/pinctrl-single.c

@@ -5,7 +5,7 @@
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 #include <libfdt.h>
 #include <asm/io.h>

+ 1 - 2
drivers/pinctrl/pinctrl-uclass.c

@@ -8,10 +8,9 @@
 #include <libfdt.h>
 #include <linux/err.h>
 #include <linux/list.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
-#include <dm/uclass.h>
 #include <dm/util.h>
 
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-core.c

@@ -6,10 +6,10 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/sizes.h>
-#include <dm/device.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"

+ 1 - 1
drivers/ram/bmips_ram.c

@@ -9,10 +9,10 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <ram.h>
 #include <asm/io.h>
-#include <dm/device.h>
 
 #define SDRAM_CFG_REG		0x0
 #define SDRAM_CFG_COL_SHIFT	4

+ 1 - 1
drivers/reset/reset-uniphier.c

@@ -6,8 +6,8 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <reset-uclass.h>
-#include <dm/device.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

+ 1 - 1
drivers/serial/serial_bcm6345.c

@@ -8,12 +8,12 @@
  */
 
 #include <clk.h>
+#include <dm.h>
 #include <debug_uart.h>
 #include <errno.h>
 #include <serial.h>
 #include <asm/io.h>
 #include <asm/types.h>
-#include <dm/device.h>
 
 /* UART Control register */
 #define UART_CTL_REG			0x0

+ 1 - 1
drivers/serial/serial_uniphier.c

@@ -6,11 +6,11 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <dm.h>
 #include <linux/io.h>
 #include <linux/serial_reg.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
-#include <dm/device.h>
 #include <serial.h>
 #include <fdtdec.h>
 

+ 1 - 1
drivers/sysreset/sysreset_psci.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <dm.h>
 #include <sysreset.h>
 #include <linux/errno.h>
 #include <linux/psci.h>

+ 1 - 0
drivers/usb/musb-new/sunxi.c

@@ -17,6 +17,7 @@
  * SPDX-License-Identifier:	GPL-2.0
  */
 #include <common.h>
+#include <dm.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>