SPDX: Convert all of our single license tags to Linux Kernel style

[oweals/u-boot.git] / board / freescale / common / fman.c

diff --git a/board/freescale/common/fman.c b/board/freescale/common/fman.c
index 9dc540211e41b88ad300b9849fe7236c70707808..358303108d8dc7531d55947377553efeee42a43b 100644 (file)
--- a/board/freescale/common/fman.c
+++ b/board/freescale/common/fman.c
@@ -1,16 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright 2011-2015 Freescale Semiconductor, Inc.
  */
 
 #include <common.h>
-#include <libfdt.h>
-#include <libfdt_env.h>
+#include <linux/libfdt.h>
+#include <linux/libfdt_env.h>
 #include <fdt_support.h>
 
 #include <fm_eth.h>
+#ifdef CONFIG_FSL_LAYERSCAPE
+#include <asm/arch/fsl_serdes.h>
+#else
 #include <asm/fsl_serdes.h>
+#endif
 
 /*
  * Given the following ...
@@ -48,6 +51,8 @@ int fdt_set_phy_handle(void *fdt, char *compat, phys_addr_t addr,
        if (!ph)
                return -FDT_ERR_BADPHANDLE;
 
+       ph = cpu_to_fdt32(ph);
+
        offset = fdt_node_offset_by_compat_reg(fdt, compat, addr);
        if (offset < 0)
                return offset;